Merge upstream commits