Merge pull request #8328 from remitamine/hls-master-detect