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,6 @@ public function save(ProductInterface $product, $saveOptions = false)
     {
         $assignToCategories = false;
         $tierPrices = $product->getData('tier_price');
-        $productDataToChange = $product->getData();
 
         try {
             $existingProduct = $product->getId() ?
@@ -597,10 +596,12 @@ public function save(ProductInterface $product, $saveOptions = false)
                 && $product->getStoreId() !== Store::DEFAULT_STORE_ID
                 && (count($stores) > 1 || count($websites) === 1)
             ) {
+                $imageRoles = ['image', 'small_image', 'thumbnail'];
                 foreach ($productAttributes as $attribute) {
                     $attributeCode = $attribute->getAttributeCode();
                     $value = $product->getData($attributeCode);
-                    if ($existingProduct->getData($attributeCode) === $value
+                    if (!in_array($attributeCode, $imageRoles)
+                        && $existingProduct->getData($attributeCode) === $value
                         && $existingProduct->getOrigData($attributeCode) === $value
                         && $attribute->getScope() !== EavAttributeInterface::SCOPE_GLOBAL_TEXT
                         && !is_array($value)
@@ -627,7 +628,6 @@ public function save(ProductInterface $product, $saveOptions = false)
         }
 
         $this->saveProduct($product);
-
         if ($assignToCategories === true && $product->getCategoryIds()) {
             $this->linkManagement->assignProductToCategories(
                 $product->getSku(),