merge in master-release history after reset to cbe6fddebe3ec84176037de7f9681d2407fa1113