Merge upstream changes and YouTube fix