merge in master-release history after reset to d2d0e823a55bc5850a62695b709f924edf126513