merge in master-release history after reset to 2749d6b0d84133e6707c7c7366c174c879505956