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

@@ -605,8 +605,9 @@ public function save(ProductInterface $product, $saveOptions = false)
             $productAttributes = $product->getAttributes();
             if ($productAttributes !== null
                 && $product->getStoreId() !== Store::DEFAULT_STORE_ID
-                && (count($stores) > 1 || count($websites) === 1)
+                && (count($stores) > 1 || count($websites) >= 1)
             ) {
+                $imageRoles = ['image', 'small_image', 'thumbnail'];
                 foreach ($product->getAttributes() as $attribute) {
                     $defaultValue = $attribute->getDefaultValue();
                     $attributeCode = $attribute->getAttributeCode();
@@ -624,6 +625,7 @@ public function save(ProductInterface $product, $saveOptions = false)
                     ) {
                         $useDefault[$attributeCode] = '1';
                     } elseif (!$defaultValue && $value !== null
+                        && !in_array($attributeCode, $imageRoles)
                         && $attribute->getScope() !== EavAttributeInterface::SCOPE_GLOBAL_TEXT
                         && $existingProduct->getData($attributeCode) === $value
                         && $existingProduct->getOrigData($attributeCode) === $value