merge in master-release history after reset to b85444009872fb5109f63d70d3ea20e36c6cbcde