Merge upstream commits, including team