merge in master-release history after reset to 3c831506cf3871d8ec10418e7edf7dedf96e4ccb