merge of upstream commits started