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

@@ -639,21 +639,20 @@ public function save(ProductInterface $product, $saveOptions = false)
                         $hasDataChanged = true;
                     }
                 }
+                $productDataArray = $this->attributeFilter->prepareProductAttributes(
+                    $product,
+                    $productDataArray,
+                    $useDefault
+                );
+                $product->setData($productDataArray);
+
                 if ($hasDataChanged) {
                     $product->setData('_edit_mode', true);
                 }
             }
         }
 
-        $productDataArray = $this->attributeFilter->prepareProductAttributes(
-            $product,
-            $productDataArray,
-            $useDefault
-        );
-        $newProduct = $this->productFactory->create();
-        $newProduct->setData($productDataArray);
-
-        $this->saveProduct($newProduct);
+        $this->saveProduct($product);
 
         if ($assignToCategories === true && $product->getCategoryIds()) {
             $this->linkManagement->assignProductToCategories(