Merge branch '2.4.0-sync' of github.com:magento-engcom/magento2ce into 2.4.0-sync

Author: VladimirZaets

app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml

@@ -146,7 +146,7 @@
         <!-- Run cron -->
         <wait stepKey="waitBeforeRunMagentoCron" time="30"/>
         <magentoCLI stepKey="runMagentoCron" command="cron:run --group=index"/>
-        <wait stepKey="waitAfterRunMagentoCron" time="60"/>
+        <wait stepKey="waitAfterRunMagentoCron" time="90"/>
 
         <!-- Open categories K, L, M, N on Storefront in order to make sure that new assigments are applied -->
         <!-- Category K contains only Products A, C -->
@@ -212,7 +212,7 @@
         <!-- Run Cron once to reindex product changes -->
         <wait stepKey="waitBeforeRunCronIndexAfterProductAssignToCategory" time="30"/>
         <magentoCLI stepKey="runCronIndexAfterProductAssignToCategory" command="cron:run --group=index"/>
-        <wait stepKey="waitAfterRunCronIndexAfterProductAssignToCategory" time="60"/>
+        <wait stepKey="waitAfterRunCronIndexAfterProductAssignToCategory" time="90"/>
 
         <!-- Open categories K, L, M, N on Storefront in order to make sure that new assigments are applied -->
 

app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml

@@ -17,6 +17,9 @@
             <severity value="BLOCKER"/>
             <testCaseId value="MC-16161"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MC-36044"/>
+            </skip>
         </annotations>
 
         <before>