MC-23795: Error page after flush cache on Storefront product page (product created via API)

Author: OlgaVasyltsun

app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

@@ -9,7 +9,7 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="CustomerEntityOne" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">defaultBillingValue</data>
         <data key="default_shipping">defaultShippingValue</data>
         <data key="confirmation">confirmationData</data>
@@ -111,7 +111,7 @@
         <data key="website_id">0</data>
     </entity>
     <entity name="Simple_US_Customer_Multiple_Addresses" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>
@@ -125,7 +125,7 @@
         <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
     </entity>
     <entity name="Simple_US_Customer_Multiple_Addresses_No_Default_Address" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>
@@ -139,7 +139,7 @@
         <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
     </entity>
     <entity name="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>
@@ -153,7 +153,7 @@
         <requiredEntity type="address">US_Address_NY_Default_Shipping</requiredEntity>
     </entity>
     <entity name="Simple_US_Customer_NY" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>
@@ -166,7 +166,7 @@
         <requiredEntity type="address">US_Address_NY</requiredEntity>
     </entity>
     <entity name="Simple_US_Customer_CA" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>
@@ -209,7 +209,7 @@
         <requiredEntity type="address">US_Address_Utah</requiredEntity>
     </entity>
     <entity name="Simple_GB_Customer" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">Jane.Doe@example.com</data>
@@ -245,7 +245,7 @@
         <data key="website_id">0</data>
     </entity>
     <entity name="UKCustomer" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">david@email.com</data>
@@ -259,7 +259,7 @@
         <requiredEntity type="address">updateCustomerUKAddress</requiredEntity>
     </entity>
     <entity name="Customer_US_UK_DE" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>
@@ -287,7 +287,7 @@
         <requiredEntity type="address">US_Address_CA</requiredEntity>
     </entity>
     <entity name="Simple_US_Customer_Two_Addresses" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>
@@ -319,7 +319,7 @@
         <data key="password">123123qa</data>
     </entity>
     <entity name="Simple_US_Customer_Incorrect_Email" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email">&gt;&lt;script&gt;alert(1);&lt;/script&gt;@example.com</data>
@@ -342,7 +342,7 @@
         <data key="website_id">0</data>
     </entity>
     <entity name="Simple_US_Customer_ArmedForcesEurope" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>

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

@@ -357,6 +357,11 @@
     <type name="Magento\Framework\App\Action\AbstractAction">
         <plugin name="customerNotification" type="Magento\Customer\Model\Plugin\CustomerNotification"/>
     </type>
+    <type name="Magento\Customer\Model\Authorization\CustomerSessionUserContext">
+        <arguments>
+            <argument name="customerSession" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
     <type name="Magento\PageCache\Observer\FlushFormKey">
         <plugin name="customerFlushFormKey" type="Magento\Customer\Model\Plugin\CustomerFlushFormKey"/>
     </type>

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

@@ -12,7 +12,4 @@
     <type name="Magento\Customer\CustomerData\Customer">
         <plugin name="section_data" type="Magento\Persistent\Model\Plugin\CustomerData" />
     </type>
-    <type name="Magento\Framework\App\Http\Context">
-        <plugin name="persistent_page_cache_variation" type="Magento\Persistent\Model\Plugin\PersistentCustomerContext" />
-    </type>
 </config>

app/code/Magento/Persistent/etc/frontend/di.xml

@@ -49,4 +49,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\Http\Context">
+        <plugin name="persistent_page_cache_variation" type="Magento\Persistent\Model\Plugin\PersistentCustomerContext" />
+    </type>
 </config>

app/code/Magento/Translation/Test/Mftf/Test/AdminInlineTranslationOnCheckoutTest.xml

@@ -17,6 +17,9 @@
             <testCaseId value="MC-11505"/>
             <group value="translation"/>
             <group value="checkout"/>
+            <skip>
+                <issueId value="MC-31663"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>