Merge branch '5.x' into 5.6

# Conflicts:
#	src/elements/Product.php

Author: lukeholder

src/elements/Product.php

@@ -1336,13 +1336,13 @@ public function getVariantManager(): NestedElementManager
         if (!isset($this->_variantManager)) {
             $this->_variantManager = new NestedElementManager(
                 Variant::class,
-                /** @phpstan-ignore-next-line */
-                fn(Product $product) => self::createVariantQuery($product),
+                // @phpstan-ignore argument.type (will always be a Product)
+                fn(ElementInterface $product): VariantQuery => self::createVariantQuery($product),
                 [
-                    'attribute' => 'allVariants',
+                    'attribute' => 'variants',
                     'propagationMethod' => $this->getType()->propagationMethod,
-                    'valueSetter' => fn($variants) => $this->setVariants($variants),
                     'valueGetter' => fn() => $this->getVariants(true),
+                    'valueSetter' => fn($variants) => $this->setVariants($variants),
                 ],
             );
         }
@@ -1650,10 +1650,14 @@ public function afterSave(bool $isNew): void
             $record->dateUpdated = $this->dateUpdated;
             $record->dateCreated = $this->dateCreated;
 
+            // Capture the dirty attributes from the record
+            $dirtyAttributes = array_keys($record->getDirtyAttributes());
             $record->save(false);
 
             $this->id = $record->id;
 
+            $this->setDirtyAttributes($dirtyAttributes);
+
             if ($this->getIsCanonical() &&
                 isset($this->typeId) &&
                 $productType->isStructure
@@ -1843,15 +1847,15 @@ function() {
     /**
      * @inheritdoc
      */
-    public function setAttributes($values, $safeOnly = true): void
+    public function setAttributesFromRequest(array $values): void
     {
         // this is needed for Craft.NestedElementManager::markAsDirty()
         if (isset($values['variants']) && $values['variants'] === '*') {
             $this->setDirtyAttributes(['variants']);
             unset($values['variants']);
         }
 
-        parent::setAttributes($values, $safeOnly);
+        parent::setAttributesFromRequest($values);
     }
 
     /**