Merge branch 'develop'

EventSubscriber/User/UserRolesEventSubscriber.php

@@ -63,7 +63,7 @@ class UserRolesEventSubscriber implements EventSubscriberInterface
 
     public function setUserRoles(Request $request): bool
     {
-        if ($this->tokenStorage && $this->tokenStorage->getToken()) {
+        if (!$this->merchantResolver->isOutOfMerchant() && $this->tokenStorage && $this->tokenStorage->getToken()) {
             $token = $this->tokenStorage->getToken();
             $sessionUser = $token->getUser();