merge in master-release history after reset to 80fc4f9fe3f8bff2ae4616d0a2e225ea51690db0