merge in master-release history after reset to ec00884cac216d1cb79556ca23b21ce55e35af3e