[HM2] Upgrade HM2