merge in master-release history after reset to ce43185343d360947553c14af41d0113bd36f616