Merge pull request #1443 from magento-engcom/2.1-develop-prs

Public Pull Requests

#10695

Author: Oleksii Korshenko

app/code/Magento/Shipping/Model/CarrierFactory.php

@@ -106,7 +106,8 @@ public function createIfActive($carrierCode, $storeId = null)
     {
         return $this->_scopeConfig->isSetFlag(
             'carriers/' . $carrierCode . '/active',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
         ) ? $this->create(
             $carrierCode,
             $storeId