Merge remote-tracking branch 'origin/MC-31760' into 2.4-develop-pr16

Author: zakdma

app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockWithMarginalSpaceTest.xml

@@ -16,11 +16,12 @@
             <description value="Admin can not able create a CMS block with marginal space in identifier field"/>
             <severity value="CRITICAL"/>
             <group value="Cms"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
         <before>
-            <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginGetFromGeneralFile"/>
         </before>
+
         <amOnPage url="{{CmsNewBlock.url}}" stepKey="amOnBlocksCreationForm"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <!--Verify Save&Duplicate button and Save&Close button-->