merge in master-release history after reset to 2c525659409fb051df19db438c0d3e6b3e5e09d5