Merge pull request #7599 from lalinsky/fix-youtube