Merge remote-tracking branch 'mpi/MC-23029' into Chaika-PR-2019-11-19

Author: veloraven

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

@@ -14,6 +14,7 @@
 
 /**
  * Order create address form
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
@@ -216,15 +217,12 @@ public function getAddressCollectionJson()
      * Prepare Form and add elements to form
      *
      * @return $this
-     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _prepareForm()
     {
-        $storeId = $this->getCreateOrderModel()
-            ->getSession()
-            ->getStoreId();
+        $storeId = $this->getAddressStoreId();
         $this->_storeManager->setCurrentStore($storeId);
 
         $fieldset = $this->_form->addFieldset('main', ['no_container' => true]);