AC-2904-v1:: Saving product with non-default store scope causes untouched attributes to become store scoped if loaded using ProductRepository

Author: glo63652

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -525,7 +525,7 @@ public function save(ProductInterface $product, $saveOptions = false)
     {
         $assignToCategories = false;
         $tierPrices = $product->getData('tier_price');
-
+        $productDataToChange = $product->getData();
         try {
             $existingProduct = $product->getId() ?
                 $this->getById($product->getId()) :
@@ -619,6 +619,21 @@ public function save(ProductInterface $product, $saveOptions = false)
                             $attributeCode === ProductAttributeInterface::CODE_SEO_FIELD_URL_KEY ? false : null
                         );
                         $hasDataChanged = true;
+                    } elseif (in_array($attributeCode, $imageRoles)
+                        && $existingProduct->getData($attributeCode) === $value
+                        && !array_key_exists($attributeCode, $productDataToChange)
+                        && $attribute->getScope() !== EavAttributeInterface::SCOPE_GLOBAL_TEXT
+                        && $value !== null
+                        && !$this->scopeOverriddenValue->containsValue(
+                            ProductInterface::class,
+                            $product,
+                            $attributeCode,
+                            $product->getStoreId()
+                        )
+
+                    ) {
+                        $product->setData($attributeCode, null);
+                        $hasDataChanged = true;
                     }
                 }
                 if ($hasDataChanged) {