Merge remote-tracking branch 'origin/BUG#AC-1054-v6' into GL_PR_21102021

Author: glo71317

app/code/Magento/MediaGallerySynchronization/Model/FetchMediaStorageFileBatches.php

@@ -87,15 +87,14 @@ public function execute(): \Traversable
         $batch = [];
         $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
 
-        /** @var \SplFileInfo $file */
-        foreach ($this->getAssetsIterator->execute($mediaDirectory->getAbsolutePath()) as $file) {
-            $relativePath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)
-                ->getRelativePath($file->getPathName());
-            if (!$this->isApplicable($relativePath)) {
+        foreach ($mediaDirectory->readRecursively($mediaDirectory->getAbsolutePath()) as $file) {
+
+            if (!$this->isApplicable($file)) {
                 continue;
             }
 
-            $batch[] = $relativePath;
+            $batch[] = $file;
+            
             if (++$i == $this->batchSize) {
                 yield $batch;
                 $i = 0;