Merge remote-tracking branch 'origin/feature/load-cart-token-4x' into feature/load-cart-token

# Conflicts:
#	CHANGELOG.md
#	src/controllers/CartController.php
#	src/models/Settings.php
#	src/services/Carts.php

Author: lukeholder

src/controllers/CartController.php

@@ -437,7 +437,8 @@ public function actionLoadCart(): ?Response
             }
         }
 
-        // Load the cart (existing logic)
+        // Set the token to null on the request so it will not be added to the redirect URL that is generated
+        $this->request->setToken(null);
         $redirect = UrlHelper::siteUrl(path: $loadCartRedirectUrl, siteId: $cart->orderSiteId);
         $carts->forgetCart();
         $carts->setSessionCartNumber($number);