diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index 5143762a07e08..b498cb09e34fa 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -233,6 +233,11 @@ public function addFilters($values)
                     ? date('Y-m-d\TH:i:s\Z', strtotime($value['to']))
                     : '';
             }
+
+            if ($attribute->getAttributeCode() === 'sku') {
+                $value = mb_strtolower($value);
+            }
+
             $condition = $this->_getResource()->prepareCondition(
                 $attribute,
                 $value,
diff --git a/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js b/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js
index a6d1de5fde255..eba9a8c3ea7ae 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js
@@ -6,7 +6,7 @@
 /**
  * @api
  */
-define([], function () {
+define(['underscore'], function (_) {
     'use strict';
 
     /**
@@ -44,7 +44,7 @@ define([], function () {
             vatId: addressData['vat_id'],
             sameAsBilling: addressData['same_as_billing'],
             saveInAddressBook: addressData['save_in_address_book'],
-            customAttributes: addressData['custom_attributes'],
+            customAttributes: _.toArray(addressData['custom_attributes']).reverse(),
 
             /**
              * @return {*}
diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
index 4f7939da478fa..84b7ecf0fbc99 100644
--- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
@@ -81,12 +81,14 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        /** @var \Magento\Sales\Model\Order\Item $orderItem */
         $orderItem = $observer->getEvent()->getItem();
         if (!$orderItem->getId()) {
             //order not saved in the database
             return $this;
         }
-        if ($orderItem->getProductType() != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
+        $productType = $orderItem->getRealProductType() ?: $orderItem->getProductType();
+        if ($productType != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
             return $this;
         }
         $product = $orderItem->getProduct();
@@ -112,13 +114,13 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             if ($linkIds = $orderItem->getProductOptionByCode('links')) {
                 $linkPurchased = $this->_createPurchasedModel();
                 $this->_objectCopyService->copyFieldsetToTarget(
-                    \downloadable_sales_copy_order::class,
+                    'downloadable_sales_copy_order',
                     'to_downloadable',
                     $orderItem->getOrder(),
                     $linkPurchased
                 );
                 $this->_objectCopyService->copyFieldsetToTarget(
-                    \downloadable_sales_copy_order_item::class,
+                    'downloadable_sales_copy_order_item',
                     'to_downloadable',
                     $orderItem,
                     $linkPurchased
@@ -131,14 +133,12 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         ScopeInterface::SCOPE_STORE
                     );
                 $linkPurchased->setLinkSectionTitle($linkSectionTitle)->save();
-                
                 $linkStatus = \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING;
                 if ($orderStatusToEnableItem == \Magento\Sales\Model\Order\Item::STATUS_PENDING
                     || $orderItem->getOrder()->getState() == \Magento\Sales\Model\Order::STATE_COMPLETE
                 ) {
                     $linkStatus = \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE;
                 }
-                
                 foreach ($linkIds as $linkId) {
                     if (isset($links[$linkId])) {
                         $linkPurchasedItem = $this->_createPurchasedItemModel()->setPurchasedId(
@@ -148,7 +148,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         );
 
                         $this->_objectCopyService->copyFieldsetToTarget(
-                            \downloadable_sales_copy_link::class,
+                            'downloadable_sales_copy_link',
                             'to_purchased',
                             $links[$linkId],
                             $linkPurchasedItem
diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php
index 756ec44edae42..452ac087a8691 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php
@@ -160,6 +160,9 @@ public function testSaveDownloadableOrderItem()
         $itemMock->expects($this->any())
             ->method('getProductType')
             ->willReturn(DownloadableProductType::TYPE_DOWNLOADABLE);
+        $itemMock->expects($this->any())
+            ->method('getRealProductType')
+            ->willReturn(DownloadableProductType::TYPE_DOWNLOADABLE);
 
         $this->orderMock->expects($this->once())
             ->method('getStoreId')
@@ -295,6 +298,9 @@ public function testSaveDownloadableOrderItemSavedPurchasedLink()
         $itemMock->expects($this->any())
             ->method('getProductType')
             ->willReturn(DownloadableProductType::TYPE_DOWNLOADABLE);
+        $itemMock->expects($this->any())
+            ->method('getRealProductType')
+            ->willReturn(DownloadableProductType::TYPE_DOWNLOADABLE);
 
         $purchasedLink = $this->getMockBuilder(\Magento\Downloadable\Model\Link\Purchased::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
index 7a5d6fcdcc1b1..f0e9958546bbd 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
@@ -104,6 +104,7 @@ public function __construct(
      * @param array $context
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getFields(array $context = []): array
     {
@@ -120,6 +121,9 @@ public function getFields(array $context = []): array
             $allAttributes[$fieldName] = [
                 'type' => $this->fieldTypeResolver->getFieldType($attributeAdapter),
             ];
+            if ($this->isNeedToAddCustomAnalyzer($fieldName) && $this->getCustomAnalyzer($fieldName)) {
+                $allAttributes[$fieldName]['analyzer'] = $this->getCustomAnalyzer($fieldName);
+            }
 
             $index = $this->fieldIndexResolver->getFieldIndex($attributeAdapter);
             if (null !== $index) {
@@ -174,4 +178,26 @@ public function getFields(array $context = []): array
 
         return $allAttributes;
     }
+
+    /**
+     * Check is the custom analyzer exists for the field
+     *
+     * @param string $fieldName
+     * @return bool
+     */
+    private function isNeedToAddCustomAnalyzer(string $fieldName): bool
+    {
+        return $fieldName === 'sku';
+    }
+
+    /**
+     * Getter for the field custom analyzer if it's exists
+     *
+     * @param string $fieldName
+     * @return string|null
+     */
+    private function getCustomAnalyzer(string $fieldName): ?string
+    {
+        return $fieldName === 'sku' ? 'sku' : null;
+    }
 }
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
index 773faf49f8fda..1cad781ad6d74 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
@@ -8,6 +8,9 @@
 use Magento\Framework\Locale\Resolver as LocaleResolver;
 use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface;
 
+/**
+ * Index Builder
+ */
 class Builder implements BuilderInterface
 {
     /**
@@ -40,7 +43,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build()
     {
@@ -59,6 +62,14 @@ public function build()
                             array_keys($filter)
                         ),
                         'char_filter' => array_keys($charFilter)
+                    ],
+                    'sku' => [
+                        'type' => 'custom',
+                        'tokenizer' => 'keyword',
+                        'filter' => array_merge(
+                            ['lowercase', 'keyword_repeat'],
+                            array_keys($filter)
+                        ),
                     ]
                 ],
                 'tokenizer' => $tokenizer,
@@ -71,7 +82,10 @@ public function build()
     }
 
     /**
-     * {@inheritdoc}
+     * Setter for storeId property
+     *
+     * @param int $storeId
+     * @return void
      */
     public function setStoreId($storeId)
     {
@@ -79,47 +93,52 @@ public function setStoreId($storeId)
     }
 
     /**
+     * Return tokenizer configuration
+     *
      * @return array
      */
     protected function getTokenizer()
     {
-        $tokenizer = [
+        return [
             'default_tokenizer' => [
-                'type' => 'standard',
-            ],
+                'type' => 'standard'
+            ]
         ];
-        return $tokenizer;
     }
 
     /**
+     * Return filter configuration
+     *
      * @return array
      */
     protected function getFilter()
     {
-        $filter = [
+        return [
             'default_stemmer' => $this->getStemmerConfig(),
             'unique_stem' => [
                 'type' => 'unique',
                 'only_on_same_position' => true
             ]
         ];
-        return $filter;
     }
 
     /**
+     * Return char filter configuration
+     *
      * @return array
      */
     protected function getCharFilter()
     {
-        $charFilter = [
+        return [
             'default_char_filter' => [
                 'type' => 'html_strip',
             ],
         ];
-        return $charFilter;
     }
 
     /**
+     * Return stemmer configuration
+     *
      * @return array
      */
     protected function getStemmerConfig()
diff --git a/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php b/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
index 52a2912c4b170..f0b05cb7850cc 100644
--- a/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
+++ b/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
@@ -11,6 +11,9 @@
 
 /**
  * Persistent Session Observer
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class SynchronizePersistentOnLoginObserver implements ObserverInterface
 {
@@ -63,6 +66,8 @@ public function __construct(
     }
 
     /**
+     * Synchronize persistent session data with logged in customer
+     *
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -96,8 +101,9 @@ public function execute(Observer $observer)
             if (!$sessionModel->getId()) {
                 /** @var \Magento\Persistent\Model\Session $sessionModel */
                 $sessionModel = $this->_sessionFactory->create();
-                $sessionModel->setCustomerId($customer->getId())->save();
+                $sessionModel->setCustomerId($customer->getId());
             }
+            $sessionModel->save();
             $this->_persistentSession->setSession($sessionModel);
         }
 
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
index d8a8a0baeca98..f3d133a974082 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
@@ -10,7 +10,7 @@
 "var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
 "layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
-"var billing.name":"Guest Customer Name (Billing)",
+"var order_data.customer_name":"Guest Customer Name (Billing)",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
@@ -30,7 +30,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
index ed8f592b59638..64e9a61831956 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
@@ -8,7 +8,7 @@
 <!--@vars {
 "var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
 "var store.frontend_name":"Store Frontend Name",
@@ -21,7 +21,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
index c06630fd249ab..b2109fad5478a 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
@@ -7,7 +7,7 @@
 <!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "layout handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
@@ -30,7 +30,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
index 289c5113fe285..be3462d0e2fc9 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
@@ -21,7 +21,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
index 1ce0d162ed76e..4f1f6862fab03 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
@@ -20,7 +20,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
index 54c7f08506497..85473cb0ee8c6 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
@@ -7,7 +7,7 @@
 <!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var comment|escape|nl2br":"Shipment Comment",
@@ -31,7 +31,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
index 087cb0ddbf5bc..cf54379d4bb46 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
@@ -21,7 +21,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/code/Magento/Store/Controller/Store/Redirect.php b/app/code/Magento/Store/Controller/Store/Redirect.php
index 13ff540114cdc..19edc86237d1e 100644
--- a/app/code/Magento/Store/Controller/Store/Redirect.php
+++ b/app/code/Magento/Store/Controller/Store/Redirect.php
@@ -70,29 +70,20 @@ public function __construct(
      */
     public function execute()
     {
-        /** @var Store $currentStore */
-        $currentStore = $this->storeRepository->getById($this->storeResolver->getCurrentStoreId());
         $targetStoreCode = $this->_request->getParam(StoreResolver::PARAM_NAME);
         $fromStoreCode = $this->_request->getParam('___from_store');
-        $error = null;
 
         if ($targetStoreCode === null) {
-            return $this->_redirect($currentStore->getBaseUrl());
+            return $this->_redirect($this->getCurrentStoreBaseUrl());
         }
 
         try {
             /** @var Store $fromStore */
             $fromStore = $this->storeRepository->get($fromStoreCode);
-        } catch (NoSuchEntityException $e) {
-            $error = __('Requested store is not found');
-        }
+            /** @var Store $targetStore */
+            $targetStore = $this->storeRepository->get($targetStoreCode);
 
-        if ($error !== null) {
-            $this->messageManager->addErrorMessage($error);
-            $this->_redirect->redirect($this->_response, $currentStore->getBaseUrl());
-        } else {
             $encodedUrl = $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED);
-
             $query = [
                 '___from_store' => $fromStore->getCode(),
                 StoreResolverInterface::PARAM_NAME => $targetStoreCode,
@@ -106,8 +97,28 @@ public function execute()
                 '_nosid' => true,
                 '_query' => $query
             ];
-            $this->_redirect->redirect($this->_response, 'stores/store/switch', $arguments);
+            $targetUrl = $targetStore->getUrl('stores/store/switch', $arguments);
+        } catch (NoSuchEntityException $e) {
+            $this->messageManager->addErrorMessage(__('Requested store is not found'));
+            $targetUrl = $this->getCurrentStoreBaseUrl();
         }
-        // phpstan:ignore "Method Magento\Store\Controller\Store\Redirect::execute() should return *"
+
+        $response = $this->getResponse();
+        $response->setRedirect($targetUrl);
+
+        return $response;
+    }
+
+    /**
+     * Get base url for current store
+     *
+     * @return string
+     */
+    private function getCurrentStoreBaseUrl(): string
+    {
+        /** @var Store $currentStore */
+        $currentStore = $this->storeRepository->getById($this->storeResolver->getCurrentStoreId());
+
+        return $currentStore->getBaseUrl();
     }
 }
diff --git a/app/code/Magento/Swatches/Plugin/Catalog/Api/ProductAttributeRepositoryInterfacePlugin.php b/app/code/Magento/Swatches/Plugin/Catalog/Api/ProductAttributeRepositoryInterfacePlugin.php
new file mode 100644
index 0000000000000..93f8f1f31e34a
--- /dev/null
+++ b/app/code/Magento/Swatches/Plugin/Catalog/Api/ProductAttributeRepositoryInterfacePlugin.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Plugin\Catalog\Api;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Swatches\Model\Swatch;
+
+/**
+ * Swatch attribute save preprocessor
+ */
+class ProductAttributeRepositoryInterfacePlugin
+{
+    /**
+     * Preprocess swatch attributes
+     *
+     * @param ProductAttributeRepositoryInterface $subject
+     * @param ProductAttributeInterface $attribute
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSave(
+        ProductAttributeRepositoryInterface $subject,
+        ProductAttributeInterface $attribute
+    ) {
+        switch ($attribute->getFrontendInput()) {
+            case Swatch::SWATCH_TYPE_VISUAL_ATTRIBUTE_FRONTEND_INPUT:
+                $attribute->setSwatchInputType(Swatch::SWATCH_INPUT_TYPE_VISUAL);
+                $attribute->setFrontendInput('select');
+                break;
+            case Swatch::SWATCH_TYPE_TEXTUAL_ATTRIBUTE_FRONTEND_INPUT:
+                $attribute->setSwatchInputType(Swatch::SWATCH_INPUT_TYPE_TEXT);
+                $attribute->setUseProductImageForSwatch(0);
+                $attribute->setFrontendInput('select');
+                break;
+        }
+        return [$attribute];
+    }
+}
diff --git a/app/code/Magento/Swatches/etc/di.xml b/app/code/Magento/Swatches/etc/di.xml
index 593786b993560..d25e5b7570040 100644
--- a/app/code/Magento/Swatches/etc/di.xml
+++ b/app/code/Magento/Swatches/etc/di.xml
@@ -60,4 +60,8 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Api\ProductAttributeRepositoryInterface">
+        <plugin name="swatch_attribute"
+                type="Magento\Swatches\Plugin\Catalog\Api\ProductAttributeRepositoryInterfacePlugin"/>
+    </type>
 </config>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
index 4442c172a08e5..5b58659bcf48c 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
@@ -10,7 +10,7 @@
 "var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
 "layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
-"var billing.name":"Guest Customer Name (Billing)",
+"var order_data.customer_name":"Guest Customer Name (Billing)",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
@@ -28,7 +28,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
index 9b09760c1fa4a..91f790715eda3 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
@@ -8,7 +8,7 @@
 <!--@vars {
 "var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
 "var store_email":"Store Email",
@@ -19,7 +19,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html
index 6e35fd2609dff..036b3b6d96dcb 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html
@@ -7,7 +7,7 @@
 <!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "layout handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
@@ -28,7 +28,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
index f9e1498763cba..759e9766f335a 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
@@ -19,7 +19,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
index 5f23898b50018..3f8e8ace3428e 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
@@ -18,7 +18,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
index 18684fb052b4e..d1d9d21f1ee9a 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
@@ -7,7 +7,7 @@
 <!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var comment|escape|nl2br":"Shipment Comment",
@@ -30,7 +30,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
index 5887ff73c6398..37478644ddf9c 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
@@ -19,7 +19,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/dev/tests/api-functional/testsuite/Magento/Swatches/Api/ProductAttributeRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Swatches/Api/ProductAttributeRepositoryInterfaceTest.php
new file mode 100644
index 0000000000000..158de9bc16381
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/Swatches/Api/ProductAttributeRepositoryInterfaceTest.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Api;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+use Magento\Eav\Api\Data\AttributeOptionLabelInterface;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\Swatches\Model\Swatch;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+
+/**
+ * Test attribute management API for swatch attribute type
+ */
+class ProductAttributeRepositoryInterfaceTest extends WebapiAbstract
+{
+    private const SERVICE_NAME = 'catalogProductAttributeRepositoryV1';
+    private const SERVICE_VERSION = 'V1';
+    private const RESOURCE_PATH = '/V1/products/attributes';
+    /**
+     * @var array
+     */
+    private $createdAttributes = [];
+
+    /**
+     * Test create swatch attribute
+     *
+     * @param array $payload
+     * @param array $expected
+     *
+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
+     * @dataProvider saveDataProvider
+     */
+    public function testSave(
+        array $payload,
+        array $expected
+    ) {
+        $response = $this->_webApiCall(
+            [
+                'rest' => [
+                    'resourcePath' => self::RESOURCE_PATH,
+                    'httpMethod' => Request::HTTP_METHOD_POST,
+                ],
+                'soap' => [
+                    'service' => self::SERVICE_NAME,
+                    'serviceVersion' => self::SERVICE_VERSION,
+                    'operation' => self::SERVICE_NAME . 'Save',
+                ],
+            ],
+            [
+                'attribute' => $payload,
+            ]
+        );
+
+        $this->assertNotNull($response);
+        if (!empty($response['attribute_id'])) {
+            $this->createdAttributes[] = $payload['attribute_code'];
+        }
+        $expected = array_replace_recursive($response, $expected);
+        $this->assertEquals($expected, $response);
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function saveDataProvider(): array
+    {
+        return [
+            'visual swatch option with value' => [
+                'payload' => [
+                    ProductAttributeInterface::ATTRIBUTE_CODE => 'visual_swatch_attr_20200713',
+                    ProductAttributeInterface::FRONTEND_INPUT => Swatch::SWATCH_TYPE_VISUAL_ATTRIBUTE_FRONTEND_INPUT,
+                    ProductAttributeInterface::IS_USER_DEFINED => true,
+                    ProductAttributeInterface::IS_REQUIRED => false,
+                    ProductAttributeInterface::ENTITY_TYPE_ID => 4,
+                    'default_frontend_label' => 'Visual Swatch Attribute',
+                    ProductAttributeInterface::OPTIONS => [
+                        [
+                            AttributeOptionInterface::LABEL => 'Black',
+                            AttributeOptionInterface::VALUE => '#000000',
+                            AttributeOptionInterface::SORT_ORDER => 1,
+                            AttributeOptionInterface::IS_DEFAULT => true,
+                        ],
+                        [
+                            AttributeOptionInterface::LABEL => 'White',
+                            AttributeOptionInterface::VALUE => '#ffffff',
+                            AttributeOptionInterface::SORT_ORDER => 2
+                        ]
+                    ],
+                    ProductAttributeInterface::FRONTEND_LABELS => [
+                        [
+                            AttributeOptionLabelInterface::STORE_ID => 0,
+                            AttributeOptionLabelInterface::LABEL => 'Visual Swatch Attribute'
+                        ],
+                    ],
+                ],
+                'expected' => [
+                    ProductAttributeInterface::ATTRIBUTE_CODE => 'visual_swatch_attr_20200713',
+                    ProductAttributeInterface::FRONTEND_INPUT => 'select',
+                    ProductAttributeInterface::OPTIONS => [
+                        [
+                            AttributeOptionInterface::LABEL => ' ',
+                        ],
+                        [
+                            AttributeOptionInterface::LABEL => 'Black',
+                        ],
+                        [
+                            AttributeOptionInterface::LABEL => 'White',
+                        ]
+                    ]
+                ],
+            ],
+            'text swatch option with value' => [
+                'payload' => [
+                    ProductAttributeInterface::ATTRIBUTE_CODE => 'text_swatch_attr_20200713',
+                    ProductAttributeInterface::FRONTEND_INPUT => Swatch::SWATCH_TYPE_TEXTUAL_ATTRIBUTE_FRONTEND_INPUT,
+                    ProductAttributeInterface::IS_USER_DEFINED => true,
+                    ProductAttributeInterface::IS_REQUIRED => false,
+                    ProductAttributeInterface::ENTITY_TYPE_ID => 4,
+                    'default_frontend_label' => 'Text Swatch Attribute',
+                    ProductAttributeInterface::OPTIONS => [
+                        [
+                            AttributeOptionInterface::LABEL => 'Small',
+                            AttributeOptionInterface::VALUE => 'S',
+                            AttributeOptionInterface::SORT_ORDER => 1,
+                            AttributeOptionInterface::IS_DEFAULT => true,
+                        ],
+                        [
+                            AttributeOptionInterface::LABEL => 'Medium',
+                            AttributeOptionInterface::VALUE => 'M',
+                            AttributeOptionInterface::SORT_ORDER => 2
+                        ]
+                    ],
+                    ProductAttributeInterface::FRONTEND_LABELS => [
+                        [
+                            AttributeOptionLabelInterface::STORE_ID => 0,
+                            AttributeOptionLabelInterface::LABEL => 'Text Swatch Attribute'
+                        ],
+                    ],
+                ],
+                'expected' => [
+                    ProductAttributeInterface::ATTRIBUTE_CODE => 'text_swatch_attr_20200713',
+                    ProductAttributeInterface::FRONTEND_INPUT => 'select',
+                    ProductAttributeInterface::OPTIONS => [
+                        [
+                            AttributeOptionInterface::LABEL => ' ',
+                        ],
+                        [
+                            AttributeOptionInterface::LABEL => 'Small',
+                        ],
+                        [
+                            AttributeOptionInterface::LABEL => 'Medium',
+                        ]
+                    ]
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Delete attribute by code
+     *
+     * @param $attributeCode
+     * @return bool
+     */
+    private function deleteAttribute($attributeCode): bool
+    {
+        return $this->_webApiCall(
+            [
+                'rest' => [
+                    'resourcePath' => self::RESOURCE_PATH . '/' . $attributeCode,
+                    'httpMethod' => Request::HTTP_METHOD_DELETE,
+                ],
+                'soap' => [
+                    'service' => self::SERVICE_NAME,
+                    'serviceVersion' => self::SERVICE_VERSION,
+                    'operation' => self::SERVICE_NAME . 'deleteById',
+                ],
+            ],
+            [
+                'attributeCode' => $attributeCode
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        foreach ($this->createdAttributes as $attributeCode) {
+            $this->deleteAttribute($attributeCode);
+        }
+        parent::tearDown();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
index fc24658bb01fa..f9441ec48b166 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
@@ -68,6 +68,41 @@ public function testExecute(array $searchParams): void
         $this->assertContains('Simple product name', $responseBody);
     }
 
+    /**
+     * Advanced search test by difference product attributes.
+     *
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
+     *
+     * @return void
+     */
+    public function testExecuteSkuWithHyphen(): void
+    {
+        $this->getRequest()->setQuery(
+            $this->_objectManager->create(
+                Parameters::class,
+                [
+                    'values' => [
+                        'name' => '',
+                        'sku' => '24-mb01',
+                        'description' => '',
+                        'short_description' => '',
+                        'price' => [
+                            'from' => '',
+                            'to' => '',
+                        ],
+                        'test_searchable_attribute' => '',
+                    ]
+                ]
+            )
+        );
+        $this->dispatch('catalogsearch/advanced/result');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains('Simple product name', $responseBody);
+    }
+
     /**
      * Data provider with strings for quick search.
      *
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
new file mode 100644
index 0000000000000..5503ff98078a3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+require 'searchable_attribute.php';
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+$product = $productFactory->create();
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple product name')
+    ->setSku('24-mb01')
+    ->setPrice(100)
+    ->setWeight(1)
+    ->setShortDescription('Product short description')
+    ->setTaxClassId(0)
+    ->setDescription('Product description')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setTestSearchableAttribute($attribute->getSource()->getOptionId('Option 1'))
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 1,
+            'qty' => 100,
+            'is_qty_decimal' => 0,
+            'is_in_stock' => 1,
+        ]
+    );
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku_rollback.php
new file mode 100644
index 0000000000000..1e41f393894e7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku_rollback.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var EavSetupFactory $eavSetupFactory */
+$eavSetupFactory = $objectManager->create(EavSetupFactory::class);
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $productRepository->deleteById('24-mb01');
+} catch (NoSuchEntityException $e) {
+    //Product already deleted.
+}
+/** @var EavSetup $eavSetup */
+$eavSetup = $eavSetupFactory->create();
+$eavSetup->removeAttribute(Product::ENTITY, 'test_searchable_attribute');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserverTest.php b/dev/tests/integration/testsuite/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserverTest.php
index 1405a772007bf..89e25fa966597 100644
--- a/dev/tests/integration/testsuite/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserverTest.php
@@ -5,18 +5,31 @@
  */
 namespace Magento\Persistent\Observer;
 
+use DateTime;
+use DateTimeZone;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Persistent\Model\Session;
+use Magento\Persistent\Model\SessionFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
 /**
  * @magentoDataFixture Magento/Customer/_files/customer.php
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class SynchronizePersistentOnLoginObserverTest extends \PHPUnit\Framework\TestCase
+class SynchronizePersistentOnLoginObserverTest extends TestCase
 {
     /**
-     * @var \Magento\Persistent\Observer\SynchronizePersistentOnLoginObserver
+     * @var SynchronizePersistentOnLoginObserver
      */
     protected $_model;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $_objectManager;
 
@@ -29,46 +42,70 @@ class SynchronizePersistentOnLoginObserverTest extends \PHPUnit\Framework\TestCa
      * @var \Magento\Customer\Model\Session
      */
     protected $_customerSession;
+    /**
+     * @var CustomerInterface
+     */
+    private $customer;
 
+    /**
+     * @inheritDoc
+     */
     public function setUp()
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->_objectManager = Bootstrap::getObjectManager();
         $this->_persistentSession = $this->_objectManager->get(\Magento\Persistent\Helper\Session::class);
         $this->_customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
         $this->_model = $this->_objectManager->create(
-            \Magento\Persistent\Observer\SynchronizePersistentOnLoginObserver::class,
+            SynchronizePersistentOnLoginObserver::class,
             [
                 'persistentSession' => $this->_persistentSession,
                 'customerSession' => $this->_customerSession
             ]
         );
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->_objectManager->create(CustomerRepositoryInterface::class);
+        $this->customer = $customerRepository->getById(1);
     }
 
     /**
-     * @covers \Magento\Persistent\Observer\SynchronizePersistentOnLoginObserver::execute
+     * Test that persistent session is created on customer login
      */
-    public function testSynchronizePersistentOnLogin()
+    public function testSynchronizePersistentOnLogin(): void
     {
-        $event = new \Magento\Framework\Event();
-        $observer = new \Magento\Framework\Event\Observer(['event' => $event]);
-
-        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-        $customerRepository = $this->_objectManager->create(
-            \Magento\Customer\Api\CustomerRepositoryInterface::class
-        );
-
-        /** @var $customer \Magento\Customer\Api\Data\CustomerInterface */
-        $customer = $customerRepository->getById(1);
-        $event->setData('customer', $customer);
+        $sessionModel = $this->_objectManager->create(Session::class);
+        $sessionModel->loadByCustomerId($this->customer->getId());
+        $this->assertNull($sessionModel->getCustomerId());
+        $event = new Event();
+        $observer = new Observer(['event' => $event]);
+        $event->setData('customer', $this->customer);
         $this->_persistentSession->setRememberMeChecked(true);
         $this->_model->execute($observer);
-
         // check that persistent session has been stored for Customer
-        /** @var \Magento\Persistent\Model\Session $sessionModel */
-        $sessionModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Persistent\Model\Session::class
-        );
+        /** @var Session $sessionModel */
+        $sessionModel = $this->_objectManager->create(Session::class);
+        $sessionModel->loadByCustomerId($this->customer->getId());
+        $this->assertEquals($this->customer->getId(), $sessionModel->getCustomerId());
+    }
+
+    /**
+     * Test that expired persistent session is renewed on customer login
+     */
+    public function testExpiredPersistentSessionShouldBeRenewedOnLogin(): void
+    {
+        $lastUpdatedAt = (new DateTime('-1day'))->setTimezone(new DateTimeZone('UTC'))->format('Y-m-d H:i:s');
+        /** @var Session $sessionModel */
+        $sessionModel = $this->_objectManager->create(SessionFactory::class)->create();
+        $sessionModel->setCustomerId($this->customer->getId());
+        $sessionModel->setUpdatedAt($lastUpdatedAt);
+        $sessionModel->save();
+        $event = new Event();
+        $observer = new Observer(['event' => $event]);
+        $event->setData('customer', $this->customer);
+        $this->_persistentSession->setRememberMeChecked(true);
+        $this->_model->execute($observer);
+        /** @var Session $sessionModel */
+        $sessionModel = $this->_objectManager->create(Session::class);
         $sessionModel->loadByCustomerId(1);
-        $this->assertEquals(1, $sessionModel->getCustomerId());
+        $this->assertGreaterThan($lastUpdatedAt, $sessionModel->getUpdatedAt());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
index 13bcc756c2364..da0b9f168aa99 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
@@ -42,7 +42,7 @@ public function testSendEmailOnAddCreditmemoComment(): void
         $message = $this->transportBuilder->getSentMessage();
         $subject =__('Update to your %1 credit memo', $order->getStore()->getFrontendName())->render();
         $messageConstraint = $this->logicalAnd(
-            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains($order->getCustomerName()),
             new RegularExpression(
                 sprintf(
                     "/Your order #%s has been updated with a status of.*%s/",
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
index 1db008690a154..5ad8bfa4a9dc5 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
@@ -43,7 +43,7 @@ public function testSendEmailOnAddInvoiceComment(): void
         $message = $this->transportBuilder->getSentMessage();
         $subject = __('Update to your %1 invoice', $order->getStore()->getFrontendName())->render();
         $messageConstraint = $this->logicalAnd(
-            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains($order->getCustomerName()),
             new RegularExpression(
                 sprintf(
                     "/Your order #%s has been updated with a status of.*%s/",
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
index a2ac5883a13d9..9b0af8b9c6572 100644
--- a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
@@ -42,7 +42,7 @@ public function testSendEmailOnShipmentCommentAdd(): void
         $message = $this->transportBuilder->getSentMessage();
         $subject =__('Update to your %1 shipment', $order->getStore()->getFrontendName())->render();
         $messageConstraint = $this->logicalAnd(
-            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains($order->getCustomerName()),
             new RegularExpression(
                 sprintf(
                     "/Your order #%s has been updated with a status of.*%s/",
diff --git a/dev/tests/integration/testsuite/Magento/Store/Controller/Store/RedirectTest.php b/dev/tests/integration/testsuite/Magento/Store/Controller/Store/RedirectTest.php
index df45846dfc832..bd0439132aaa0 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Controller/Store/RedirectTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Controller/Store/RedirectTest.php
@@ -37,4 +37,25 @@ public function testNoSid(): void
         $this->assertNotEmpty($result);
         $this->assertNotContains(SidResolverInterface::SESSION_ID_QUERY_PARAM .'=', $result);
     }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoConfigFixture web/url/use_store 0
+     * @magentoConfigFixture fixture_second_store_store web/unsecure/base_url http://second_store.test/
+     * @magentoConfigFixture fixture_second_store_store web/unsecure/base_link_url http://second_store.test/
+     * @magentoConfigFixture fixture_second_store_store web/secure/base_url http://second_store.test/
+     * @magentoConfigFixture fixture_second_store_store web/secure/base_link_url http://second_store.test/
+     */
+    public function testRedirectToSecondStoreOnAnotherUrl(): void
+    {
+        $this->getRequest()->setParam(StoreResolver::PARAM_NAME, 'fixture_second_store');
+        $this->getRequest()->setParam('___from_store', 'default');
+
+        $this->dispatch('/stores/store/redirect');
+
+        $header = $this->getResponse()->getHeader('Location');
+        $this->assertNotEmpty($header);
+        $result = $header->getFieldValue();
+        $this->assertStringStartsWith('http://second_store.test/', $result);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php
index 98297cd43041f..b39d9ca790bda 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php
@@ -8,12 +8,14 @@
 use Magento\Catalog\Api\Data\ProductAttributeInterfaceFactory;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Eav\Api\Data\AttributeOptionInterfaceFactory;
+use Magento\Swatches\Helper\Data;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test save of swatch attribute
- *
  */
-class AttributeCreateTest extends \PHPUnit\Framework\TestCase
+class AttributeCreateTest extends TestCase
 {
     /**
      * @magentoAppArea adminhtml
@@ -21,7 +23,7 @@ class AttributeCreateTest extends \PHPUnit\Framework\TestCase
      */
     public function testSetScopeDefault()
     {
-        $om = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $om = Bootstrap::getObjectManager();
 
         $data = [
             'is_required' => 1,
@@ -82,7 +84,10 @@ function ($values, $index) use ($optionsPerAttribute) {
         $attribute->setNote('auto');
 
         $attribute = $om->get(ProductAttributeRepositoryInterface::class)->save($attribute);
+        /** @var Data $swatchHelper */
+        $swatchHelper = $om->get(Data::class);
         $this->assertNotEmpty($attribute->getId());
-        $this->assertEquals('swatch_visual', $attribute->getFrontendInput());
+        $this->assertEquals('select', $attribute->getFrontendInput());
+        $this->assertTrue($swatchHelper->isVisualSwatch($attribute));
     }
 }
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/model/customer/address.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/model/customer/address.test.js
index fc00772375e3b..45c509a901c47 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/model/customer/address.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/model/customer/address.test.js
@@ -22,9 +22,12 @@ define([
         it('Check on empty object.', function () {
             var addressData = {
                 region: {}
+            },
+            expected = {
+                customAttributes: []
             };
 
-            expect(JSON.stringify(customerAddress(addressData))).toEqual(JSON.stringify({}));
+            expect(JSON.stringify(customerAddress(addressData))).toEqual(JSON.stringify(expected));
         });
 
         it('Check on function call with empty address data.', function () {
@@ -49,7 +52,8 @@ define([
                     }
                 }),
                 expected = {
-                    regionId: '1'
+                    regionId: '1',
+                    customAttributes: []
                 };
 
             expect(JSON.stringify(result)).toEqual(JSON.stringify(expected));
diff --git a/lib/web/mage/sticky.js b/lib/web/mage/sticky.js
index 5bb180e9cb610..78ff63168b9ba 100644
--- a/lib/web/mage/sticky.js
+++ b/lib/web/mage/sticky.js
@@ -69,8 +69,8 @@ define([
 
             this.reset();
 
-            // Application of the workaround for IE11
-            this.normalizeIE11scroll();
+            // Application of the workaround for IE11 and Edge
+            this.normalizeIE11AndEdgeScroll();
         },
 
         /**
@@ -139,14 +139,14 @@ define([
         },
 
         /**
-         * Workaround for IE11 that solves the IE known rendering issue
+         * Workaround for IE11 and Edge that solves the IE known rendering issue
          * that prevents sticky element from jumpy movement on scrolling the page.
          *
          * Alternatively, undesired jumpy movement can be eliminated by changing the setting in IE:
          * Settings > Internet options > Advanced tab > inside 'Browsing' item > set 'Use smooth scrolling' to False
          */
-        normalizeIE11scroll: function () {
-            if (navigator.userAgent.match(/Trident.*rv[ :]*11\./)) {
+        normalizeIE11AndEdgeScroll: function () {
+            if (navigator.userAgent.match(/Trident.*rv[ :]*11\.|Edge\//)) {
                 document.body.addEventListener('mousewheel', function () {
                     event.preventDefault();
                     window.scrollTo(0, window.pageYOffset - event.wheelDelta);