Merge remote-tracking branch 'origin/MC-15187' into 2.2.8-develop-pr82

Author: zakdma

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php

@@ -96,6 +96,11 @@ protected function _prepareLayout()
     public function getForm()
     {
         if ($this->_form === null) {
+            $storeId = $this->getCreateOrderModel()
+                ->getSession()
+                ->getStoreId();
+            $this->_storeManager->setCurrentStore($storeId);
+
             $this->_form = $this->_formFactory->create();
             $this->_prepareForm();
         }

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php

@@ -217,11 +217,6 @@ public function getAddressCollectionJson()
      */
     protected function _prepareForm()
     {
-        $storeId = $this->getCreateOrderModel()
-            ->getSession()
-            ->getStoreId();
-        $this->_storeManager->setCurrentStore($storeId);
-
         $fieldset = $this->_form->addFieldset('main', ['no_container' => true]);
 
         $addressForm = $this->_customerFormFactory->create('customer_address', 'adminhtml_customer_address');