Merge branch '2.4-develop' into fix-for-issue-37409

Author: engcom-Lima

app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml

@@ -19,6 +19,7 @@
             <group value="menu"/>
             <group value="mtf_migrated"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml

@@ -17,6 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-36011"/>
             <group value="menu"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AdvancedSearch/Test/Mftf/Test/AdminAddSearchTermTest.xml

@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <group value="AdvancedSearch"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml

@@ -18,6 +18,7 @@
             <group value="analytics"/>
             <group value="mtf_migrated"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
 
         <before>

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml

@@ -19,6 +19,7 @@
             <group value="menu"/>
             <group value="mtf_migrated"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml

@@ -17,6 +17,7 @@
             <testCaseId value="MAGETWO-63981"/>
             <group value="analytics"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MAGETWO-63898"/>
             <group value="analytics"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MAGETWO-66464"/>
             <group value="analytics"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Authorization/Model/CompositeUserContext.php

@@ -7,6 +7,7 @@
 namespace Magento\Authorization\Model;
 
 use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * User context.
@@ -17,7 +18,7 @@
  * @api
  * @since 100.0.2
  */
-class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface
+class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface, ResetAfterRequestInterface
 {
     /**
      * @var UserContextInterface[]
@@ -92,4 +93,12 @@ protected function getUserContext()
         }
         return $this->chosenUserContext;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->chosenUserContext = null;
+    }
 }

app/code/Magento/Backend/Model/Auth/Session.php

@@ -114,6 +114,16 @@ public function __construct(
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_isFirstAfterLogin = null;
+        $this->acl = null;
+    }
+
     /**
      * Refresh ACL resources stored in session
      *