merge in master-release history after reset to 4c2b869a3a30b257acce46d470e92e835a9eb82c