Merge pull request #8201 from remitamine/hls-aes