merge in master-release history after reset to b9f2c721d9e3f18fae509833072be597f1c78142