Merge pull request #10621 from BKPepe/youtube