Merge of upstream commits