Merge branch '2.4-develop' into 2.4-develop-prs

Author: sidolov

app/code/Magento/CatalogRule/etc/adminhtml/events.xml

@@ -12,4 +12,7 @@
     <event name="catalogrule_dirty_notice">
         <observer name="catalogrule" instance="Magento\CatalogRule\Observer\AddDirtyRulesNotice" />
     </event>
+    <event name="prepare_catalog_product_collection_prices">
+        <observer name="catalogrule" disabled="true" />
+    </event>
 </config>

app/code/Magento/CatalogRule/etc/crontab/events.xml

@@ -9,4 +9,7 @@
     <event name="catalog_product_get_final_price">
         <observer name="catalogrule" instance="Magento\CatalogRule\Observer\ProcessAdminFinalPriceObserver" />
     </event>
+    <event name="prepare_catalog_product_collection_prices">
+        <observer name="catalogrule" disabled="true" />
+    </event>
 </config>

app/code/Magento/CatalogRule/etc/events.xml

@@ -21,4 +21,10 @@
     <event name="magento_catalogrule_api_data_ruleinterface_load_after">
         <observer name="legacy_model_load" instance="Magento\Framework\EntityManager\Observer\AfterEntityLoad" />
     </event>
+    <event name="catalog_product_get_final_price">
+        <observer name="catalogrule" instance="Magento\CatalogRule\Observer\ProcessFrontFinalPriceObserver" />
+    </event>
+    <event name="prepare_catalog_product_collection_prices">
+        <observer name="catalogrule" instance="Magento\CatalogRule\Observer\PrepareCatalogProductCollectionPricesObserver" />
+    </event>
 </config>