merge in master-release history after reset to dfa829c3ca81fcd2eecaabfff630ac0f41453731