merge in master-release history after reset to 51bf632da3d907669e0d89246f5dcaf7dfd031d1