merge in master-release history after reset to cdb70a71717005904c8fc20b41c36513b1875b52