Merge branch '2.4.0-develop' of https://github.com/magento/magento2ce into MC-34764

Author: Oleksandr Gorkun

app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

@@ -112,7 +112,7 @@
             </div>
         </div>
     </div>
-    <div class="message notice" if="message">
-        <div data-bind="text: message"></div>
+    <div class="message notice" if="$data.message">
+        <div data-bind="text: $data.message"></div>
     </div>
 </li>

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

@@ -25,6 +25,16 @@
             <createData entity="SimpleProduct2" stepKey="createSimpleProductApi"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteAllCatalogPriceRule"/>
+            <!-- Clearing cache just in case -->
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage2"/>
+            <!-- It sometimes is loading too long for default 10s -->
+            <waitForPageLoad time="60" stepKey="waitForPageFullyLoaded2"/>
             <!--Create the catalog price rule -->
             <createData entity="CatalogRuleToPercent" stepKey="createCatalogRule"/>
             <!--Create order via API-->

dev/tests/integration/testsuite/Magento/Elasticsearch6/Controller/QuickSearchTest.php

@@ -64,6 +64,6 @@ public function testQuickSearchWithImprovedPriceRangeCalculation()
             $this->storeManager->setCurrentStore($defaultStore);
         }
 
-        $this->assertContains('search product 1', $responseBody);
+        $this->assertStringContainsString('search product 1', $responseBody);
     }
 }