Merge branch 'master' into develop

packages/medusa/src/services/cart.js

@@ -614,7 +614,9 @@ class CartService extends BaseService {
       })
 
       if ("region_id" in update) {
-        await this.setRegion_(cart, update.region_id, update.country_code)
+        const countryCode =
+          update.country_code || update.shipping_address?.country_code
+        await this.setRegion_(cart, update.region_id, countryCode)
       }
 
       if ("customer_id" in update) {