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

# Conflicts:
#	Model/Import/Category.php

Author: avstudnitz

Model/Import/Category.php

@@ -618,8 +618,9 @@ private function indexDeleteEvents(): self
      */
     protected function reindexUpdatedCategories($categoryId)
     {
-        /** @var $category CategoryModel */
-        $category = $this->defaultCategory->load($categoryId);
+        /** @var $category \Magento\Catalog\Model\Category */
+        $category = $this->categoryRepository->get($categoryId);
+
         foreach ($category->getStoreIds() as $storeId) {
             if ($storeId == 0) {
                 continue;