merge in master-release history after reset to b227f6c884c6100d58aa60165748d68944f45691