merge in master-release history after reset to 83b8526436ba2e564dff99ec4c6cf46fabfdf22e