merge in master-release history after reset to 9dc9ca97a54246b59ff3189d7e5adf8f3437d5c7