merge in master-release history after reset to 9700e9824fc10d15e02d9c4a23ea7952c63200d7