Merge pull request #9967 from BKPepe/ytdl