Merge pull request #8354 from remitamine/m3u8_metadata