merge in master-release history after reset to 6a9c9f75f80e26cca11b60c74aab447b86bd8c7c