Merged upstream commits