merge in master-release history after reset to 574b641173debed3c0714628dba963e4d276374d