diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
index 4db99b3ed5de7..843328fbf17d7 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
@@ -9,7 +9,7 @@
 ?>
 <?php
 /**
- * @see \Magento\Backend\Block\Template
+ * @see \Magento\Backend\Block\Denied
  */
 ?>
 <hr class="access-denied-hr"/>
@@ -21,8 +21,13 @@
         <li><span><?= $block->escapeHtml(__('Contact a system administrator or store owner to gain permissions.')) ?></span></li>
         <li>
             <span><?= $block->escapeHtml(__('Return to ')) ?>
-                <a href="<?= $block->escapeHtmlAttr(__('javascript:history.back()')) ?>">
-                    <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
+                <?php if(isset($_SERVER['HTTP_REFERER'])): ?>
+                    <a href="<?= $block->escapeUrl(__($_SERVER['HTTP_REFERER'])) ?>">
+                        <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
+                <?php else: ?>
+                    <a href="<?= $block->escapeHtmlAttr(__('javascript:history.back()')) ?>">
+                        <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
+                <?php endif ?>
             </span>
         </li>
     </ul>
diff --git a/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php b/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
index 29a1ef60a43de..f22c6903a230c 100644
--- a/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
@@ -119,7 +119,9 @@ private function mergeCategoryLinks($newCategoryPositions, $oldCategoryPositions
 
             if ($key === false) {
                 $result[] = $newCategoryPosition;
-            } elseif ($oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']) {
+            } elseif (isset($oldCategoryPositions[$key])
+                && $oldCategoryPositions[$key]['position'] != $newCategoryPosition['position']
+            ) {
                 $result[] = $newCategoryPositions[$key];
                 unset($oldCategoryPositions[$key]);
             }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Model/ResourceModel/Config.php
index 7fb13265cd130..7b5d4e09a3599 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Config.php
@@ -149,8 +149,7 @@ public function getAttributesUsedForSortBy()
             ['main_table' => $this->getTable('eav_attribute')]
         )->join(
             ['additional_table' => $this->getTable('catalog_eav_attribute')],
-            'main_table.attribute_id = additional_table.attribute_id',
-            []
+            'main_table.attribute_id = additional_table.attribute_id'
         )->joinLeft(
             ['al' => $this->getTable('eav_attribute_label')],
             'al.attribute_id = main_table.attribute_id AND al.store_id = ' . $this->getStoreId(),
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php
index 78db12be56b42..0b85ef38387fa 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php
@@ -197,6 +197,21 @@ public function getCategoryDataProvider()
                 ],
                 [], //affected category_ids
             ],
+            [
+                [3], //model category_ids
+                [
+                    ['category_id' => 3, 'position' => 20],
+                    ['category_id' => 4, 'position' => 30],
+                ], // dto category links
+                [
+                    ['category_id' => 3, 'position' => 10],
+                ],
+                [
+                    ['category_id' => 3, 'position' => 20],
+                    ['category_id' => 4, 'position' => 30],
+                ],
+                [3, 4], //affected category_ids
+            ],
         ];
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ConfigTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ConfigTest.php
new file mode 100644
index 0000000000000..abbcef942373e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ConfigTest.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Test for Magento\Catalog\Model\ResourceModel\Config
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Config
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eavConfig;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->resource = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
+        $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->eavConfig = $this->createMock(\Magento\Eav\Model\Config::class);
+
+        $this->model = $objectManager->getObject(
+            \Magento\Catalog\Model\ResourceModel\Config::class,
+            [
+                'resource' => $this->resource,
+                'storeManager' => $this->storeManager,
+                'eavConfig' => $this->eavConfig,
+            ]
+        );
+
+        parent::setUp();
+    }
+
+    public function testGetAttributesUsedForSortBy()
+    {
+        $expression = 'someExpression';
+        $storeId = 1;
+        $entityTypeId = 4;
+
+        $connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $entityTypeMock = $this->createMock(\Magento\Eav\Model\Entity\Type::class);
+
+        $this->resource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connectionMock);
+
+        $connectionMock->expects($this->once())->method('getCheckSql')
+            ->with('al.value IS NULL', 'main_table.frontend_label', 'al.value')
+            ->willReturn($expression);
+        $connectionMock->expects($this->atLeastOnce())->method('select')->willReturn($selectMock);
+
+        $this->resource->expects($this->exactly(3))->method('getTableName')->withConsecutive(
+            ['eav_attribute'],
+            ['catalog_eav_attribute'],
+            ['eav_attribute_label']
+        )->willReturnOnConsecutiveCalls('eav_attribute', 'catalog_eav_attribute', 'eav_attribute_label');
+
+        $this->storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $storeMock->expects($this->once())->method('getId')->willReturn($storeId);
+
+        $this->eavConfig->expects($this->once())->method('getEntityType')->willReturn($entityTypeMock);
+        $entityTypeMock->expects($this->once())->method('getId')->willReturn($entityTypeId);
+
+        $selectMock->expects($this->once())->method('from')
+            ->with(['main_table' => 'eav_attribute'])->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('join')->with(
+            ['additional_table' => 'catalog_eav_attribute'],
+            'main_table.attribute_id = additional_table.attribute_id'
+        )->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('joinLeft')
+            ->with(
+                ['al' => 'eav_attribute_label'],
+                'al.attribute_id = main_table.attribute_id AND al.store_id = ' . $storeId,
+                ['store_label' => $expression]
+            )->willReturn($selectMock);
+        $selectMock->expects($this->exactly(2))->method('where')->withConsecutive(
+            ['main_table.entity_type_id = ?', $entityTypeId],
+            ['additional_table.used_for_sort_by = ?', 1]
+        )->willReturn($selectMock);
+
+        $connectionMock->expects($this->once())->method('fetchAll')->with($selectMock);
+
+        $this->model->getAttributesUsedForSortBy();
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
index 748589924d916..f0351467e5f0e 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
@@ -12,25 +12,37 @@
 class DbStorage extends BaseDbStorage
 {
     /**
-     * @param array $data
-     * @return \Magento\Framework\DB\Select
+     * {@inheritDoc}
      */
     protected function prepareSelect(array $data)
     {
+        $metadata = [];
+        if (array_key_exists(UrlRewrite::METADATA, $data)) {
+            $metadata = $data[UrlRewrite::METADATA];
+            unset($data[UrlRewrite::METADATA]);
+        }
+
         $select = $this->connection->select();
-        $select->from(['url_rewrite' => $this->resource->getTableName('url_rewrite')])
-            ->joinLeft(
-                ['relation' => $this->resource->getTableName(Product::TABLE_NAME)],
-                'url_rewrite.url_rewrite_id = relation.url_rewrite_id'
-            )
-            ->where('url_rewrite.entity_id IN (?)', $data['entity_id'])
-            ->where('url_rewrite.entity_type = ?', $data['entity_type'])
-            ->where('url_rewrite.store_id IN (?)', $data['store_id']);
-        if (empty($data[UrlRewrite::METADATA]['category_id'])) {
+        $select->from([
+            'url_rewrite' => $this->resource->getTableName(self::TABLE_NAME)
+        ]);
+        $select->joinLeft(
+            ['relation' => $this->resource->getTableName(Product::TABLE_NAME)],
+            'url_rewrite.url_rewrite_id = relation.url_rewrite_id'
+        );
+
+        foreach ($data as $column => $value) {
+            $select->where('url_rewrite.' . $column . ' IN (?)', $value);
+        }
+        if (empty($metadata['category_id'])) {
             $select->where('relation.category_id IS NULL');
         } else {
-            $select->where('relation.category_id = ?', $data[UrlRewrite::METADATA]['category_id']);
+            $select->where(
+                'relation.category_id = ?',
+                $metadata['category_id']
+            );
         }
+
         return $select;
     }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
new file mode 100644
index 0000000000000..d00b0c87fa5ad
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Storage;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\CatalogUrlRewrite\Model\Storage\DbStorage;
+use PHPUnit\Framework\TestCase;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\App\ResourceConnection;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+class DbStorageTest extends TestCase
+{
+    /**
+     * @var DbStorage
+     */
+    private $storage;
+
+    /**
+     * @var UrlRewriteFactory|Mock
+     */
+    private $urlRewriteFactory;
+
+    /**
+     * @var DataObjectHelper|Mock
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var AdapterInterface|Mock
+     */
+    private $connectionMock;
+
+    /**
+     * @var Select|Mock
+     */
+    private $select;
+
+    /**
+     * @var ResourceConnection|Mock
+     */
+    private $resource;
+
+    /**
+     * @inheritDoc
+     *
+     * Preparing mocks and target object.
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->urlRewriteFactory = $this
+            ->getMockBuilder(UrlRewriteFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dataObjectHelper = $this->createMock(DataObjectHelper::class);
+        $this->connectionMock = $this->createMock(AdapterInterface::class);
+        $this->select = $this->createPartialMock(
+            Select::class,
+            ['from', 'where', 'deleteFromSelect', 'joinLeft']
+        );
+        $this->resource = $this->createMock(ResourceConnection::class);
+
+        $this->resource->expects($this->any())
+            ->method('getConnection')
+            ->will($this->returnValue($this->connectionMock));
+        $this->connectionMock->expects($this->any())
+            ->method('select')
+            ->will($this->returnValue($this->select));
+
+        $this->storage = (new ObjectManager($this))->getObject(
+            DbStorage::class,
+            [
+                'urlRewriteFactory' => $this->urlRewriteFactory,
+                'dataObjectHelper' => $this->dataObjectHelper,
+                'resource' => $this->resource,
+            ]
+        );
+    }
+
+    public function testPrepareSelect()
+    {
+        //Passing expected parameters, checking select built.
+        $entityType = 'custom';
+        $entityId= 42;
+        $storeId = 0;
+        $categoryId = 2;
+        $redirectType = 301;
+        //Expecting this methods to be called on select
+        $this->select
+            ->expects($this->at(2))
+            ->method('where')
+            ->with('url_rewrite.entity_id IN (?)', $entityId)
+            ->willReturn($this->select);
+        $this->select
+            ->expects($this->at(3))
+            ->method('where')
+            ->with('url_rewrite.entity_type IN (?)', $entityType)
+            ->willReturn($this->select);
+        $this->select
+            ->expects($this->at(4))
+            ->method('where')
+            ->with('url_rewrite.store_id IN (?)', $storeId)
+            ->willReturn($this->select);
+        $this->select
+            ->expects($this->at(5))
+            ->method('where')
+            ->with('url_rewrite.redirect_type IN (?)', $redirectType)
+            ->willReturn($this->select);
+        $this->select
+            ->expects($this->at(6))
+            ->method('where')
+            ->with('relation.category_id = ?', $categoryId)
+            ->willReturn($this->select);
+        //Preparing mocks to be used
+        $this->select
+            ->expects($this->any())
+            ->method('from')
+            ->willReturn($this->select);
+        $this->select
+            ->expects($this->any())
+            ->method('joinLeft')
+            ->willReturn($this->select);
+        //Indirectly calling prepareSelect
+        $this->storage->findOneByData([
+            UrlRewrite::ENTITY_ID => $entityId,
+            UrlRewrite::ENTITY_TYPE => $entityType,
+            UrlRewrite::STORE_ID => $storeId,
+            UrlRewrite::REDIRECT_TYPE => $redirectType,
+            UrlRewrite::METADATA => ['category_id' => $categoryId]
+        ]);
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 3b141d4cb7f68..a6ba510932d3d 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -269,7 +269,7 @@ public function setData($key, $value = null)
     {
         if (is_array($key)) {
             $key = $this->_implodeArrayField($key);
-        } elseif (is_array($value) && !empty($value) && $this->isAddressMultilineAttribute($key)) {
+        } elseif (is_array($value) && $this->isAddressMultilineAttribute($key)) {
             $value = $this->_implodeArrayValues($value);
         }
         return parent::setData($key, $value);
@@ -309,7 +309,11 @@ protected function _implodeArrayField(array $data)
      */
     protected function _implodeArrayValues($value)
     {
-        if (is_array($value) && count($value)) {
+        if (is_array($value)) {
+            if (!count($value)) {
+                return '';
+            }
+
             $isScalar = false;
             foreach ($value as $val) {
                 if (is_scalar($val)) {
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
index 23b8b38c962b9..2eef9a44cab74 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
@@ -366,6 +366,15 @@ public function testGetStreetFullAlwaysReturnsString($expectedResult, $street)
         $this->assertEquals($expectedResult, $this->model->getStreetFull());
     }
 
+    /**
+     * @dataProvider getStreetFullDataProvider
+     */
+    public function testSetDataStreetAlwaysConvertedToString($expectedResult, $street)
+    {
+        $this->model->setData('street', $street);
+        $this->assertEquals($expectedResult, $this->model->getData('street'));
+    }
+
     /**
      * @return array
      */
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
index c72ae42031001..c7ce4b2f2f11b 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
@@ -118,17 +118,37 @@ public function loadByEmail($subscriberEmail)
      */
     public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
-        $select = $this->connection->select()->from($this->getMainTable())->where('customer_id=:customer_id');
-
-        $result = $this->connection->fetchRow($select, ['customer_id' => $customer->getId()]);
+        $select = $this->connection
+            ->select()
+            ->from($this->getMainTable())
+            ->where('customer_id=:customer_id and store_id=:store_id');
+
+        $result = $this->connection
+            ->fetchRow(
+                $select,
+                [
+                    'customer_id' => $customer->getId(),
+                    'store_id' => $customer->getStoreId()
+                ]
+            );
 
         if ($result) {
             return $result;
         }
 
-        $select = $this->connection->select()->from($this->getMainTable())->where('subscriber_email=:subscriber_email');
-
-        $result = $this->connection->fetchRow($select, ['subscriber_email' => $customer->getEmail()]);
+        $select = $this->connection
+            ->select()
+            ->from($this->getMainTable())
+            ->where('subscriber_email=:subscriber_email and store_id=:store_id');
+
+        $result = $this->connection
+            ->fetchRow(
+                $select,
+                [
+                    'subscriber_email' => $customer->getEmail(),
+                    'store_id' => $customer->getStoreId()
+                ]
+            );
 
         if ($result) {
             return $result;
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index ea2a42241d8fc..cc143fdc52e3b 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -360,6 +360,7 @@ public function loadByCustomerId($customerId)
     {
         try {
             $customerData = $this->customerRepository->getById($customerId);
+            $customerData->setStoreId($this->_storeManager->getStore()->getId());
             $data = $this->getResource()->loadByCustomerData($customerData);
             $this->addData($data);
             if (!empty($data) && $customerData->getId() && !$this->getCustomerId()) {
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
index 7716f4744a922..5a4032dc4dffd 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
@@ -187,6 +187,12 @@ public function testUpdateSubscription()
         $customerDataMock->expects($this->once())->method('getStoreId')->willReturn('store_id');
         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
 
+        $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId'])
+            ->getMock();
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeModel);
+
         $this->assertEquals($this->subscriber, $this->subscriber->updateSubscription($customerId));
     }
 
diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
index 03ce42bf25c4a..1dfcc95a552c6 100644
--- a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
@@ -134,7 +134,6 @@ define([
          */
         _create: function () {
             $(this.element).on('gallery:loaded',  $.proxy(function () {
-                this.fotoramaItem = $(this.element).find('.fotorama-item');
                 this._initialize();
             }, this));
         },
@@ -154,6 +153,7 @@ define([
                 this.defaultVideoData = this.options.videoData = this.videoDataPlaceholder;
             }
 
+            this.fotoramaItem = $(this.element).find('.fotorama-item');
             this.clearEvents();
 
             if (this._checkForVideoExist()) {
@@ -164,6 +164,8 @@ define([
                 this._initFotoramaVideo();
                 this._attachFotoramaEvents();
             }
+
+            this.element.trigger('AddFotoramaVideoEvents:loaded');
         },
 
         /**
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
index d01ae7304bdc6..e25b770b7a81e 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
@@ -34,6 +34,7 @@
  * Test class for sales quote address model
  *
  * @see \Magento\Quote\Model\Quote\Address
+ * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddressTest extends \PHPUnit\Framework\TestCase
@@ -48,6 +49,11 @@ class AddressTest extends \PHPUnit\Framework\TestCase
      */
     private $quote;
 
+    /**
+     * @var \Magento\Quote\Model\Quote\Address\CustomAttributeListInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeList;
+
     /**
      * @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -166,9 +172,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->attributeList = $this->createMock(\Magento\Quote\Model\Quote\Address\CustomAttributeListInterface::class);
+        $this->attributeList->method('getAttributes')->willReturn([]);
+
         $this->address = $objectManager->getObject(
             \Magento\Quote\Model\Quote\Address::class,
             [
+                'attributeList' => $this->attributeList,
                 'scopeConfig' => $this->scopeConfig,
                 'serializer' => $this->serializer,
                 'storeManager' => $this->storeManager,
diff --git a/app/code/Magento/ReleaseNotification/i18n/en_US.csv b/app/code/Magento/ReleaseNotification/i18n/en_US.csv
index 3fd0be63b4ab1..0f4a1f87b8b4e 100644
--- a/app/code/Magento/ReleaseNotification/i18n/en_US.csv
+++ b/app/code/Magento/ReleaseNotification/i18n/en_US.csv
@@ -1,42 +1,42 @@
 "Next >","Next >"
 "< Back","< Back"
 "Done","Done"
-"What's new for Magento 2.2.2","What's new for Magento 2.2.2"
-"<p>Magento 2.2.2 offers an exciting set of features and enhancements, including:</p>
+"What's new with Magento 2.2.2","What's new with Magento 2.2.2"
+"<p>Magento 2.2.2 offers advanced new features, including:</p>
     <br />
     <div class=""analytics-highlight"">
     <h3>Advanced Reporting</h3>
     <p>Gain valuable insights through a dynamic suite of product, order, and customer reports,
     powered by Magento Business Intelligence.</p>
     </div>
-    <div class=""developer-experience-highlight"">
-    <h3>Developer Experience</h3>
-    <p>We've improved the entire development lifecycle - installation, development, and maintenance
-    - while ensuring Magento's commitment to quality.</p>
+    <div class=""instant-purchase-highlight"">
+    <h3>Instant Purchase</h3>
+    <p>Simplify ordering and boost conversion rates by allowing your customers to use stored
+    payment and shipping information to skip tedious checkout steps.</p>
     </div>
-    <div class=""b2b-highlight"">
-    <h3>Business-to-Business (B2B) <span>Magento Commerce only</span></h3>
-    <p>Features to manage your complex company accounts, rapid reordering, new buyers' roles and
-    permissions, and more.</p>
+    <div class=""email-marketing-highlight"">
+    <h3>Email Marketing Automation</span></h3>
+    <p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
+    your Magento store's live data.</p>
     </div>
     <p>Release notes and additional details can be found at
     <a href=""http://devdocs.magento.com/"" target=""_blank"">Magento DevDocs</a>.
-    </p>","<p>Magento 2.2.2 offers an exciting set of features and enhancements, including:</p>
+    </p>","<p>Magento 2.2.2 offers advanced new features, including:</p>
     <br />
     <div class=""analytics-highlight"">
     <h3>Advanced Reporting</h3>
     <p>Gain valuable insights through a dynamic suite of product, order, and customer reports,
     powered by Magento Business Intelligence.</p>
     </div>
-    <div class=""developer-experience-highlight"">
-    <h3>Developer Experience</h3>
-    <p>We've improved the entire development lifecycle - installation, development, and maintenance
-    - while ensuring Magento's commitment to quality.</p>
+    <div class=""instant-purchase-highlight"">
+    <h3>Instant Purchase</h3>
+    <p>Simplify ordering and boost conversion rates by allowing your customers to use stored
+    payment and shipping information to skip tedious checkout steps.</p>
     </div>
-    <div class=""b2b-highlight"">
-    <h3>Business-to-Business (B2B) <span>Magento Commerce only</span></h3>
-    <p>Features to manage your complex company accounts, rapid reordering, new buyers' roles and
-    permissions, and more.</p>
+    <div class=""email-marketing-highlight"">
+    <h3>Email Marketing Automation</span></h3>
+    <p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
+    your Magento store's live data.</p>
     </div>
     <p>Release notes and additional details can be found at
     <a href=""http://devdocs.magento.com/"" target=""_blank"">Magento DevDocs</a>.
@@ -46,7 +46,7 @@
     provides you with a dynamic suite of reports with rich insights about the health of your
     business.</p><br /><p>As part of the Advanced Reporting service, we may also use your customer
     data for such purposes as benchmarking, improving our products and services, and providing you
-    with new and improved analytics.</p><br /><p>By using Magento 2.2, you agree to the Advanced
+    with new and improved analytics.</p><br /><p>By using Magento 2.2.2, you agree to the Advanced
     Reporting <a href=""https://magento.com/legal/terms/privacy"" target=""_blank"">Privacy Policy</a> and
     <a href=""https://magento.com/legal/terms/cloud-terms"" target=""_blank"">Terms
     of Service</a>. You may opt out at any time from the Stores Configuration page.</p>
@@ -54,54 +54,59 @@
     provides you with a dynamic suite of reports with rich insights about the health of your
     business.</p><br /><p>As part of the Advanced Reporting service, we may also use your customer
     data for such purposes as benchmarking, improving our products and services, and providing you
-    with new and improved analytics.</p><br /><p>By using Magento 2.2, you agree to the Advanced
+    with new and improved analytics.</p><br /><p>By using Magento 2.2.2, you agree to the Advanced
     Reporting <a href=""https://magento.com/legal/terms/privacy"" target=""_blank"">Privacy Policy</a> and
     <a href=""https://magento.com/legal/terms/cloud-terms"" target=""_blank"">Terms
-    of Service</a>. You may opt out at any time from the Stores Configuration page.</p>
-    "
-"Developer Experience","Developer Experience"
-"<p>Magento's 2.2.2 release offers a set of improvements that were developed using increased
-    quality standards. The release includes these features, among others:
+    of Service</a>. You may opt out at any time from the Stores Configuration page.</p>"
+"Instant Purchase","Instant Purchase"
+"<p>Now you can deliver an Amazon-like experience with a new, streamlined checkout option.
+    Logged-in customers can use previously-stored payment credentials and shipping information
+    to skip steps, making the process faster and easier, especially for mobile shoppers. Key
+    features include:
     </p>
     <ul>
-    <li><span>GitHub Community Moderator Team</span></li>
-    <li><span>GitHub Community Videos</span></li>
-    <li><span>DevDocs Enhancements</span></li>
-    </ul>
-    <p>Find the 2.2.2 details and future plans in the
-    <a href=""http://community.magento.com/devblog"" target=""_blank"">Magento DevBlog</a>.
-    </p>","<p>Magento's 2.2.2 release offers a set of improvements that were developed using increased
-    quality standards. The release includes these features, among others:
+    <li><span>Configurable “Instant Purchase” button to place orders</span></li>
+    <li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit
+    Card, Braintree PayPal, and PayPal Payflow Pro.</span></li>
+    <li><span>Shipping to the customer’s default address using the lowest cost, available shipping
+    method</span></li>
+    <li><span>Ability for developers to customize the Instant Purchase business logic to meet
+    merchant needs</span></li>
+    </ul>","<p>Now you can deliver an Amazon-like experience with a new, streamlined checkout option.
+    Logged-in customers can use previously-stored payment credentials and shipping information
+    to skip steps, making the process faster and easier, especially for mobile shoppers. Key
+    features include:
     </p>
     <ul>
-    <li><span>GitHub Community Moderator Team</span></li>
-    <li><span>GitHub Community Videos</span></li>
-    <li><span>DevDocs Enhancements</span></li>
-    </ul>
-    <p>Find the 2.2.2 details and future plans in the
-    <a href=""http://community.magento.com/devblog"" target=""_blank"">Magento DevBlog</a>.
-    </p>"
-"Business-to-Business (B2B) <span>Magento Commerce only</span>","Business-to-Business (B2B) <span>Magento Commerce only</span>"
-"<p>Magento Commerce 2.2.2 offers rich new functionality that empowers B2B merchants to transform
-    their online purchasing experience to achieve greater operational efficiency, improved customer
-    service, and sales growth. New capabilities include:
+    <li><span>Configurable “Instant Purchase” button to place orders</span></li>
+    <li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit
+    Card, Braintree PayPal, and PayPal Payflow Pro.</span></li>
+    <li><span>Shipping to the customer’s default address using the lowest cost, available shipping
+    method</span></li>
+    <li><span>Ability for developers to customize the Instant Purchase business logic to meet
+    merchant needs</span></li>
+    </ul>"
+"Email Marketing Automation","Email Marketing Automation"
+"<p>Unlock an unparalleled level of insight and control of your eCommerce marketing with
+    dotmailer Email Marketing Automation. Included with Magento 2.2.2 for easy set-up, dotmailer
+    ensures every customer’s journey is captured, segmented, and personalized, enabling you to
+    deliver customer-centric campaigns that beat your results over and over again. Benefits include:
     </p>
     <ul>
-    <li><span>Company accounts with multiple tiers of buyers</span></li>
-    <li><span>Buyer roles and permissions</span></li>
-    <li><span>Custom catalogs and pricing</span></li>
-    <li><span>Quoting support</span></li>
-    <li><span>Rapid reorder experience</span></li>
-    <li><span>Payments on credit</span></li>
-    </ul>","<p>Magento Commerce 2.2.2 offers rich new functionality that empowers B2B merchants to transform
-    their online purchasing experience to achieve greater operational efficiency, improved customer
-    service, and sales growth. New capabilities include:
+    <li><span>No obligation 14-day trial.</span></li>
+    <li><span>Automation campaigns using your live Magento store data that drive revenue,
+    including abandoned cart, abandoned browse, product replenishment, and many more</span></li>
+    <li><span>Built-in solution for transactional emails.</span></li>
+    <li><span>Telephone support and advice from marketing experts included.</span></li>
+    </ul>","<p>Unlock an unparalleled level of insight and control of your eCommerce marketing with
+    dotmailer Email Marketing Automation. Included with Magento 2.2.2 for easy set-up, dotmailer
+    ensures every customer’s journey is captured, segmented, and personalized, enabling you to
+    deliver customer-centric campaigns that beat your results over and over again. Benefits include:
     </p>
     <ul>
-    <li><span>Company accounts with multiple tiers of buyers</span></li>
-    <li><span>Buyer roles and permissions</span></li>
-    <li><span>Custom catalogs and pricing</span></li>
-    <li><span>Quoting support</span></li>
-    <li><span>Rapid reorder experience</span></li>
-    <li><span>Payments on credit</span></li>
+    <li><span>No obligation 14-day trial.</span></li>
+    <li><span>Automation campaigns using your live Magento store data that drive revenue,
+    including abandoned cart, abandoned browse, product replenishment, and many more</span></li>
+    <li><span>Built-in solution for transactional emails.</span></li>
+    <li><span>Telephone support and advice from marketing experts included.</span></li>
     </ul>"
diff --git a/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
index 708d366f455bf..1ddfde5cafb9c 100644
--- a/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
+++ b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
@@ -43,7 +43,7 @@
             <state>true</state>
             <options>
                 <option name="modalClass" xsi:type="string">release-notification-modal</option>
-                <option name="title" xsi:type="string" translate="true">What's new for Magento 2.2.2</option>
+                <option name="title" xsi:type="string" translate="true">What's new with Magento 2.2.2</option>
                 <option name="type" xsi:type="string">popup</option>
                 <option name="responsive" xsi:type="boolean">true</option>
                 <option name="innerScroll" xsi:type="boolean">true</option>
@@ -60,22 +60,22 @@
                         <item name="label" xsi:type="string"/>
                         <item name="additionalClasses" xsi:type="string">release-notification-text</item>
                         <item name="text" xsi:type="string" translate="true"><![CDATA[
-                        <p>Magento 2.2.2 offers an exciting set of features and enhancements, including:</p>
+                        <p>Magento 2.2.2 offers advanced new features, including:</p>
                         <br />
                         <div class="analytics-highlight">
                         <h3>Advanced Reporting</h3>
                         <p>Gain valuable insights through a dynamic suite of product, order, and customer reports,
                         powered by Magento Business Intelligence.</p>
                         </div>
-                        <div class="developer-experience-highlight">
-                        <h3>Developer Experience</h3>
-                        <p>We've improved the entire development lifecycle - installation, development, and maintenance
-                        - while ensuring Magento's commitment to quality.</p>
+                        <div class="instant-purchase-highlight">
+                        <h3>Instant Purchase</h3>
+                        <p>Simplify ordering and boost conversion rates by allowing your customers to use stored
+                        payment and shipping information to skip tedious checkout steps.</p>
                         </div>
-                        <div class="b2b-highlight">
-                        <h3>Business-to-Business (B2B) <span>Magento Commerce only</span></h3>
-                        <p>Features to manage your complex company accounts, rapid reordering, new buyers' roles and
-                        permissions, and more.</p>
+                        <div class="email-marketing-highlight">
+                        <h3>Email Marketing Automation</span></h3>
+                        <p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
+                        your Magento store's live data.</p>
                         </div>
                         <p>Release notes and additional details can be found at
                         <a href="http://devdocs.magento.com/" target="_blank">Magento DevDocs</a>.
@@ -139,7 +139,7 @@
                         provides you with a dynamic suite of reports with rich insights about the health of your
                         business.</p><br /><p>As part of the Advanced Reporting service, we may also use your customer
                         data for such purposes as benchmarking, improving our products and services, and providing you
-                        with new and improved analytics.</p><br /><p>By using Magento 2.2, you agree to the Advanced
+                        with new and improved analytics.</p><br /><p>By using Magento 2.2.2, you agree to the Advanced
                         Reporting <a href="https://magento.com/legal/terms/privacy" target="_blank">Privacy Policy</a>
                         and <a href="https://magento.com/legal/terms/cloud-terms" target="_blank">Terms
                         of Service</a>. You may opt out at any time from the Stores Configuration page.</p>]]>
@@ -184,7 +184,7 @@
                                     <item name="actionName" xsi:type="string">closeModal</item>
                                 </item>
                                 <item name="1" xsi:type="array">
-                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = developer_experience_modal</item>
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = instant_purchase_modal</item>
                                     <item name="actionName" xsi:type="string">openModal</item>
                                 </item>
                             </item>
@@ -198,12 +198,12 @@
             </container>
         </fieldset>
     </modal>
-    <modal name="developer_experience_modal" component="Magento_ReleaseNotification/js/modal/component">
+    <modal name="instant_purchase_modal" component="Magento_ReleaseNotification/js/modal/component">
         <settings>
             <onCancel>actionCancel</onCancel>
             <options>
-                <option name="modalClass" xsi:type="string">developer-experience-modal</option>
-                <option name="title" xsi:type="string" translate="true">Developer Experience</option>
+                <option name="modalClass" xsi:type="string">instant-purchase-modal</option>
+                <option name="title" xsi:type="string" translate="true">Instant Purchase</option>
                 <option name="type" xsi:type="string">popup</option>
                 <option name="responsive" xsi:type="boolean">true</option>
                 <option name="innerScroll" xsi:type="boolean">true</option>
@@ -220,17 +220,20 @@
                         <item name="label" xsi:type="string"/>
                         <item name="additionalClasses" xsi:type="string">release-notification-text</item>
                         <item name="text" xsi:type="string" translate="true"><![CDATA[
-                        <p>Magento's 2.2.2 release offers a set of improvements that were developed using increased
-                        quality standards. The release includes these features, among others:
+                        <p>Now you can deliver an Amazon-like experience with a new, streamlined checkout option.
+                        Logged-in customers can use previously-stored payment credentials and shipping information
+                        to skip steps, making the process faster and easier, especially for mobile shoppers. Key
+                        features include:
                         </p>
                         <ul>
-                        <li><span>GitHub Community Moderator Team</span></li>
-                        <li><span>GitHub Community Videos</span></li>
-                        <li><span>DevDocs Enhancements</span></li>
-                        </ul>
-                        <p>Find the 2.2.2 details and future plans in the
-                        <a href="http://community.magento.com/devblog" target="_blank">Magento DevBlog</a>.
-                        </p>]]>
+                        <li><span>Configurable “Instant Purchase” button to place orders</span></li>
+                        <li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit
+                        Card, Braintree PayPal, and PayPal Payflow Pro.</span></li>
+                        <li><span>Shipping to the customer’s default address using the lowest cost, available shipping
+                        method</span></li>
+                        <li><span>Ability for developers to customize the Instant Purchase business logic to meet
+                        merchant needs</span></li>
+                        </ul>]]>
                         </item>
                     </item>
                 </argument>
@@ -247,7 +250,7 @@
                             <item name="buttonClasses" xsi:type="string">release-notification-button-back</item>
                             <item name="actions" xsi:type="array">
                                 <item name="0" xsi:type="array">
-                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = developer_experience_modal</item>
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = instant_purchase_modal</item>
                                     <item name="actionName" xsi:type="string">closeModal</item>
                                 </item>
                                 <item name="1" xsi:type="array">
@@ -268,11 +271,11 @@
                             <item name="buttonClasses" xsi:type="string">release-notification-button-next</item>
                             <item name="actions" xsi:type="array">
                                 <item name="0" xsi:type="array">
-                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = developer_experience_modal</item>
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = instant_purchase_modal</item>
                                     <item name="actionName" xsi:type="string">closeModal</item>
                                 </item>
                                 <item name="1" xsi:type="array">
-                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = b2b_modal</item>
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = email_marketing_modal</item>
                                     <item name="actionName" xsi:type="string">openModal</item>
                                 </item>
                             </item>
@@ -286,13 +289,12 @@
             </container>
         </fieldset>
     </modal>
-    <modal name="b2b_modal" component="Magento_ReleaseNotification/js/modal/component">
+    <modal name="email_marketing_modal" component="Magento_ReleaseNotification/js/modal/component">
         <settings>
             <onCancel>actionCancel</onCancel>
             <options>
-                <option name="modalClass" xsi:type="string">b2b-modal</option>
-                <option name="title" xsi:type="string" translate="true"><![CDATA[Business-to-Business (B2B)
-                <span>Magento Commerce only</span>]]></option>
+                <option name="modalClass" xsi:type="string">email-marketing-modal</option>
+                <option name="title" xsi:type="string" translate="true">Email Marketing Automation</option>
                 <option name="type" xsi:type="string">popup</option>
                 <option name="responsive" xsi:type="boolean">true</option>
                 <option name="innerScroll" xsi:type="boolean">true</option>
@@ -309,17 +311,17 @@
                         <item name="label" xsi:type="string"/>
                         <item name="additionalClasses" xsi:type="string">release-notification-text</item>
                         <item name="text" xsi:type="string" translate="true"><![CDATA[
-                        <p>Magento Commerce 2.2.2 offers rich new functionality that empowers B2B merchants to transform
-                        their online purchasing experience to achieve greater operational efficiency, improved customer
-                        service, and sales growth. New capabilities include:
+                        <p>Unlock an unparalleled level of insight and control of your eCommerce marketing with
+                        dotmailer Email Marketing Automation. Included with Magento 2.2.2 for easy set-up, dotmailer
+                        ensures every customer’s journey is captured, segmented, and personalized, enabling you to
+                        deliver customer-centric campaigns that beat your results over and over again. Benefits include:
                         </p>
                         <ul>
-                        <li><span>Company accounts with multiple tiers of buyers</span></li>
-                        <li><span>Buyer roles and permissions</span></li>
-                        <li><span>Custom catalogs and pricing</span></li>
-                        <li><span>Quoting support</span></li>
-                        <li><span>Rapid reorder experience</span></li>
-                        <li><span>Payments on credit</span></li>
+                        <li><span>No obligation 14-day trial.</span></li>
+                        <li><span>Automation campaigns using your live Magento store data that drive revenue,
+                        including abandoned cart, abandoned browse, product replenishment, and many more.</span></li>
+                        <li><span>Built-in solution for transactional emails.</span></li>
+                        <li><span>Telephone support and advice from marketing experts included.</span></li>
                         </ul>]]>
                         </item>
                     </item>
@@ -337,11 +339,11 @@
                             <item name="buttonClasses" xsi:type="string">release-notification-button-back</item>
                             <item name="actions" xsi:type="array">
                                 <item name="0" xsi:type="array">
-                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = b2b_modal</item>
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = email_marketing_modal</item>
                                     <item name="actionName" xsi:type="string">closeModal</item>
                                 </item>
                                 <item name="1" xsi:type="array">
-                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = developer_experience_modal</item>
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = instant_purchase_modal</item>
                                     <item name="actionName" xsi:type="string">openModal</item>
                                 </item>
                             </item>
@@ -358,7 +360,7 @@
                             <item name="buttonClasses" xsi:type="string">release-notification-button-next</item>
                             <item name="actions" xsi:type="array">
                                 <item name="0" xsi:type="array">
-                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = b2b_modal</item>
+                                    <item name="targetName" xsi:type="string">ns = ${ $.ns }, index = email_marketing_modal</item>
                                     <item name="actionName" xsi:type="string">closeReleaseNotes</item>
                                 </item>
                             </item>
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
index 323c2df975a8a..b684fe8c62df2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
@@ -160,4 +160,22 @@ public function convertPrice($value, $format = true)
             )
             : $this->priceCurrency->convert($value, $this->getStore());
     }
+
+    /**
+     * If item is quote or wishlist we need to get product from it.
+     *
+     * @param $item
+     *
+     * @return Product
+     */
+    public function getProduct($item)
+    {
+        if ($item instanceof Product) {
+            $product = $item;
+        } else {
+            $product = $item->getProduct();
+        }
+
+        return $product;
+    }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index cb26fb611f219..64e20d5a69041 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -93,6 +93,11 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
      */
     protected $orderRepository;
 
+    /**
+     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection|null
+     */
+    private $tracksCollection = null;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -331,16 +336,11 @@ public function addItem(\Magento\Sales\Model\Order\Shipment\Item $item)
      */
     public function getTracksCollection()
     {
-        if (!$this->hasData(ShipmentInterface::TRACKS)) {
-            $this->setTracks($this->_trackCollectionFactory->create()->setShipmentFilter($this->getId()));
-
-            if ($this->getId()) {
-                foreach ($this->getTracks() as $track) {
-                    $track->setShipment($this);
-                }
-            }
+        if ($this->tracksCollection === null) {
+            $this->tracksCollection = $this->_trackCollectionFactory->create()->setShipmentFilter($this->getId());
         }
-        return $this->getTracks();
+
+        return $this->tracksCollection;
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
index 5851b2d936139..9c8671d02c578 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
@@ -62,8 +62,8 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $object)
                 $this->shipmentItemResource->save($item);
             }
         }
-        if (null !== $object->getTracks()) {
-            foreach ($object->getTracks() as $track) {
+        if (null !== $object->getTracksCollection()) {
+            foreach ($object->getTracksCollection() as $track) {
                 $track->setParentId($object->getId());
                 $this->shipmentTrackResource->save($track);
             }
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php
index 447fd7791ecbd..e010674ca354e 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Create;
 
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Pricing\Price\FinalPrice;
 
 class AbstractCreateTest extends \PHPUnit\Framework\TestCase
@@ -67,4 +69,34 @@ public function testGetItemPrice()
             ->willReturn($resultPrice);
         $this->assertEquals($resultPrice, $this->model->getItemPrice($this->productMock));
     }
+
+    /**
+     * @param $item
+     *
+     * @dataProvider getProductDataProvider
+     */
+    public function testGetProduct($item)
+    {
+        $product = $this->model->getProduct($item);
+
+        self::assertInstanceOf(Product::class, $product);
+    }
+
+    /**
+     * DataProvider for testGetProduct.
+     *
+     * @return array
+     */
+    public function getProductDataProvider()
+    {
+        $productMock = $this->createMock(Product::class);
+
+        $itemMock = $this->createMock(\Magento\Wishlist\Model\Item::class);
+        $itemMock->expects($this->once())->method('getProduct')->willReturn($productMock);
+
+        return [
+            [$productMock],
+            [$itemMock],
+        ];
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
index 787e6f8e065d2..a7a615fb0f508 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Shipment/RelationTest.php
@@ -86,7 +86,8 @@ protected function setUp()
                     'getId',
                     'getItems',
                     'getTracks',
-                    'getComments'
+                    'getComments',
+                    'getTracksCollection',
                 ]
             )
             ->getMock();
@@ -123,7 +124,7 @@ public function testProcessRelations()
             ->method('getComments')
             ->willReturn([$this->commentMock]);
         $this->shipmentMock->expects($this->exactly(2))
-            ->method('getTracks')
+            ->method('getTracksCollection')
             ->willReturn([$this->trackMock]);
         $this->itemMock->expects($this->once())
             ->method('setParentId')
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index 2ca2420934519..2dbf717f73439 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -67,11 +67,7 @@
 
                         <?php if ($block->canDisplayPrice()): ?>
                             <td class="col-price">
-                                <?php if ($block->getDataId() == 'cart'): ?>
-                                    <?= /* @noEscape */ $block->getItemPrice($_item->getProduct()) ?>
-                                <?php else: ?>
-                                    <?= /* @noEscape */ $block->getItemPrice($_item) ?>
-                                <?php endif; ?>
+                                <?= /* @noEscape */ $block->getItemPrice($block->getProduct($_item)) ?>
                             </td>
                         <?php endif; ?>
 
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
index 108cc341253ae..1e8fbf43ec3bc 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -136,6 +136,7 @@ public function asHtml()
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {
@@ -145,8 +146,22 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
         $attr = $this->getAttribute();
         $total = 0;
         foreach ($model->getQuote()->getAllVisibleItems() as $item) {
-            if (parent::validate($item)) {
-                $total += $item->getData($attr);
+            $hasValidChild = false;
+            $useChildrenTotal = ($item->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
+            $childrenAttrTotal = 0;
+            $children = $item->getChildren();
+            if (!empty($children)) {
+                foreach ($children as $child) {
+                    if (parent::validate($child)) {
+                        $hasValidChild = true;
+                        if ($useChildrenTotal) {
+                            $childrenAttrTotal += $child->getData($attr);
+                        }
+                    }
+                }
+            }
+            if ($hasValidChild || parent::validate($item)) {
+                $total += (($hasValidChild && $useChildrenTotal) ? $childrenAttrTotal : $item->getData($attr));
             }
         }
         return $this->validateAttribute($total);
diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index 074dcb0262040..3d8d46983b5aa 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -223,9 +223,12 @@ public function getStoreName()
      */
     public function getTargetStorePostData(\Magento\Store\Model\Store $store, $data = [])
     {
-        $data[\Magento\Store\Api\StoreResolverInterface::PARAM_NAME] = $store->getCode();
+        $data[\Magento\Store\Api\StoreResolverInterface::PARAM_NAME]
+            = $store->getCode();
+        //We need to fromStore as true because it will enable proper URL
+        //rewriting during store switching.
         return $this->_postDataHelper->getPostData(
-            $store->getCurrentUrl(false),
+            $store->getCurrentUrl(true),
             $data
         );
     }
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index aca8c4a0ba5ec..56751f2188411 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -1136,7 +1136,14 @@ public function isDefault()
     public function getCurrentUrl($fromStore = true)
     {
         $sidQueryParam = $this->_sidResolver->getSessionIdQueryParam($this->_getSession());
-        $requestString = $this->_url->escape(ltrim($this->_request->getRequestString(), '/'));
+        /** @var string $requestString Request path without query parameters */
+        $requestString = $this->_url->escape(
+            preg_replace(
+                '/\?.*?$/',
+                '',
+                ltrim($this->_request->getRequestString(), '/')
+            )
+        );
 
         $storeUrl = $this->getUrl('', ['_secure' => $this->_storeManager->getStore()->isCurrentlySecure()]);
 
diff --git a/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php b/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
index 5f0ba6c0b42d3..8b4799d2b3437 100644
--- a/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
+++ b/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
@@ -53,7 +53,7 @@ public function testGetTargetStorePostData()
         $storeSwitchUrl = 'http://domain.com/stores/store/switch';
         $store->expects($this->atLeastOnce())
             ->method('getCurrentUrl')
-            ->with(false)
+            ->with(true)
             ->willReturn($storeSwitchUrl);
         $this->corePostDataHelper->expects($this->any())
             ->method('getPostData')
diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
index aef54a47971ff..c05584c2d8bcb 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
@@ -370,10 +370,11 @@ public function testGetBaseUrlWrongType()
      * @param boolean $secure
      * @param string $url
      * @param string $expected
+     * @param bool|string $fromStore
      */
-    public function testGetCurrentUrl($secure, $url, $expected)
+    public function testGetCurrentUrl($secure, $url, $expected, $fromStore)
     {
-        $defaultStore = $this->createPartialMock(\Magento\Store\Model\Store::class, [
+        $defaultStore = $this->createPartialMock(Store::class, [
             'getId',
             'isCurrentlySecure',
             '__wakeup'
@@ -386,15 +387,31 @@ public function testGetCurrentUrl($secure, $url, $expected)
 
         $config = $this->getMockForAbstractClass(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
 
-        $this->requestMock->expects($this->atLeastOnce())->method('getRequestString')->will($this->returnValue(''));
+        $requestString = preg_replace(
+            '/http(s?)\:\/\/[a-z0-9\-]+\//i',
+            '',
+            $url
+        );
+        $this->requestMock
+            ->expects($this->atLeastOnce())
+            ->method('getRequestString')
+            ->willReturn($requestString);
         $this->requestMock->expects($this->atLeastOnce())->method('getQueryValue')->will($this->returnValue([
             'SID' => 'sid'
         ]));
 
         $urlMock = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
-        $urlMock->expects($this->atLeastOnce())->method('setScope')->will($this->returnSelf());
-        $urlMock->expects($this->any())->method('getUrl')
-            ->will($this->returnValue($url));
+        $urlMock
+            ->expects($this->atLeastOnce())
+            ->method('setScope')
+            ->will($this->returnSelf());
+        $urlMock->expects($this->any())
+            ->method('getUrl')
+            ->will($this->returnValue(str_replace($requestString, '', $url)));
+        $urlMock
+            ->expects($this->atLeastOnce())
+            ->method('escape')
+            ->willReturnArgument(0);
 
         $storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
         $storeManager->expects($this->any())
@@ -409,7 +426,7 @@ public function testGetCurrentUrl($secure, $url, $expected)
         $model->setStoreId(2);
         $model->setCode('scope_code');
 
-        $this->assertEquals($expected, $model->getCurrentUrl(false));
+        $this->assertEquals($expected, $model->getCurrentUrl($fromStore));
     }
 
     /**
@@ -418,9 +435,31 @@ public function testGetCurrentUrl($secure, $url, $expected)
     public function getCurrentUrlDataProvider()
     {
         return [
-            [true, 'http://test/url', 'http://test/url?SID=sid&amp;___store=scope_code'],
-            [true, 'http://test/url?SID=sid1&___store=scope', 'http://test/url?SID=sid&amp;___store=scope_code'],
-            [false, 'https://test/url', 'https://test/url?SID=sid&amp;___store=scope_code']
+            [
+                true,
+                'http://test/url',
+                'http://test/url?SID=sid&amp;___store=scope_code',
+                false
+            ],
+            [
+                true,
+                'http://test/url?SID=sid1&___store=scope',
+                'http://test/url?SID=sid&amp;___store=scope_code',
+                false
+            ],
+            [
+                false,
+                'https://test/url',
+                'https://test/url?SID=sid&amp;___store=scope_code',
+                false
+            ],
+            [
+                true,
+                'http://test/u/u.2?__store=scope_code',
+                'http://test/u/u.2?'
+                . 'SID=sid&amp;___store=scope_code&amp;___from_store=old-store',
+                'old-store'
+            ]
         ];
     }
 
diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
index aef8a25da2834..dfd3d6ce15f71 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
@@ -119,6 +119,12 @@ public function __construct(
             $configurableAttributeData,
             $data
         );
+
+        $this->addData(
+            [
+                'cache_lifetime' => isset($data['cache_lifetime']) ? $data['cache_lifetime'] : 3600
+            ]
+        );
     }
 
     /**
diff --git a/app/code/Magento/Swatches/view/frontend/layout/checkout_cart_configure_type_configurable.xml b/app/code/Magento/Swatches/view/frontend/layout/checkout_cart_configure_type_configurable.xml
index 593ae32374417..62d6e57221f82 100644
--- a/app/code/Magento/Swatches/view/frontend/layout/checkout_cart_configure_type_configurable.xml
+++ b/app/code/Magento/Swatches/view/frontend/layout/checkout_cart_configure_type_configurable.xml
@@ -6,7 +6,13 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-      <link src="Magento_Swatches::js/configurable-customer-data.js"/>
-    </head>
+    <body>
+        <referenceBlock name="product.info.options.wrapper">
+            <block class="Magento\Swatches\Block\Product\Renderer\Configurable" name="product.info.options.swatches" as="swatch_options" before="-">
+                <arguments>
+                    <argument name="cache_lifetime" xsi:type="boolean">false</argument>
+                </arguments>
+            </block>
+        </referenceBlock>
+    </body>
 </page>
diff --git a/app/code/Magento/Swatches/view/frontend/layout/wishlist_index_configure_type_configurable.xml b/app/code/Magento/Swatches/view/frontend/layout/wishlist_index_configure_type_configurable.xml
index 28bf7baac0a36..9f47b4386c742 100644
--- a/app/code/Magento/Swatches/view/frontend/layout/wishlist_index_configure_type_configurable.xml
+++ b/app/code/Magento/Swatches/view/frontend/layout/wishlist_index_configure_type_configurable.xml
@@ -12,7 +12,11 @@
     <body>
         <referenceBlock name="product.info.options.configurable" remove="true"/>
         <referenceBlock name="product.info.options.wrapper">
-            <block class="Magento\Swatches\Block\Product\Renderer\Configurable" name="product.info.options.swatches" as="swatch_options" before="-" />
+            <block class="Magento\Swatches\Block\Product\Renderer\Configurable" name="product.info.options.swatches" as="swatch_options" before="-">
+                <arguments>
+                    <argument name="cache_lifetime" xsi:type="boolean">false</argument>
+                </arguments>
+            </block>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index 7ecd6558ef6ea..75a39a0e4e270 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
+<?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */ ?>
 <div class="swatch-opt-<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>"></div>
 <script>
     require([
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
index fc1de530a66bd..ea166b9080f5c 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
@@ -14,11 +14,13 @@
         "[data-role=swatch-options]": {
             "Magento_Swatches/js/swatch-renderer": {
                 "jsonConfig": <?= /* @escapeNotVerified */ $swatchOptions = $block->getJsonConfig() ?>,
-                "jsonSwatchConfig": <?php /* @escapeNotVerified */
-                    echo $swatchOptions = $block->getJsonSwatchConfig(); ?>,
+                "jsonSwatchConfig": <?php /* @noEscape */ echo $block->getJsonSwatchConfig(); ?>,
                 "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>",
                 "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
                     'Magento_ConfigurableProduct') ?: 'replace'; ?>"
+            },
+            "Magento_Swatches/js/configurable-customer-data": {
+                    "swatchOptions": <?php /* @noEscape */ echo $swatchOptions ?>
             }
         }
     }
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/configurable-customer-data.js b/app/code/Magento/Swatches/view/frontend/web/js/configurable-customer-data.js
index 6467c6276da58..8cea83c1bd551 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/configurable-customer-data.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/configurable-customer-data.js
@@ -1,28 +1,51 @@
-require([
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
     'jquery',
-    'Magento_ConfigurableProduct/js/options-updater'
+    'Magento_ConfigurableProduct/js/options-updater',
+    'jquery/ui'
 ], function ($, Updater) {
     'use strict';
 
-    var selectors = {
-            formSelector: '#product_addtocart_form',
-            swatchSelector: '.swatch-opt'
+    $.widget('mage.selectSwatch', {
+        options: {
+            swatchOptions: null,
+            selectors: {
+                formSelector: '#product_addtocart_form',
+                swatchSelector: '.swatch-opt'
+            },
+            swatchWidgetName: 'mageSwatchRenderer',
+            widgetInitEvent: 'swatch.initialized',
+            clickEventName: 'emulateClick'
         },
-        swatchWidgetName = 'mageSwatchRenderer',
-        widgetInitEvent = 'swatch.initialized',
 
-    /**
-    * Sets all configurable swatch attribute's selected values
-    */
-    updateSwatchOptions = function () {
-        var swatchWidget = $(selectors.swatchSelector).data(swatchWidgetName);
+        /**
+         * Widget initialisation.
+         * Configurable product options updater listens to selected swatch options
+         */
+        _init: function () {
+            var updater;
 
-        if (!swatchWidget || !swatchWidget._EmulateSelectedByAttributeId) {
-            return;
+            updater = new Updater(this.options.widgetInitEvent, this.selectDefaultSwatchOptions.bind(this));
+            updater.listen();
+        },
+
+        /**
+         * Sets default configurable swatch attribute's selected
+         */
+        selectDefaultSwatchOptions: function () {
+            var swatchWidget = $(this.options.selectors.swatchSelector).data(this.options.swatchWidgetName);
+
+            if (!swatchWidget || !swatchWidget._EmulateSelectedByAttributeId) {
+                return;
+            }
+            swatchWidget._EmulateSelectedByAttributeId(
+                this.options.swatchOptions.defaultValues, this.options.clickEventName
+            );
         }
-        swatchWidget._EmulateSelectedByAttributeId(this.productOptions);
-    },
-    updater = new Updater(widgetInitEvent, updateSwatchOptions);
+    });
 
-    updater.listen();
+    return $.mage.selectSwatch;
 });
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index d1f7c477ba8d7..c09c17f0ad6ba 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -616,6 +616,10 @@ define([
                 return $widget._OnClick($(this), $widget);
             });
 
+            $widget.element.on('emulateClick', '.' + options.optionClass, function () {
+                return $widget._OnClick($(this), $widget, 'emulateClick');
+            });
+
             $widget.element.on('change', '.' + options.selectClass, function () {
                 return $widget._OnChange($(this), $widget);
             });
@@ -646,9 +650,10 @@ define([
         /**
          * Load media gallery using ajax or json config.
          *
+         * @param {String|undefined} eventName
          * @private
          */
-        _loadMedia: function () {
+        _loadMedia: function (eventName) {
             var $main = this.inProductList ?
                     this.element.parents('.product-item-info') :
                     this.element.parents('.column.main'),
@@ -663,7 +668,7 @@ define([
                     images = this.options.mediaGalleryInitial;
                 }
 
-                this.updateBaseImage(images, $main, !this.inProductList);
+                this.updateBaseImage(images, $main, !this.inProductList, eventName);
             }
         },
 
@@ -672,9 +677,10 @@ define([
          *
          * @param {Object} $this
          * @param {Object} $widget
+         * @param {String|undefined} eventName
          * @private
          */
-        _OnClick: function ($this, $widget) {
+        _OnClick: function ($this, $widget, eventName) {
             var $parent = $this.parents('.' + $widget.options.classes.attributeClass),
                 $wrapper = $this.parents('.' + $widget.options.classes.attributeOptionsWrapper),
                 $label = $parent.find('.' + $widget.options.classes.attributeSelectedOptionLabelClass),
@@ -713,7 +719,7 @@ define([
                 $widget._UpdatePrice();
             }
 
-            $widget._loadMedia();
+            $widget._loadMedia(eventName);
             $input.trigger('change');
         },
 
@@ -1117,16 +1123,36 @@ define([
             return images;
         },
 
+        /**
+         * Start update base image process based on event name
+         * @param {Array} images
+         * @param {jQuery} context
+         * @param {Boolean} isInProductView
+         * @param {String|undefined} eventName
+         */
+        updateBaseImage: function (images, context, isInProductView, eventName) {
+            var gallery = context.find(this.options.mediaGallerySelector).data('gallery');
+
+            if (eventName === undefined) {
+                this.processUpdateBaseImage(images, context, isInProductView, gallery);
+            } else {
+                context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
+                    loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
+                    this.processUpdateBaseImage(images, context, isInProductView, loadedGallery);
+                }.bind(this));
+            }
+        },
+
         /**
          * Update [gallery-placeholder] or [product-image-photo]
          * @param {Array} images
          * @param {jQuery} context
          * @param {Boolean} isInProductView
+         * @param {Object} gallery
          */
-        updateBaseImage: function (images, context, isInProductView) {
+        processUpdateBaseImage: function (images, context, isInProductView, gallery) {
             var justAnImage = images[0],
                 initialImages = this.options.mediaGalleryInitial,
-                gallery = context.find(this.options.mediaGallerySelector).data('gallery'),
                 imagesToUpdate,
                 isInitial;
 
@@ -1203,14 +1229,19 @@ define([
         /**
          * Emulate mouse click or selection change on all swatches that should be selected
          * @param {Object} [selectedAttributes]
+         * @param {String} triggerClick
          * @private
          */
-        _EmulateSelectedByAttributeId: function (selectedAttributes) {
+        _EmulateSelectedByAttributeId: function (selectedAttributes, triggerClick) {
             $.each(selectedAttributes, $.proxy(function (attributeId, optionId) {
                 var elem = this.element.find('.' + this.options.classes.attributeClass +
                     '[attribute-id="' + attributeId + '"] [option-id="' + optionId + '"]'),
                     parentInput = elem.parent();
 
+                if (triggerClick === null || triggerClick === '') {
+                    triggerClick = 'click';
+                }
+
                 if (elem.hasClass('selected')) {
                     return;
                 }
@@ -1219,7 +1250,7 @@ define([
                     parentInput.val(optionId);
                     parentInput.trigger('change');
                 } else {
-                    elem.trigger('click');
+                    elem.trigger(triggerClick);
                 }
             }, this));
         },
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
index d0655a98d2586..b8cd4a0f2c892 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
@@ -45,7 +45,8 @@ define([
                 component: this,
                 selector: 'button'
             }, function (element) {
-                this.$wysiwygEditorButton = $(element);
+                this.$wysiwygEditorButton = this.$wysiwygEditorButton ?
+                    this.$wysiwygEditorButton.add($(element)) : $(element);
             }.bind(this));
 
             return this;
@@ -94,7 +95,7 @@ define([
             this.$wysiwygEditorButton.attr('disabled', status);
 
             /* eslint-disable no-undef */
-            if (tinyMCE) {
+            if (tinyMCE && tinyMCE.activeEditor) {
                 _.each(tinyMCE.activeEditor.controlManager.controls, function (property, index, controls) {
                     controls[property.id].setDisabled(status);
                 });
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
index 66ba3d9bbabe1..863d998776ef1 100644
--- a/app/code/Magento/UrlRewrite/Controller/Router.php
+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -5,10 +5,15 @@
  */
 namespace Magento\UrlRewrite\Controller;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\Response\Http as HttpResponse;
 use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\App\Action\Redirect;
+use Magento\Framework\App\ActionInterface;
 
 /**
  * UrlRewrite Controller Router
@@ -23,7 +28,7 @@ class Router implements \Magento\Framework\App\RouterInterface
     protected $actionFactory;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $url;
 
@@ -33,7 +38,7 @@ class Router implements \Magento\Framework\App\RouterInterface
     protected $storeManager;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface
+     * @var \Magento\Framework\App\ResponseInterface|HttpResponse
      */
     protected $response;
 
@@ -44,14 +49,14 @@ class Router implements \Magento\Framework\App\RouterInterface
 
     /**
      * @param \Magento\Framework\App\ActionFactory $actionFactory
-     * @param \Magento\Framework\UrlInterface $url
+     * @param UrlInterface $url
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\ResponseInterface $response
      * @param UrlFinderInterface $urlFinder
      */
     public function __construct(
         \Magento\Framework\App\ActionFactory $actionFactory,
-        \Magento\Framework\UrlInterface $url,
+        UrlInterface $url,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\ResponseInterface $response,
         UrlFinderInterface $urlFinder
@@ -66,46 +71,78 @@ public function __construct(
     /**
      * Match corresponding URL Rewrite and modify request
      *
-     * @param \Magento\Framework\App\RequestInterface $request
-     * @return \Magento\Framework\App\ActionInterface|null
+     * @param \Magento\Framework\App\RequestInterface|HttpRequest $request
+     * @return ActionInterface|null
      */
     public function match(\Magento\Framework\App\RequestInterface $request)
     {
+        //If we're in the process of switching stores then matching rewrite
+        //rule from previous store because the URL was not changed yet from
+        //old store's format.
         if ($fromStore = $request->getParam('___from_store')) {
             $oldStoreId = $this->storeManager->getStore($fromStore)->getId();
-            $oldRewrite = $this->getRewrite($request->getPathInfo(), $oldStoreId);
-            if ($oldRewrite) {
-                $rewrite = $this->urlFinder->findOneByData(
+            $oldRewrite = $this->getRewrite(
+                $request->getPathInfo(),
+                $oldStoreId
+            );
+            if ($oldRewrite && $oldRewrite->getRedirectType() === 0) {
+                //If there is a match and it's a correct URL then just
+                //redirecting to current store's URL equivalent,
+                //otherwise just continuing finding a rule within current store.
+                $currentRewrite = $this->urlFinder->findOneByData(
                     [
                         UrlRewrite::ENTITY_TYPE => $oldRewrite->getEntityType(),
                         UrlRewrite::ENTITY_ID => $oldRewrite->getEntityId(),
-                        UrlRewrite::STORE_ID => $this->storeManager->getStore()->getId(),
-                        UrlRewrite::IS_AUTOGENERATED => 1,
+                        UrlRewrite::STORE_ID =>
+                            $this->storeManager->getStore()->getId(),
+                        UrlRewrite::REDIRECT_TYPE => 0,
                     ]
                 );
-                if ($rewrite && $rewrite->getRequestPath() !== $oldRewrite->getRequestPath()) {
-                    return $this->redirect($request, $rewrite->getRequestPath(), OptionProvider::TEMPORARY);
+                if ($currentRewrite
+                    && $currentRewrite->getRequestPath()
+                    !== $oldRewrite->getRequestPath()
+                ) {
+                    return $this->redirect(
+                        $request,
+                        $this->url->getUrl(
+                            '',
+                            ['_direct' => $currentRewrite->getRequestPath()]
+                        ),
+                        OptionProvider::TEMPORARY
+                    );
                 }
             }
         }
-        $rewrite = $this->getRewrite($request->getPathInfo(), $this->storeManager->getStore()->getId());
+
+        $rewrite = $this->getRewrite(
+            $request->getPathInfo(),
+            $this->storeManager->getStore()->getId()
+        );
         if ($rewrite === null) {
+            //No rewrite rule matching current URl found, continuing with
+            //processing of this URL.
             return null;
         }
-
         if ($rewrite->getRedirectType()) {
+            //Rule requires the request to be redirected to another URL
+            //and cannot be processed further.
             return $this->processRedirect($request, $rewrite);
         }
-
-        $request->setAlias(\Magento\Framework\UrlInterface::REWRITE_REQUEST_PATH_ALIAS, $rewrite->getRequestPath());
+        //Rule provides actual URL that can be processed by a controller.
+        $request->setAlias(
+            UrlInterface::REWRITE_REQUEST_PATH_ALIAS,
+            $rewrite->getRequestPath()
+        );
         $request->setPathInfo('/' . $rewrite->getTargetPath());
-        return $this->actionFactory->create(\Magento\Framework\App\Action\Forward::class);
+        return $this->actionFactory->create(
+            \Magento\Framework\App\Action\Forward::class
+        );
     }
 
     /**
      * @param \Magento\Framework\App\RequestInterface $request
      * @param UrlRewrite $rewrite
-     * @return \Magento\Framework\App\ActionInterface|null
+     * @return ActionInterface|null
      */
     protected function processRedirect($request, $rewrite)
     {
@@ -119,16 +156,17 @@ protected function processRedirect($request, $rewrite)
     }
 
     /**
-     * @param \Magento\Framework\App\RequestInterface $request
+     * @param \Magento\Framework\App\RequestInterface|HttpRequest $request
      * @param string $url
      * @param int $code
-     * @return \Magento\Framework\App\ActionInterface
+     * @return ActionInterface
      */
     protected function redirect($request, $url, $code)
     {
         $this->response->setRedirect($url, $code);
         $request->setDispatched(true);
-        return $this->actionFactory->create(\Magento\Framework\App\Action\Redirect::class);
+
+        return $this->actionFactory->create(Redirect::class);
     }
 
     /**
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
index acf05242d6aa2..3f5b5f34c462e 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
@@ -6,9 +6,11 @@
 
 namespace Magento\UrlRewrite\Test\Unit\Controller;
 
+use Magento\Framework\App\Action\Redirect;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Store\Model\Store;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -27,7 +29,7 @@ class RouterTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
-    /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var Store|\PHPUnit_Framework_MockObject_MockObject */
     protected $store;
 
     /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -78,45 +80,99 @@ public function testNoRewriteExist()
 
     public function testRewriteAfterStoreSwitcher()
     {
-        $this->request->expects($this->any())->method('getPathInfo')->will($this->returnValue('request-path'));
-        $this->request->expects($this->any())->method('getParam')->with('___from_store')
-            ->will($this->returnValue('old-store'));
-        $oldStore = $this->getMockBuilder(\Magento\Store\Model\Store::class)->disableOriginalConstructor()->getMock();
-        $this->storeManager->expects($this->any())->method('getStore')
-            ->will($this->returnValueMap([['old-store', $oldStore], [null, $this->store]]));
-        $oldStore->expects($this->any())->method('getId')->will($this->returnValue('old-store-id'));
-        $this->store->expects($this->any())->method('getId')->will($this->returnValue('current-store-id'));
-        $oldUrlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-            ->disableOriginalConstructor()->getMock();
-        $oldUrlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('entity-type'));
-        $oldUrlRewrite->expects($this->any())->method('getEntityId')->will($this->returnValue('entity-id'));
-        $oldUrlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('old-request-path'));
-        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-            ->disableOriginalConstructor()->getMock();
-        $urlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('new-request-path'));
+        $initialRequestPath = 'request-path';
+        $newRequestPath = 'new-request-path';
+        $oldStoreAlias = 'old-store';
+        $oldStoreId = 'old-store-id';
+        $currentStoreId = 'current-store-id';
+        $rewriteEntityType = 'entity-type';
+        $rewriteEntityId = 42;
+        $redirectUrl = '/' . $newRequestPath;
 
-        $this->urlFinder->expects($this->any())->method('findOneByData')->will(
-            $this->returnValueMap([
+        $this->request
+            ->expects($this->any())
+            ->method('getParam')
+            ->with('___from_store')
+            ->willReturn($oldStoreAlias);
+        $this->request
+            ->expects($this->any())
+            ->method('getPathInfo')
+            ->willReturn($initialRequestPath);
+
+        $oldStore = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $oldStore->expects($this->any())
+            ->method('getId')
+            ->willReturn($oldStoreId);
+        $this->store
+            ->expects($this->any())
+            ->method('getId')
+            ->willReturn($currentStoreId);
+
+        $this->storeManager
+            ->expects($this->any())
+            ->method('getStore')
+            ->willReturnMap([[$oldStoreAlias, $oldStore], [null, $this->store]]);
+
+        $oldUrlRewrite = $this->getMockBuilder(UrlRewrite::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $oldUrlRewrite->expects($this->any())
+            ->method('getEntityType')
+            ->willReturn($rewriteEntityType);
+        $oldUrlRewrite->expects($this->any())
+            ->method('getEntityId')
+            ->willReturn($rewriteEntityId);
+        $oldUrlRewrite->expects($this->any())
+            ->method('getRedirectType')
+            ->willReturn(0);
+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $urlRewrite->expects($this->any())
+            ->method('getRequestPath')
+            ->willReturn($newRequestPath);
+
+        $this->urlFinder
+            ->expects($this->any())
+            ->method('findOneByData')
+            ->willReturnMap([
                 [
-                    [UrlRewrite::REQUEST_PATH => 'request-path', UrlRewrite::STORE_ID => 'old-store-id'],
+                    [
+                        UrlRewrite::REQUEST_PATH => $initialRequestPath,
+                        UrlRewrite::STORE_ID     => $oldStoreId,
+                    ],
                     $oldUrlRewrite,
                 ],
                 [
                     [
-                        UrlRewrite::ENTITY_TYPE => 'entity-type',
-                        UrlRewrite::ENTITY_ID => 'entity-id',
-                        UrlRewrite::STORE_ID => 'current-store-id',
-                        UrlRewrite::IS_AUTOGENERATED => 1,
+                        UrlRewrite::ENTITY_TYPE   => $rewriteEntityType,
+                        UrlRewrite::ENTITY_ID     => $rewriteEntityId,
+                        UrlRewrite::STORE_ID      => $currentStoreId,
+                        UrlRewrite::REDIRECT_TYPE => 0,
                     ],
-                    $urlRewrite
+                    $urlRewrite,
                 ],
-            ])
-        );
-        $this->response->expects($this->once())->method('setRedirect')
-            ->with('new-request-path', OptionProvider::TEMPORARY);
-        $this->request->expects($this->once())->method('setDispatched')->with(true);
-        $this->actionFactory->expects($this->once())->method('create')
-            ->with(\Magento\Framework\App\Action\Redirect::class);
+            ]);
+
+        $this->url
+            ->expects($this->once())
+            ->method('getUrl')
+            ->with('', ['_direct' => $newRequestPath])
+            ->willReturn($redirectUrl);
+        $this->response
+            ->expects($this->once())
+            ->method('setRedirect')
+            ->with($redirectUrl, OptionProvider::TEMPORARY);
+        $this->request
+            ->expects($this->once())
+            ->method('setDispatched')
+            ->with(true);
+        $this->actionFactory
+            ->expects($this->once())
+            ->method('create')
+            ->with(Redirect::class);
 
         $this->router->match($this->request);
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/css/source/_module.less
index 81c9b70c71889..ce7a49481b6ea 100644
--- a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/css/source/_module.less
@@ -7,7 +7,7 @@
 //  Magento_ReleaseNotification Modal on dashboard
 //  ---------------------------------------------
 
-.release-notification-modal, .analytics-subscription-modal, .developer-experience-modal, .b2b-modal {
+.release-notification-modal, .analytics-subscription-modal, .instant-purchase-modal, .email-marketing-modal {
   -webkit-transition: visibility 0s .5s, opacity .5s ease;
   transition: visibility 0s .5s, opacity .5s ease;
 
@@ -54,7 +54,9 @@
 
       span {
         font-size: @font-size__base;
-        margin-left: 2rem;
+        vertical-align: middle;
+        position: relative;
+        left: 1rem;
       }
     }
   }
@@ -77,17 +79,17 @@
   background-size: 65px 58px;
 }
 
-.b2b-highlight {
-  background: url("Magento_ReleaseNotification::images/b2b-icon.svg") no-repeat;
+.email-marketing-highlight {
+  background: url("Magento_ReleaseNotification::images/email-marketing-icon.svg") no-repeat;
   background-size: 65px 53.37px;
 }
 
-.developer-experience-highlight {
-  background: url("Magento_ReleaseNotification::images/developer-experience-icon.svg") no-repeat;
+.instant-purchase-highlight {
+  background: url("Magento_ReleaseNotification::images/instant-purchase-icon.svg") no-repeat;
   background-size: 65px 59px;
 }
 
-.analytics-highlight, .b2b-highlight, .developer-experience-highlight {
+.analytics-highlight, .email-marketing-highlight, .instant-purchase-highlight {
   padding: 0 0 2rem 8.5rem;
   margin-left: 1rem;
 
@@ -110,17 +112,17 @@
   }
 }
 
-.b2b-modal {
+.email-marketing-modal {
   h1:first-of-type {
-    background: url("Magento_ReleaseNotification::images/b2b-icon.svg") no-repeat;
+    background: url("Magento_ReleaseNotification::images/email-marketing-icon.svg") no-repeat;
     background-size: 55px 49.92px;
     padding: 1.5rem 0 2rem 7rem;
   }
 }
 
-.developer-experience-modal {
+.instant-purchase-modal {
   h1:first-of-type {
-    background: url("Magento_ReleaseNotification::images/developer-experience-icon.svg") no-repeat;
+    background: url("Magento_ReleaseNotification::images/instant-purchase-icon.svg") no-repeat;
     background-size: 55px 46px;
     padding: 1.5rem 0 2rem 7rem;
   }
diff --git a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/analytics-icon.svg b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/analytics-icon.svg
index fde91d775d444..2846b29627df6 100644
--- a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/analytics-icon.svg
+++ b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/analytics-icon.svg
@@ -1,84 +1,27 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="120px"
-	 height="105px" viewBox="0 0 120 105" enable-background="new 0 0 120 105" xml:space="preserve">
-<g id="Layer_1" display="none">
-	<rect x="2.904" y="27.946" display="inline" fill="#F06524" width="113.745" height="12.408"/>
-	<path display="inline" fill="#636667" d="M95.811,85.511c-0.753-2.551-1.775-5.013-3.059-7.344
-		c-0.207-0.387-0.134-0.884,0.191-1.208c2.857-2.869,2.857-7.489,0.013-10.346l-3.649-3.686c-2.873-2.86-7.493-2.86-10.348-0.016
-		c-0.334,0.336-0.828,0.409-1.228,0.193c-2.321-1.271-4.785-2.295-7.337-3.047c-0.419-0.126-0.714-0.525-0.712-0.979
-		c0.004-1.947-0.766-3.812-2.139-5.187c-1.37-1.377-3.233-2.148-5.176-2.148h-5.184c-4.039,0-7.312,3.274-7.312,7.314
-		c0.001,0.464-0.294,0.863-0.728,0.993c-2.537,0.747-5.002,1.771-7.335,3.051c-0.391,0.213-0.882,0.143-1.199-0.178
-		c-1.377-1.381-3.236-2.15-5.176-2.15c-1.938,0-3.799,0.77-5.168,2.143l-3.688,3.744c-2.833,2.845-2.833,7.465,0.011,10.321
-		c0.336,0.336,0.41,0.835,0.191,1.24c-1.269,2.312-2.294,4.772-3.045,7.324c-0.487,1.657,0.46,3.396,2.117,3.885
-		c1.658,0.487,3.396-0.46,3.884-2.117c0.624-2.12,1.475-4.164,2.538-6.101c1.544-2.863,1.027-6.375-1.262-8.653
-		c-0.405-0.407-0.405-1.082,0.009-1.497l3.686-3.742c0.181-0.182,0.449-0.291,0.727-0.291c0.279,0,0.545,0.109,0.743,0.307
-		c2.271,2.289,5.794,2.805,8.634,1.253c1.944-1.065,3.993-1.918,6.115-2.541c3.105-0.933,5.213-3.781,5.2-7.005
-		C56.126,58.473,56.6,58,57.184,58h5.184c0.281,0,0.55,0.112,0.75,0.31c0.199,0.2,0.309,0.471,0.309,0.752
-		c-0.012,3.217,2.098,6.065,5.185,6.992c2.138,0.631,4.187,1.482,6.129,2.545c2.854,1.546,6.369,1.026,8.646-1.269
-		c0.403-0.401,1.075-0.401,1.492,0.015l3.639,3.675c0.42,0.424,0.42,1.098,0.007,1.515c-2.283,2.265-2.802,5.783-1.261,8.628
-		c1.071,1.952,1.922,3.997,2.545,6.116c0.489,1.657,2.228,2.604,3.886,2.116C95.351,88.907,96.297,87.169,95.811,85.511z"/>
-	<path display="inline" fill="#636667" d="M118.29,1.486C117.337,0.536,116.046,0,114.7,0H4.843
-		C2.035,0.014-0.224,2.283-0.224,5.076v89.103c-0.006,1.334,0.524,2.629,1.475,3.584c0.951,0.955,2.244,1.492,3.592,1.492h109.851
-		c1.35,0.005,2.645-0.529,3.6-1.484c0.955-0.954,1.49-2.254,1.482-3.605V5.076C119.776,3.73,119.243,2.439,118.29,1.486z
-		 M113.521,6.255v18.564H6.032V6.255H113.521z M41.2,93c1.493-8.922,9.23-15.729,18.576-15.729c9.348,0,17.083,6.808,18.576,15.729
-		H41.2z M84.673,93c-1.542-12.39-12.089-21.984-24.896-21.984C46.97,71.016,36.422,80.61,34.879,93H6.032V31.074h107.49V93H84.673z"
-		/>
-	<path display="inline" fill="#636667" d="M21.661,19.955c-1.204,1.203-2.836,1.879-4.539,1.879c-3.545,0-6.419-2.873-6.419-6.418
-		s2.874-6.418,6.419-6.418s6.418,2.873,6.418,6.418C23.541,17.118,22.865,18.751,21.661,19.955z"/>
-	<circle display="inline" fill="#636667" cx="31.611" cy="15.416" r="6.418"/>
-	<path display="inline" fill="#636667" d="M52.518,15.416c-0.009,3.545-2.873,6.408-6.418,6.418c-3.545,0-6.419-2.873-6.419-6.418
-		s2.874-6.418,6.419-6.418C49.645,8.998,52.518,11.871,52.518,15.416z"/>
-</g>
-<g id="Layer_2" display="none">
-	<g display="inline">
-		<path fill="#F06725" d="M99.814,64.673V46.052h13.125v18.621H99.814z M120,64.673v43.361H92.758V64.673H120z"/>
-		<rect y="50.855" fill="#F06725" width="9.017" height="57.181"/>
-		<path fill="#F06725" d="M53.04,108.034V55.046h16.718v52.988H53.04z M58.535,55.046V44.188h5.724v10.858H58.535z"/>
-		<rect x="18.373" y="30.743" fill="#646767" width="3.105" height="4.451"/>
-		<rect x="29.501" y="30.743" fill="#646767" width="3.105" height="4.451"/>
-		<rect x="40.586" y="30.743" fill="#646767" width="3.104" height="4.451"/>
-		<rect x="18.373" y="43.411" fill="#646767" width="3.105" height="4.503"/>
-		<rect x="29.501" y="43.411" fill="#646767" width="3.105" height="4.503"/>
-		<rect x="40.609" y="43.411" fill="#646767" width="3.104" height="4.503"/>
-		<rect x="18.373" y="56.082" fill="#646767" width="3.105" height="4.5"/>
-		<rect x="29.501" y="56.082" fill="#646767" width="3.105" height="4.5"/>
-		<rect x="40.609" y="56.082" fill="#646767" width="3.104" height="4.5"/>
-		<rect x="18.373" y="68.752" fill="#646767" width="3.105" height="4.501"/>
-		<rect x="29.501" y="68.752" fill="#646767" width="3.105" height="4.501"/>
-		<rect x="40.609" y="68.752" fill="#646767" width="3.104" height="4.501"/>
-		<rect x="18.373" y="81.422" fill="#646767" width="3.105" height="4.491"/>
-		<rect x="29.501" y="81.422" fill="#646767" width="3.105" height="4.491"/>
-		<rect x="40.586" y="81.422" fill="#646767" width="3.104" height="4.491"/>
-		<rect x="18.373" y="94.091" fill="#646767" width="3.105" height="4.504"/>
-		<rect x="29.501" y="94.091" fill="#646767" width="3.105" height="4.504"/>
-		<rect x="40.609" y="94.091" fill="#646767" width="3.104" height="4.504"/>
-		<path fill="#646767" d="M94.309,106.481V55.761h-4.378V33.247h-7.132V16.168h-3.105v17.079h-7.112v22.514h-4.378v50.721h-13.61
-			V19.75h-8.655V9.006h-8.859V0H24.977v9.006h-8.859V19.75H7.483v86.731H0v3.104h7.483h47.109h13.61h26.105H120v-3.104H94.309z
-			 M75.687,36.353h11.139V55.74H75.687V36.353z M28.082,3.105h5.892v5.9h-5.892V3.105z M19.221,12.11h5.756h12.102h5.754v7.64
-			H19.221V12.11z M10.588,106.481V22.854h5.53h29.82h5.548v83.627H10.588z M71.309,106.481V58.868h19.896v47.613H71.309z"/>
-	</g>
-</g>
-<g id="Layer_3">
-	<path fill="#636768" d="M2.66,104.889h112.106c1.47,0,2.66-1.194,2.66-2.662c0-1.473-1.19-2.663-2.66-2.663H2.66
-		c-1.471,0-2.661,1.19-2.661,2.663C0,103.694,1.189,104.889,2.66,104.889z"/>
-	<rect x="2.66" y="52.421" fill="#F06725" width="12.314" height="39.343"/>
-	<rect x="102.453" y="31.996" fill="#F06725" width="12.313" height="59.768"/>
-	<rect x="35.928" y="31.25" fill="#F06725" width="12.315" height="60.514"/>
-	<rect x="69.187" y="50.168" fill="#F06725" width="12.323" height="41.596"/>
-	<circle fill="#F06725" cx="42.038" cy="11.39" r="3.76"/>
-	<circle fill="#F06725" cx="108.608" cy="12.135" r="3.76"/>
-	<path fill="#656668" d="M108.61,0.744c-6.28,0-11.387,5.11-11.387,11.389c0,0.877,0.107,1.729,0.293,2.55l-16.983,9.726
-		c-1.392-1.221-3.194-1.988-5.187-1.988c-1.931,0-3.681,0.728-5.054,1.882L53.252,13.614c0.145-0.722,0.222-1.464,0.222-2.227
-		C53.474,5.109,48.364,0,42.085,0c-6.281,0-11.39,5.109-11.39,11.391c0,1.168,0.178,2.296,0.508,3.36l-18.246,11.1
-		c-1.208-0.748-2.617-1.202-4.138-1.202c-4.363,0-7.913,3.549-7.913,7.911c0,4.361,3.549,7.911,7.913,7.911
-		c2.113,0,4.101-0.823,5.593-2.317c1.492-1.493,2.315-3.48,2.315-5.593c0-0.881-0.177-1.712-0.444-2.504l17.646-10.733
-		c2.07,2.129,4.959,3.457,8.156,3.457c3.601,0,6.81-1.684,8.9-4.301l16.61,10.419c-0.086,0.463-0.146,0.938-0.146,1.422
-		c-0.003,4.353,3.534,7.899,7.889,7.908h0.004c4.361,0,7.913-3.55,7.913-7.917c-0.003-0.43-0.063-0.841-0.128-1.251l16.774-9.605
-		c2.085,2.485,5.217,4.069,8.71,4.069c6.28,0,11.388-5.11,11.388-11.39C119.998,5.855,114.889,0.744,108.61,0.744z M10.648,34.389
-		c-0.488,0.49-1.139,0.758-1.83,0.758c-1.427,0-2.587-1.161-2.587-2.587c0-1.427,1.16-2.588,2.587-2.588
-		c1.426,0,2.587,1.161,2.587,2.588C11.405,33.25,11.137,33.901,10.648,34.389z M42.085,17.456c-3.345,0-6.065-2.721-6.065-6.065
-		c0-3.345,2.723-6.068,6.065-6.068c3.343,0,6.066,2.723,6.066,6.068C48.151,14.733,45.43,17.456,42.085,17.456z M75.347,32.903
-		c-1.418-0.001-2.571-1.16-2.571-2.58c0-1.419,1.157-2.576,2.578-2.578c1.421,0,2.578,1.155,2.578,2.569
-		C77.928,31.742,76.771,32.902,75.347,32.903z M108.61,18.2c-3.345,0-6.066-2.723-6.066-6.065c0-3.344,2.722-6.066,6.066-6.066
-		c3.344,0,6.066,2.723,6.066,6.066C114.677,15.478,111.954,18.2,108.61,18.2z"/>
-</g>
+<svg version="1.1" id="Analytics" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="120px" height="105px" viewBox="0 0 120 105" enable-background="new 0 0 120 105" xml:space="preserve">
+<path fill="#F16423" d="M47.946,16.377c0-1.802-1.459-3.264-3.263-3.264c-1.804,0-3.263,1.462-3.263,3.264
+	c0,1.804,1.459,3.264,3.263,3.264C46.487,19.641,47.946,18.181,47.946,16.377"/>
+<path fill="#636567" d="M107.749,96.971H10.475c-0.981,0-1.776-0.794-1.776-1.775s0.794-1.775,1.776-1.775h97.274
+	c0.981,0,1.776,0.794,1.776,1.775S108.73,96.971,107.749,96.971z"/>
+<rect x="10.475" y="51.978" fill="#F16423" width="10.686" height="34.14"/>
+<rect x="97.062" y="34.261" fill="#F16423" width="10.687" height="51.857"/>
+<rect x="39.34" y="33.61" fill="#F16423" width="10.686" height="52.508"/>
+<path fill="#636567" d="M44.684,25.726c-5.156,0-9.351-4.194-9.351-9.349c0-5.155,4.194-9.349,9.351-9.349
+	c5.155,0,9.349,4.194,9.349,9.349C54.033,21.532,49.838,25.726,44.684,25.726z M44.684,10.58c-3.197,0-5.798,2.6-5.798,5.797
+	c0,3.196,2.602,5.796,5.798,5.796c3.196,0,5.796-2.6,5.796-5.796C50.48,13.18,47.88,10.58,44.684,10.58z"/>
+<path fill="#F16423" d="M105.668,17.025c0-1.8-1.455-3.262-3.261-3.262s-3.263,1.462-3.263,3.262c0,1.804,1.457,3.266,3.263,3.266
+	S105.668,18.829,105.668,17.025"/>
+<path fill="#636567" d="M102.407,26.377c-5.154,0-9.349-4.195-9.349-9.352c0-5.155,4.193-9.349,9.349-9.349s9.349,4.194,9.349,9.349
+	C111.756,22.182,107.562,26.377,102.407,26.377z M102.407,11.229c-3.196,0-5.798,2.6-5.798,5.796c0,3.198,2.602,5.8,5.798,5.8
+	s5.797-2.602,5.797-5.8C108.204,13.829,105.604,11.229,102.407,11.229z"/>
+<rect x="68.199" y="50.028" fill="#F16423" width="10.691" height="36.09"/>
+<path fill="#636567" d="M15.815,41.075c-3.484,0-6.32-2.839-6.32-6.329c0-3.49,2.836-6.327,6.32-6.327
+	c1.339,0,2.581,0.417,3.604,1.127l17.832-10.828l1.844,3.035L21.671,32.335c0.307,0.744,0.477,1.558,0.477,2.411
+	C22.148,38.236,19.307,41.075,15.815,41.075z M15.815,31.971c-1.526,0-2.768,1.245-2.768,2.775c0,1.532,1.242,2.777,2.768,2.777
+	c1.533,0,2.78-1.245,2.78-2.777C18.596,33.216,17.349,31.971,15.815,31.971z M73.541,39.124c-3.486,0-6.323-2.839-6.323-6.329
+	c0-0.519,0.062-1.021,0.181-1.504L50.721,20.822l1.887-3.008l16.574,10.401c1.135-1.082,2.672-1.746,4.358-1.746
+	c1.745,0,3.327,0.709,4.474,1.852l16.688-9.57l1.766,3.08l-16.742,9.604c0.098,0.439,0.147,0.894,0.147,1.36
+	C79.872,36.285,77.032,39.124,73.541,39.124z M73.541,30.021c-1.527,0-2.771,1.244-2.771,2.773c0,1.532,1.244,2.777,2.771,2.777
+	c1.531,0,2.777-1.245,2.777-2.777C76.318,31.265,75.072,30.021,73.541,30.021z"/>
 </svg>
diff --git a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/b2b-icon.svg b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/b2b-icon.svg
deleted file mode 100644
index 20552d6178c25..0000000000000
--- a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/b2b-icon.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="120px"
-	 height="111px" viewBox="0 0 120 111" enable-background="new 0 0 120 111" xml:space="preserve">
-<g id="Layer_1" display="none">
-	<rect x="2.904" y="27.946" display="inline" fill="#F06524" width="113.745" height="12.408"/>
-	<path display="inline" fill="#636667" d="M95.811,85.511c-0.753-2.551-1.775-5.013-3.059-7.344
-		c-0.207-0.387-0.134-0.884,0.191-1.208c2.857-2.869,2.857-7.489,0.013-10.346l-3.649-3.686c-2.873-2.86-7.493-2.86-10.348-0.016
-		c-0.334,0.336-0.828,0.409-1.228,0.193c-2.321-1.271-4.785-2.295-7.337-3.047c-0.419-0.126-0.714-0.525-0.712-0.979
-		c0.004-1.947-0.766-3.812-2.139-5.187c-1.37-1.377-3.233-2.148-5.176-2.148h-5.184c-4.039,0-7.312,3.274-7.312,7.314
-		c0.001,0.464-0.294,0.863-0.728,0.993c-2.537,0.747-5.002,1.771-7.335,3.051c-0.391,0.213-0.882,0.143-1.199-0.178
-		c-1.377-1.381-3.236-2.15-5.176-2.15c-1.938,0-3.799,0.77-5.168,2.143l-3.688,3.744c-2.833,2.845-2.833,7.465,0.011,10.321
-		c0.336,0.336,0.41,0.835,0.191,1.24c-1.269,2.312-2.294,4.772-3.045,7.324c-0.487,1.657,0.46,3.396,2.117,3.885
-		c1.658,0.487,3.396-0.46,3.884-2.117c0.624-2.12,1.475-4.164,2.538-6.101c1.544-2.863,1.027-6.375-1.262-8.653
-		c-0.405-0.407-0.405-1.082,0.009-1.497l3.686-3.742c0.181-0.182,0.449-0.291,0.727-0.291c0.279,0,0.545,0.109,0.743,0.307
-		c2.271,2.289,5.794,2.805,8.634,1.253c1.944-1.065,3.993-1.918,6.115-2.541c3.105-0.933,5.213-3.781,5.2-7.005
-		C56.126,58.473,56.6,58,57.184,58h5.184c0.281,0,0.55,0.112,0.75,0.31c0.199,0.2,0.309,0.471,0.309,0.752
-		c-0.012,3.217,2.098,6.065,5.185,6.992c2.138,0.631,4.187,1.482,6.129,2.545c2.854,1.546,6.369,1.026,8.646-1.269
-		c0.403-0.401,1.075-0.401,1.492,0.015l3.639,3.675c0.42,0.424,0.42,1.098,0.007,1.515c-2.283,2.265-2.802,5.783-1.261,8.628
-		c1.071,1.952,1.922,3.997,2.545,6.116c0.489,1.657,2.228,2.604,3.886,2.116C95.351,88.907,96.297,87.169,95.811,85.511z"/>
-	<path display="inline" fill="#636667" d="M118.29,1.486C117.337,0.536,116.046,0,114.7,0H4.843
-		C2.035,0.014-0.224,2.283-0.224,5.076v89.103c-0.006,1.334,0.524,2.629,1.475,3.584c0.951,0.955,2.244,1.492,3.592,1.492h109.851
-		c1.35,0.005,2.645-0.529,3.6-1.484c0.955-0.954,1.49-2.254,1.482-3.605V5.076C119.776,3.73,119.243,2.439,118.29,1.486z
-		 M113.521,6.255v18.564H6.032V6.255H113.521z M41.2,93c1.493-8.922,9.23-15.729,18.576-15.729c9.348,0,17.083,6.808,18.576,15.729
-		H41.2z M84.673,93c-1.542-12.39-12.089-21.984-24.896-21.984C46.97,71.016,36.422,80.61,34.879,93H6.032V31.074h107.49V93H84.673z"
-		/>
-	<path display="inline" fill="#636667" d="M21.661,19.955c-1.204,1.203-2.836,1.879-4.539,1.879c-3.545,0-6.419-2.873-6.419-6.418
-		s2.874-6.418,6.419-6.418s6.418,2.873,6.418,6.418C23.541,17.118,22.865,18.751,21.661,19.955z"/>
-	<circle display="inline" fill="#636667" cx="31.611" cy="15.416" r="6.418"/>
-	<path display="inline" fill="#636667" d="M52.518,15.416c-0.009,3.545-2.873,6.408-6.418,6.418c-3.545,0-6.419-2.873-6.419-6.418
-		s2.874-6.418,6.419-6.418C49.645,8.998,52.518,11.871,52.518,15.416z"/>
-</g>
-<g id="Layer_2">
-	<g>
-		<path fill="#F06725" d="M99.814,64.673V46.052h13.125v18.621H99.814z M120,64.673v43.361H92.758V64.673H120z"/>
-		<rect y="50.855" fill="#F06725" width="9.017" height="57.181"/>
-		<path fill="#F06725" d="M53.04,108.034V55.046h16.718v52.988H53.04z M58.535,55.046V44.188h5.724v10.858H58.535z"/>
-		<rect x="18.373" y="30.743" fill="#646767" width="3.105" height="4.451"/>
-		<rect x="29.501" y="30.743" fill="#646767" width="3.105" height="4.451"/>
-		<rect x="40.586" y="30.743" fill="#646767" width="3.104" height="4.451"/>
-		<rect x="18.373" y="43.411" fill="#646767" width="3.105" height="4.503"/>
-		<rect x="29.501" y="43.411" fill="#646767" width="3.105" height="4.503"/>
-		<rect x="40.609" y="43.411" fill="#646767" width="3.104" height="4.503"/>
-		<rect x="18.373" y="56.082" fill="#646767" width="3.105" height="4.5"/>
-		<rect x="29.501" y="56.082" fill="#646767" width="3.105" height="4.5"/>
-		<rect x="40.609" y="56.082" fill="#646767" width="3.104" height="4.5"/>
-		<rect x="18.373" y="68.752" fill="#646767" width="3.105" height="4.501"/>
-		<rect x="29.501" y="68.752" fill="#646767" width="3.105" height="4.501"/>
-		<rect x="40.609" y="68.752" fill="#646767" width="3.104" height="4.501"/>
-		<rect x="18.373" y="81.422" fill="#646767" width="3.105" height="4.491"/>
-		<rect x="29.501" y="81.422" fill="#646767" width="3.105" height="4.491"/>
-		<rect x="40.586" y="81.422" fill="#646767" width="3.104" height="4.491"/>
-		<rect x="18.373" y="94.091" fill="#646767" width="3.105" height="4.504"/>
-		<rect x="29.501" y="94.091" fill="#646767" width="3.105" height="4.504"/>
-		<rect x="40.609" y="94.091" fill="#646767" width="3.104" height="4.504"/>
-		<path fill="#646767" d="M94.309,106.481V55.761h-4.378V33.247h-7.132V16.168h-3.105v17.079h-7.112v22.514h-4.378v50.721h-13.61
-			V19.75h-8.655V9.006h-8.859V0H24.977v9.006h-8.859V19.75H7.483v86.731H0v3.104h7.483h47.109h13.61h26.105H120v-3.104H94.309z
-			 M75.687,36.353h11.139V55.74H75.687V36.353z M28.082,3.105h5.892v5.9h-5.892V3.105z M19.221,12.11h5.756h12.102h5.754v7.64
-			H19.221V12.11z M10.588,106.481V22.854h5.53h29.82h5.548v83.627H10.588z M71.309,106.481V58.868h19.896v47.613H71.309z"/>
-	</g>
-</g>
-</svg>
diff --git a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/developer-experience-icon.svg b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/developer-experience-icon.svg
deleted file mode 100644
index 50d208118aedf..0000000000000
--- a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/developer-experience-icon.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="120px" height="100px" viewBox="0 0 120 100" enable-background="new 0 0 120 100" xml:space="preserve">
-<rect x="2.904" y="27.946" fill="#F06524" width="113.745" height="12.408"/>
-<path fill="#636667" d="M95.811,85.511c-0.753-2.551-1.775-5.013-3.059-7.344c-0.207-0.387-0.134-0.884,0.191-1.208
-	c2.857-2.869,2.857-7.489,0.013-10.346l-3.649-3.686c-2.873-2.86-7.493-2.86-10.348-0.016c-0.334,0.336-0.828,0.409-1.228,0.193
-	c-2.321-1.271-4.785-2.295-7.337-3.047c-0.419-0.126-0.714-0.525-0.712-0.979c0.004-1.947-0.766-3.812-2.139-5.187
-	c-1.37-1.377-3.233-2.148-5.176-2.148h-5.184c-4.039,0-7.312,3.274-7.312,7.314c0.001,0.464-0.294,0.863-0.728,0.993
-	c-2.537,0.747-5.002,1.771-7.335,3.051c-0.391,0.213-0.882,0.143-1.199-0.178c-1.377-1.381-3.236-2.15-5.176-2.15
-	c-1.938,0-3.799,0.77-5.168,2.143l-3.688,3.744c-2.833,2.845-2.833,7.465,0.011,10.321c0.336,0.336,0.41,0.835,0.191,1.24
-	c-1.269,2.312-2.294,4.772-3.045,7.324c-0.487,1.657,0.46,3.396,2.117,3.885c1.658,0.487,3.396-0.46,3.884-2.117
-	c0.624-2.12,1.475-4.164,2.538-6.101c1.544-2.863,1.027-6.375-1.262-8.653c-0.405-0.407-0.405-1.082,0.009-1.497l3.686-3.742
-	c0.181-0.182,0.449-0.291,0.727-0.291c0.279,0,0.545,0.109,0.743,0.307c2.271,2.289,5.794,2.805,8.634,1.253
-	c1.944-1.065,3.993-1.918,6.115-2.541c3.105-0.933,5.213-3.781,5.2-7.005C56.126,58.473,56.6,58,57.184,58h5.184
-	c0.281,0,0.55,0.112,0.75,0.31c0.199,0.2,0.309,0.471,0.309,0.752c-0.012,3.217,2.098,6.065,5.185,6.992
-	c2.138,0.631,4.187,1.482,6.129,2.545c2.854,1.546,6.369,1.026,8.646-1.269c0.403-0.401,1.075-0.401,1.492,0.015l3.639,3.675
-	c0.42,0.424,0.42,1.098,0.007,1.515c-2.283,2.265-2.802,5.783-1.261,8.628c1.071,1.952,1.922,3.997,2.545,6.116
-	c0.489,1.657,2.228,2.604,3.886,2.116C95.351,88.907,96.297,87.169,95.811,85.511z"/>
-<path fill="#636667" d="M118.29,1.486C117.337,0.536,116.046,0,114.7,0H4.843C2.035,0.014-0.224,2.283-0.224,5.076v89.103
-	c-0.006,1.334,0.524,2.629,1.475,3.584c0.951,0.955,2.244,1.492,3.592,1.492h109.851c1.35,0.005,2.645-0.529,3.6-1.484
-	c0.955-0.954,1.49-2.254,1.482-3.605V5.076C119.776,3.73,119.243,2.439,118.29,1.486z M113.521,6.255v18.564H6.032V6.255H113.521z
-	 M41.2,93c1.493-8.922,9.23-15.729,18.576-15.729c9.348,0,17.083,6.808,18.576,15.729H41.2z M84.673,93
-	c-1.542-12.39-12.089-21.984-24.896-21.984C46.97,71.016,36.422,80.61,34.879,93H6.032V31.074h107.49V93H84.673z"/>
-<path fill="#636667" d="M21.661,19.955c-1.204,1.203-2.836,1.879-4.539,1.879c-3.545,0-6.419-2.873-6.419-6.418
-	s2.874-6.418,6.419-6.418s6.418,2.873,6.418,6.418C23.541,17.118,22.865,18.751,21.661,19.955z"/>
-<circle fill="#636667" cx="31.611" cy="15.416" r="6.418"/>
-<path fill="#636667" d="M52.518,15.416c-0.009,3.545-2.873,6.408-6.418,6.418c-3.545,0-6.419-2.873-6.419-6.418
-	s2.874-6.418,6.419-6.418C49.645,8.998,52.518,11.871,52.518,15.416z"/>
-</svg>
diff --git a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/email-marketing-icon.svg b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/email-marketing-icon.svg
new file mode 100644
index 0000000000000..dc9ac2103d93f
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/email-marketing-icon.svg
@@ -0,0 +1,27 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="120px" height="105px" viewBox="0 0 120 105" enable-background="new 0 0 120 105" xml:space="preserve">
+<path fill="#636567" d="M80.118,95.919c-0.604,0-1.195-0.302-1.539-0.853l-6.324-10.07c-6.037,3.441-13.018,5.409-20.45,5.409
+	c-7.431,0-14.411-1.97-20.448-5.409l-6.322,10.07c-0.53,0.853-1.651,1.108-2.502,0.574c-0.85-0.533-1.106-1.654-0.573-2.504
+	l6.324-10.078c-10.802-7.479-17.891-19.961-17.891-34.067c0-22.836,18.577-41.415,41.412-41.415c11.066,0,21.466,4.31,29.289,12.132
+	c0.709,0.709,0.709,1.858,0,2.568c-0.71,0.709-1.859,0.709-2.568,0C71.389,15.138,61.9,11.208,51.806,11.208
+	c-20.833,0-37.78,16.949-37.78,37.783c0,20.833,16.947,37.782,37.78,37.782c20.836,0,37.79-16.949,37.79-37.782
+	c0-2.749-0.303-5.506-0.898-8.197c-0.217-0.979,0.402-1.949,1.383-2.165c0.975-0.217,1.947,0.402,2.165,1.381
+	c0.651,2.946,0.981,5.968,0.981,8.98c0,14.105-7.092,26.589-17.896,34.07l6.323,10.075c0.533,0.851,0.277,1.972-0.572,2.503
+	C80.781,95.828,80.448,95.919,80.118,95.919z M51.805,73.473c-13.498,0-24.479-10.98-24.479-24.48
+	c0-13.499,10.981-24.48,24.479-24.48c6.384,0,12.427,2.444,17.02,6.881c0.722,0.697,0.741,1.846,0.044,2.566
+	c-0.693,0.722-1.848,0.741-2.566,0.044c-3.912-3.777-9.061-5.859-14.498-5.859c-11.496,0-20.847,9.353-20.847,20.848
+	c0,11.496,9.351,20.849,20.847,20.849c11.496,0,20.847-9.354,20.847-20.849c0-1.479-0.149-2.935-0.445-4.329
+	c-0.208-0.981,0.42-1.946,1.4-2.153c0.98-0.209,1.944,0.42,2.152,1.401c0.348,1.64,0.523,3.35,0.523,5.081
+	C76.284,62.491,65.303,73.473,51.805,73.473z M59.665,53.282c-0.168,0-0.339-0.023-0.509-0.073l-9.802-2.859l2.16-9.592
+	c0.22-0.98,1.194-1.591,2.171-1.373c0.979,0.22,1.592,1.192,1.373,2.17l-0.92,4.083L84.9,28.742l2.43-9.151
+	c0.259-0.968,1.255-1.54,2.223-1.289c0.969,0.257,1.547,1.252,1.288,2.222l-2.165,8.149l8.147,2.165
+	c0.97,0.259,1.546,1.254,1.288,2.222c-0.258,0.97-1.258,1.541-2.221,1.29l-9.199-2.448l-30.388,16.69l3.871,1.13
+	c0.963,0.28,1.516,1.289,1.234,2.252C61.178,52.768,60.452,53.282,59.665,53.282z M104.223,29.94c-0.156,0-0.312-0.02-0.469-0.061
+	L92.1,26.776l3.104-11.657c0.261-0.97,1.261-1.536,2.224-1.288c0.969,0.259,1.545,1.254,1.287,2.224l-2.17,8.146l8.145,2.167
+	c0.97,0.259,1.545,1.254,1.289,2.222C105.76,29.404,105.023,29.94,104.223,29.94z M112.09,25.467c-0.156,0-0.312-0.02-0.469-0.061
+	l-11.654-3.102l3.104-11.659c0.261-0.97,1.256-1.536,2.225-1.288c0.969,0.259,1.545,1.254,1.287,2.224l-2.171,8.147l8.146,2.166
+	c0.969,0.259,1.545,1.254,1.289,2.222C113.627,24.932,112.893,25.467,112.09,25.467z"/>
+<path fill="#F16523" d="M20.371,50.808c-1.004,0-1.816-0.812-1.816-1.816c0-18.335,14.917-33.252,33.252-33.252
+	c1.004,0,1.816,0.812,1.816,1.816c0,1.003-0.812,1.816-1.816,1.816c-16.333,0-29.62,13.287-29.62,29.62
+	C22.187,49.996,21.375,50.808,20.371,50.808z"/>
+</svg>
diff --git a/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/instant-purchase-icon.svg b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/instant-purchase-icon.svg
new file mode 100644
index 0000000000000..c832fb75efe18
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/images/instant-purchase-icon.svg
@@ -0,0 +1,32 @@
+<svg version="1.1" id="Cart" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="120px" height="105px" viewBox="0 0 120 105" enable-background="new 0 0 120 105" xml:space="preserve">
+<path fill="#636567" d="M101.766,80.426H54.435c-6.864,0-12.96-4.613-14.823-11.22l-14.926-52.49
+	c-0.957-3.368-4.066-5.719-7.562-5.719H9.316c-1.014,0-1.837-0.822-1.837-1.838c0-1.015,0.824-1.837,1.837-1.837h7.808
+	c5.132,0,9.695,3.451,11.097,8.391l14.927,52.493c1.421,5.033,6.062,8.544,11.288,8.544h47.33c1.016,0,1.838,0.822,1.838,1.839
+	C103.602,79.604,102.779,80.426,101.766,80.426z"/>
+<path fill="#636567" d="M103.557,63.122H51.98c-0.828,0-1.552-0.554-1.771-1.351l-7.48-27.108c-0.271-0.978,0.303-1.99,1.283-2.259
+	c0.969-0.26,1.99,0.303,2.259,1.283l7.11,25.76h48.664l6.475-33.153c0.105-0.553-0.133-0.946-0.287-1.132
+	c-0.152-0.185-0.492-0.497-1.051-0.497H28.435c-1.014,0-1.837-0.822-1.837-1.838c0-1.016,0.824-1.837,1.837-1.837h78.745
+	c1.512,0,2.928,0.669,3.889,1.835c0.963,1.168,1.348,2.69,1.057,4.174l-6.764,34.637C105.191,62.499,104.438,63.122,103.557,63.122z
+	"/>
+<path fill="#636567" d="M60.945,56.262c-0.887,0-1.667-0.643-1.812-1.543l-3.282-20.28c-0.162-1.002,0.519-1.945,1.52-2.108
+	c1.018-0.163,1.945,0.519,2.108,1.52l3.283,20.28c0.161,1.003-0.52,1.945-1.521,2.108C61.141,56.255,61.042,56.262,60.945,56.262z"
+	/>
+<path fill="#636567" d="M71.57,56.262c-1.016,0-1.838-0.822-1.838-1.838V34.145c0-1.016,0.822-1.838,1.838-1.838
+	c1.017,0,1.837,0.822,1.837,1.838v20.279C73.407,55.439,72.587,56.262,71.57,56.262z"/>
+<path fill="#636567" d="M94.062,56.262c-0.098,0-0.195-0.007-0.295-0.022c-1.002-0.161-1.684-1.105-1.521-2.106l3.277-20.28
+	c0.16-1.001,1.105-1.685,2.105-1.522c1.003,0.162,1.684,1.106,1.521,2.107l-3.276,20.28C95.729,55.619,94.949,56.262,94.062,56.262z
+	"/>
+<path fill="#636567" d="M83.426,56.262c-1.015,0-1.837-0.822-1.837-1.838V34.145c0-1.016,0.822-1.838,1.837-1.838
+	c1.018,0,1.838,0.822,1.838,1.838v20.279C85.264,55.439,84.441,56.262,83.426,56.262z"/>
+<path fill="#636567" d="M97.337,36.013H44.499c-1.015,0-1.837-0.822-1.837-1.838c0-1.015,0.822-1.837,1.837-1.837h52.838
+	c1.017,0,1.838,0.822,1.838,1.837C99.175,35.191,98.354,36.013,97.337,36.013z"/>
+<path fill="#636567" d="M95.404,47.96H47.795c-1.016,0-1.838-0.822-1.838-1.838s0.822-1.837,1.838-1.837h47.609
+	c1.016,0,1.838,0.822,1.838,1.837S96.42,47.96,95.404,47.96z"/>
+<path fill="#F16523" d="M92.198,96.445c-3.835,0-6.953-3.115-6.953-6.944c0-3.832,3.118-6.948,6.953-6.948
+	c3.829,0,6.944,3.116,6.944,6.948C99.143,93.33,96.027,96.445,92.198,96.445z M92.198,86.229c-1.808,0-3.278,1.467-3.278,3.272
+	c0,1.804,1.471,3.271,3.278,3.271c1.804,0,3.269-1.467,3.269-3.271C95.467,87.695,94.002,86.229,92.198,86.229z"/>
+<path fill="#F16523" d="M58.65,96.445c-3.83,0-6.945-3.115-6.945-6.944c0-3.832,3.115-6.948,6.945-6.948
+	c3.829,0,6.944,3.116,6.944,6.948C65.596,93.33,62.479,96.445,58.65,96.445z M58.65,86.229c-1.804,0-3.27,1.467-3.27,3.272
+	c0,1.804,1.466,3.271,3.27,3.271c1.803,0,3.269-1.467,3.269-3.271C61.919,87.695,60.453,86.229,58.65,86.229z"/>
+</svg>
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
index 769120127329e..dca24e92f0040 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
@@ -347,6 +347,7 @@ public function testSaveActionExistingCustomerUnsubscribeNewsletter()
                 'email' => 'customer@example.com',
                 'firstname' => 'test firstname',
                 'lastname' => 'test lastname',
+                'sendemail_store_id' => 1
             ],
             'subscription' => '0'
         ];
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
index 152d65681c54f..84e72979cc4c5 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
@@ -28,7 +28,7 @@
 
 $subscriber = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create(\Magento\Newsletter\Model\Subscriber::class);
-$subscriber->setStoreId($otherStore)
+$subscriber->setStoreId($currentStore)
     // Intentionally setting ID to 0 instead of 2 to test fallback mechanism in Subscriber model
     ->setCustomerId(0)
     ->setSubscriberEmail('customer_two@example.com')
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
index bfe839c0dfe9d..46820d1440ca6 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model\Order;
 
 /**
@@ -47,4 +48,35 @@ public function testPackages()
         $shipment->load($shipment->getId());
         $this->assertEquals($packages, $shipment->getPackages());
     }
+
+    /**
+     * Check that getTracksCollection() always return collection instance.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     */
+    public function testAddTrack()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $order = $objectManager->create(\Magento\Sales\Model\Order::class);
+        $order->loadByIncrementId('100000001');
+
+        /** @var \Magento\Sales\Model\Order\Shipment $shipment */
+        $shipment = $objectManager->create(\Magento\Sales\Model\Order\Shipment::class);
+        $shipment->setOrder($order);
+
+        $shipment->addItem($objectManager->create(\Magento\Sales\Model\Order\Shipment\Item::class));
+        $shipment->save();
+
+        /** @var $track \Magento\Sales\Model\Order\Shipment\Track */
+        $track = $objectManager->get(\Magento\Sales\Model\Order\Shipment\Track::class);
+        $track->setNumber('Test Number')->setTitle('Test Title')->setCarrierCode('Test CODE');
+
+        $this->assertEmpty($shipment->getTracks());
+        $shipment->addTrack($track)->save();
+
+        //to empty cache
+        $shipment->setTracks(null);
+        $this->assertNotEmpty($shipment->getTracks());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
index a356406a95a65..525d7d66abd79 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
@@ -16,16 +16,20 @@ class UrlRewriteTest extends \Magento\TestFramework\TestCase\AbstractController
      *
      * @param string $request
      * @param string $redirect
+     * @param int $expectedCode
      *
      * @dataProvider requestDataProvider
      */
-    public function testMatchUrlRewrite($request, $redirect)
-    {
+    public function testMatchUrlRewrite(
+        $request,
+        $redirect,
+        $expectedCode = 301
+    ) {
         $this->dispatch($request);
         $code = $this->getResponse()->getHttpResponseCode();
         $location = $this->getResponse()->getHeader('Location')->getFieldValue();
 
-        $this->assertEquals(301, $code, 'Invalid response code');
+        $this->assertEquals($expectedCode, $code, 'Invalid response code');
         $this->assertStringEndsWith($redirect, $location, 'Invalid location header');
     }
 
@@ -56,6 +60,12 @@ public function requestDataProvider()
                 'request' => '/page-similar/',
                 'redirect' => '/page-b',
             ],
+            'Use Case #7: Rewrite during stores switching' => [
+                'request' => '/page-c-on-2nd-store'
+                    . '?___store=default&___from_store=fixture_second_store',
+                'redirect' => '/page-c-on-1st-store',
+                'expectedCode' => 302
+            ]
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite.php
index 37cb86aff3be8..a8c40d148de4b 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite.php
@@ -6,35 +6,62 @@
 
 use \Magento\UrlRewrite\Model\OptionProvider;
 use \Magento\UrlRewrite\Model\UrlRewrite;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Store;
+
+/** Create fixture store */
+require dirname(dirname(__DIR__)) . '/Store/_files/second_store.php';
 
 /** @var UrlRewrite $rewrite */
 /** @var \Magento\Framework\ObjectManagerInterface $objectManager */
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 /** @var \Magento\UrlRewrite\Model\ResourceModel\UrlRewrite $rewriteResource */
-$rewriteResource = $objectManager->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewrite::class);
+$rewriteResource = $objectManager->create(
+    \Magento\UrlRewrite\Model\ResourceModel\UrlRewrite::class
+);
 /** @var \Magento\Cms\Model\ResourceModel\Page $pageResource */
-$pageResource = $objectManager->create(\Magento\Cms\Model\ResourceModel\Page::class);
+$pageResource = $objectManager->create(
+    \Magento\Cms\Model\ResourceModel\Page::class
+);
+/** @var StoreManagerInterface $storeManager */
+$storeManager = Bootstrap::getObjectManager()
+    ->get(StoreManagerInterface::class);
 
+/** @var Store $secondStore */
+$secondStore = Bootstrap::getObjectManager()->create(Store::class);
+$secondStore->load('fixture_second_store');
+$secondStoreId = $secondStore->getId();
 $storeID = 1;
 
 /** @var $page \Magento\Cms\Model\Page */
-$page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+$page = Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
 $page->setTitle('Cms Page A')
     ->setIdentifier('page-a')
-    ->setStores([$storeID])
     ->setIsActive(1)
     ->setContent('<h1>Cms Page A</h1>')
-    ->setPageLayout('1column');
+    ->setPageLayout('1column')
+    ->setStores([$storeID, $secondStoreId]);
 $pageResource->save($page);
 
-$page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+$page = Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
 $page->setTitle('Cms B')
     ->setIdentifier('page-b')
-    ->setStores([$storeID])
     ->setIsActive(1)
     ->setContent('<h1>Cms Page B</h1>')
     ->setPageLayout('1column')
-    ->setCustomTheme('Magento/blank');
+    ->setCustomTheme('Magento/blank')
+    ->setStores([$storeID, $secondStoreId]);
+$pageResource->save($page);
+
+$page = Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+$page->setTitle('Cms C')
+    ->setIdentifier('page-c')
+    ->setIsActive(1)
+    ->setContent('<h1>Cms Page C</h1>')
+    ->setPageLayout('1column')
+    ->setCustomTheme('Magento/blank')
+    ->setStores([$storeID, $secondStoreId]);
 $pageResource->save($page);
 
 $rewrite = $objectManager->create(UrlRewrite::class);
@@ -72,3 +99,21 @@
     ->setStoreId($storeID)
     ->setDescription('From age-similar with trailing slash to page-b');
 $rewriteResource->save($rewrite);
+
+//Emulating auto-generated aliases (like the ones used for categories).
+//Rewrite rule for the 1st store.
+$rewrite = $objectManager->create(UrlRewrite::class);
+$rewrite->setEntityType('custom')
+    ->setRequestPath('page-c-on-1st-store')
+    ->setTargetPath('page-c')
+    ->setRedirectType(0)
+    ->setStoreId($storeID);
+$rewriteResource->save($rewrite);
+//Rewrite rule for the 2nd store.
+$rewrite = $objectManager->create(UrlRewrite::class);
+$rewrite->setEntityType('custom')
+    ->setRequestPath('page-c-on-2nd-store')
+    ->setTargetPath('page-c')
+    ->setRedirectType(0)
+    ->setStoreId($secondStoreId);
+$rewriteResource->save($rewrite);