Merge branch 'v4' into develop

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fixed a bug where importing Address data from the Google Maps plugin could cause duplicate Addresses if the Address already existed. ([#1370](https://github.com/craftcms/feed-me/pull/1370))
 - Fixed a bug where updating entry statuses for a site in a site group, would update statuses for all sites in the site group instead of the targeted one. ([#1208](https://github.com/craftcms/feed-me/issues/1208))
 - Fixed a bug where you could not use `false` to override feed settings in `config/feed-me.php`. ([#1380](https://github.com/craftcms/feed-me/issues/1380))
+- Fixed a bug where importing nested element fields would not work in some scenarios. ([#1378](https://github.com/craftcms/feed-me/issues/1378))
 
 ## 5.2.0 - 2023-07-06
 

src/base/Field.php

@@ -167,7 +167,8 @@ protected function populateElementFields($elementIds, $nodeKey = null): void
 
                 // Arrayed content doesn't provide defaults because it's unable to determine how many items it _should_ return
                 // This also checks if there was any data that corresponds on the same array index/level as our element
-                $value = Hash::get($fieldValue, $nodeKey, $default);
+                /** @phpstan-ignore-next-line */
+                $value = Hash::get($fieldValue, $nodeKey ?? $key, $default);
 
                 if ($value) {
                     $fieldData[$elementId][$fieldHandle] = $value;