MAGETWO-89238: [Sales email] Disabled invoice emails produce performance issue

Author: RuslanKostiv1

app/code/Magento/Store/Model/Group.php

@@ -414,12 +414,12 @@ public function beforeDelete()
      */
     public function afterDelete()
     {
-        $this->_storeManager->reinitStores();
         $group = $this;
         $this->getResource()->addCommitCallback(function () use ($group) {
             $this->_storeManager->reinitStores();
             $this->eventManager->dispatch($this->_eventPrefix . '_delete', ['group' => $group]);
         });
+        $result = parent::afterDelete();
 
         if ($this->getId() === $this->getWebsite()->getDefaultGroupId()) {
             $ids = $this->getWebsite()->getGroupIds();
@@ -432,15 +432,14 @@ public function afterDelete()
             $this->getWebsite()->setDefaultGroupId($defaultId);
             $this->getWebsite()->save();
         }
-        return parent::afterDelete();
+        return $result;
     }
 
     /**
      * @inheritdoc
      */
     public function afterSave()
     {
-        $this->_storeManager->reinitStores();
         $group = $this;
         $this->getResource()->addCommitCallback(function () use ($group) {
             $this->_storeManager->reinitStores();

app/code/Magento/Store/Model/Store.php

@@ -1056,7 +1056,6 @@ public function getWebsiteId()
      */
     public function afterSave()
     {
-        $this->_storeManager->reinitStores();
         if ($this->isObjectNew()) {
             $event = $this->_eventPrefix . '_add';
         } else {
@@ -1247,6 +1246,11 @@ public function beforeDelete()
      */
     public function afterDelete()
     {
+        $store = $this;
+        $this->getResource()->addCommitCallback(function () use ($store) {
+            $this->_storeManager->reinitStores();
+            $this->eventManager->dispatch($this->_eventPrefix . '_delete', ['store' => $store]);
+        });
         parent::afterDelete();
         $this->_configCacheType->clean();
 
@@ -1261,11 +1265,7 @@ public function afterDelete()
             $this->getGroup()->setDefaultStoreId($defaultId);
             $this->getGroup()->save();
         }
-        $store = $this;
-        $this->getResource()->addCommitCallback(function () use ($store) {
-            $this->_storeManager->reinitStores();
-            $this->eventManager->dispatch($this->_eventPrefix . '_delete', ['store' => $store]);
-        });
+
         return $this;
     }