Merge branch '2.4-develop' into functional-mainline-pr-ce

Author: akaash-mehra

app/code/Magento/CatalogGraphQl/etc/di.xml

@@ -26,6 +26,14 @@
             </argument>
         </arguments>
     </virtualType>
+    <virtualType name="Magento\Framework\GraphQl\Config\Data" type="Magento\Framework\Config\Data">
+        <arguments>
+            <argument name="cacheTags" xsi:type="array">
+                <!-- Note: Because of DynamicAttributeReaders, this cache needs to be cleaned when attributes change-->
+                <item name="EAV" xsi:type="string">EAV</item>
+            </argument>
+        </arguments>
+    </virtualType>
     <type name="Magento\Framework\GraphQl\Query\FieldTranslator">
         <arguments>
             <argument name="translationMap" xsi:type="array">
@@ -97,6 +105,14 @@
     <type name="Magento\Framework\Search\Request\Config\FilesystemReader">
         <plugin name="productAttributesDynamicFields"  type="Magento\CatalogGraphQl\Plugin\Search\Request\ConfigReader" />
     </type>
+    <type name="Magento\Framework\Search\Request\Config">
+        <arguments>
+            <argument name="cacheTags" xsi:type="array">
+                <!-- Note: We have to add EAV to the cache tags because productAttributesDynamicFields uses EAV -->
+                <item name="EAV" xsi:type="string">EAV</item>
+            </argument>
+        </arguments>
+    </type>
 
     <preference type="Magento\CatalogGraphQl\Model\Resolver\Product\Price\Provider" for="Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface"/>
 

app/code/Magento/Ups/Helper/Config.php

@@ -115,6 +115,7 @@ protected function getCodes()
                     '03' => __('UPS Ground'),
                     '07' => __('UPS Worldwide Express'),
                     '08' => __('UPS Worldwide Expedited'),
+                    '12' => __('UPS Three-Day Select'),
                     '14' => __('UPS Next Day Air Early A.M.'),
                     '54' => __('UPS Worldwide Express Plus'),
                     '65' => __('UPS Saver'),