merge in master-release history after reset to 84be2d11a5514d067b2ddee6c013e4bfba0e00ad