merge in master-release history after reset to 4ed8275195e61fbdd588fd07f4721f54e1f554db