MS22-115: Upgrade to 1.7