Merge remote-tracking branch 'origin/develop' into develop

Author: cklei-carly

src/Services/ImportDataService.php

@@ -504,7 +504,7 @@ protected function processForNavigation()
         // Create tree structure for navigation items
         foreach (collect($this->pendingData['navigation'] ?? [])->groupBy('category') as $category => $items) {
 
-            // Create a tree data 
+            // Create a tree data
             $treeData = [];
             foreach ($items as $item) {
                 try {