merge upstream commits (3045400)