merge in master-release history after reset to 23246ed18d9b26d8a7673140c00e060022be935b