merge in master-release history after reset to 5ff58d494a5ddf7e544adc77590300f04daf8e31