merge in master-release history after reset to be9d36572c0c7669d4e113844db78078d8d67d1e