merge in master-release history after reset to cdedf74e34117f9834055973880ee728f11d97cd