Merge branch '5.x' into 6.x

# Conflicts:
#	src/fields/Matrix.php

Author: angrybrad

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Fixed an error that could occur when setting up mappings if a field had been deleted, but not removed from the field layout. ([#1687](https://github.com/craftcms/feed-me/pull/1687))
 - Fixed a bug where some imported assets would end up with a double file extension. ([#1688](https://github.com/craftcms/feed-me/pull/1688))
+- Fixed a bug where `setEmptyValues` wasn’t being respected for Matrix Blocks in some scenarios. ([#1689](https://github.com/craftcms/feed-me/pull/1689))
 
 ## 6.10.1 - 2025-08-27
 

src/fields/Matrix.php

@@ -219,9 +219,11 @@ public function parseField(): mixed
             }
         }
 
-        // if there's nothing in the prepped data, return null, as if mapping doesn't exist
+        // if there's nothing in the prepped data,
+        // if setEmptyValues is on, return an empty array so that existing blocks are removed,
+        // otherwise return null, as if mapping doesn't exist
         if (empty($preppedData)) {
-            return null;
+            return $this->feed['setEmptyValues'] ? [] : null;
         }
 
         $expanded = Hash::expand($preppedData);