merge in master-release history after reset to 147a5a523865025f21046b0fc857d1575414146e