merge upstream commits (3045129)