Merging in Develop upstream commits