Merging upstream commits