diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
index 325d8ceee0d39..38831ed9138f1 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
@@ -311,7 +311,7 @@ public function joinUrlRewrite()
             ['request_path'],
             sprintf(
                 '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = %d AND {{table}}.entity_type = \'%s\'',
-                $this->_storeManager->getStore()->getId(),
+                $this->getStoreId(),
                 CategoryUrlRewriteGenerator::ENTITY_TYPE
             ),
             'left'
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php
new file mode 100644
index 0000000000000..d3b3ce05ee4b8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Category\Collection;
+
+class UrlRewriteTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_model;
+
+    protected function setUp()
+    {
+        $this->_model = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category\Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['joinTable'])
+            ->getMock();
+    }
+
+    public function testStoreIdUsedByUrlRewrite()
+    {
+        $cond = '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = 100 AND {{table}}.entity_type = \'category\'';
+        $this->_model->expects($this->once())
+            ->method('joinTable')
+            ->with(
+                $this->anything(),
+                $this->anything(),
+                $this->anything(),
+                $this->equalTo($cond),
+                $this->anything()
+            );
+        $this->_model->setStoreId(100);
+        $this->_model->joinUrlRewrite();
+    }
+}
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index 7498ae8fbc267..5d31e2ed91115 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -684,7 +684,7 @@ protected function _getAdditionalElementTypes()
     }
 
     /**
-     * Temporary moved those $this->getRequest()->getParam('blabla') from the code accross this block
+     * Temporary moved those $this->getRequest()->getParam('blabla') from the code across this block
      * to getBlala() methods to be later set from controller with setters
      */
 
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
index e895a739b1736..2aac25ef1be63 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -604,7 +604,7 @@ protected function _insertData()
     }
 
     /**
-     * Get new supper attribute id.
+     * Get new super attribute id.
      *
      * @return int
      */
diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php
index adff23cea698e..d951cad90558d 100644
--- a/app/code/Magento/Customer/Model/Session.php
+++ b/app/code/Magento/Customer/Model/Session.php
@@ -552,7 +552,7 @@ public function setAfterAuthUrl($url)
     }
 
     /**
-     * Reset core session hosts after reseting session ID
+     * Reset core session hosts after resetting session ID
      *
      * @return $this
      */
diff --git a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
index 0de66ccd505a4..d3c17a8d7c8de 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
@@ -5,7 +5,7 @@
  */
 
 /**
- * Mustishipping checkout base abstract block
+ * Multishipping checkout base abstract block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
index c254c9c8e9981..4041e7da7bdd8 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
@@ -9,7 +9,7 @@
 use Magento\Quote\Model\Quote\Address;
 
 /**
- * Mustishipping checkout shipping
+ * Multishipping checkout shipping
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 9b2ac61ef0989..5e5c356583b16 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -2363,13 +2363,17 @@ public function merge(Quote $quote)
      * Trigger collect totals after loading, if required
      *
      * @return $this
+     * @throws \Exception
      */
     protected function _afterLoad()
     {
         // collect totals and save me, if required
         if (1 == $this->getData('trigger_recollect')) {
-            $this->collectTotals()->save();
+            $this->collectTotals()
+                ->setTriggerRecollect(0)
+                ->save();
         }
+
         return parent::_afterLoad();
     }
 
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
index e2ba72a870c33..64a1562da8739 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
@@ -146,8 +146,7 @@ public function getOrderItem()
      * Declare qty
      *
      * @param float $qty
-     * @return \Magento\Sales\Model\Order\Invoice\Item
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return $this
      */
     public function setQty($qty)
     {
@@ -159,7 +158,6 @@ public function setQty($qty)
      * Applying qty to order item
      *
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function register()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
index 2b788d36acb0c..d58c8220813ef 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
@@ -74,7 +74,7 @@ protected function _initRule()
     /**
      * Initiate action
      *
-     * @return this
+     * @return $this
      */
     protected function _initAction()
     {
diff --git a/app/code/Magento/Security/Model/AdminSessionInfo.php b/app/code/Magento/Security/Model/AdminSessionInfo.php
index 2da74ce7689b2..2a66aaad80cf7 100644
--- a/app/code/Magento/Security/Model/AdminSessionInfo.php
+++ b/app/code/Magento/Security/Model/AdminSessionInfo.php
@@ -154,7 +154,7 @@ public function isOtherSessionsTerminated()
      * Setter for isOtherSessionsTerminated
      *
      * @param bool $isOtherSessionsTerminated
-     * @return this
+     * @return $this
      */
     public function setIsOtherSessionsTerminated($isOtherSessionsTerminated)
     {
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index 713b34c16d1f2..64f5b44803848 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -831,12 +831,12 @@ public function getInfoUrl($store = null)
      * If it necessary will be returned conversion type (minus or plus)
      *
      * @param null|int|string|Store $store
-     * @return bool
+     * @return bool|int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function needPriceConversion($store = null)
     {
-        $res = false;
+        $res = 0;
         $priceIncludesTax = $this->priceIncludesTax($store) || $this->getNeedUseShippingExcludeTax();
         if ($priceIncludesTax) {
             switch ($this->getPriceDisplayType($store)) {
@@ -844,7 +844,7 @@ public function needPriceConversion($store = null)
                 case self::DISPLAY_TYPE_BOTH:
                     return self::PRICE_CONVERSION_MINUS;
                 case self::DISPLAY_TYPE_INCLUDING_TAX:
-                    $res = true;
+                    $res = false;
                     break;
                 default:
                     break;
diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
index 29c4cc14ed674..e807749b11c32 100644
--- a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
+++ b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
@@ -72,7 +72,7 @@ public function getAdminPasswordLifetime()
     }
 
     /**
-     * Get admin maxiumum security failures from config
+     * Get admin maximum security failures from config
      *
      * @return int
      */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php
new file mode 100644
index 0000000000000..a81a2e2684b5a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\ResourceModel\Category;
+
+class CollectionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Category\Collection
+     */
+    private $collection;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\ResourceModel\Category\Collection::class
+        );
+    }
+
+    protected function setDown()
+    {
+        /* Refresh stores memory cache after store deletion */
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Store\Model\StoreManagerInterface::class
+        )->reinitStores();
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
+     */
+    public function testJoinUrlRewriteOnDefault()
+    {
+        $categories = $this->collection->joinUrlRewrite()->addPathFilter('1/2/3');
+        $this->assertCount(1, $categories);
+        /** @var $category \Magento\Catalog\Model\Category */
+        $category = $categories->getFirstItem();
+        $this->assertStringEndsWith('category.html', $category->getUrl());
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
+     */
+    public function testJoinUrlRewriteNotOnDefaultStore()
+    {
+        $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Store\Model\Store::class);
+        $storeId = $store->load('second_category_store', 'code')->getId();
+        $categories = $this->collection->setStoreId($storeId)->joinUrlRewrite()->addPathFilter('1/2/3');
+        $this->assertCount(1, $categories);
+        /** @var $category \Magento\Catalog\Model\Category */
+        $category = $categories->getFirstItem();
+        $this->assertContains('category-3-on-2', $category->getUrl());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
new file mode 100644
index 0000000000000..90bf630000e72
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Catalog\Model\CategoryFactory $factory */
+$factory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\CategoryFactory::class
+);
+/** @var \Magento\Catalog\Model\CategoryRepository $repository */
+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\CategoryRepository::class
+);
+/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+$storeManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Store\Model\StoreManagerInterface::class
+);
+/** @var \Magento\Store\Model\Store $store */
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+if (!$store->load('second_category_store', 'code')->getId()) {
+    $websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        \Magento\Store\Model\StoreManagerInterface::class
+    )->getWebsite()->getId();
+    $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        \Magento\Store\Model\StoreManagerInterface::class
+    )->getWebsite()->getDefaultGroupId();
+
+    $store->setCode(
+        'second_category_store'
+    )->setWebsiteId(
+        $websiteId
+    )->setGroupId(
+        $groupId
+    )->setName(
+        'Fixture Store'
+    )->setSortOrder(
+        10
+    )->setIsActive(
+        1
+    );
+    $store->save();
+}
+
+/* Refresh stores memory cache */
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\Store\Model\StoreManagerInterface::class
+)->reinitStores();
+
+/** @var \Magento\Catalog\Model\Category $newCategory */
+$newCategory = $factory->create();
+$newCategory
+    ->setName('Category')
+    ->setParentId(2)
+    ->setLevel(2)
+    ->setPath('1/2/3')
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1);
+$repository->save($newCategory);
+$currentStoreId = $storeManager->getStore()->getId();
+$storeManager->setCurrentStore($storeManager->getStore($store->getId()));
+$newCategory->setUrlKey('category-3-on-2');
+$repository->save($newCategory);
+$storeManager->setCurrentStore($storeManager->getStore($currentStoreId));