diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef841ec0337f2..078b93bd7199c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1977,7 +1977,7 @@ Tests:
     * [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
     * [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
     * [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
-    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
+    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to break the tabs functionality
 * Service Contracts:
     * Refactored usage of new API of the Customer module
     * Implemented Service Contracts for the Sales module
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
index d654504a41e5c..0448daaf17644 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -23,7 +23,7 @@
     {
         "[data-role=system_messages_list]": {
             "Magento_AdminNotification/js/system/messages/popup": {
-                class: 'modal-system-messages ui-popup-message'
+                "class":"modal-system-messages ui-popup-message"
             }
         }
     }
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js b/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js
index f3f6a5fb1a123..39c61d6e07d29 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js
+++ b/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js
@@ -1,24 +1,26 @@
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
-*/
+ */
 
 define([
     'jquery',
     'Magento_Ui/js/modal/modal'
-], function ($) {
+], function ($, modal) {
     'use strict';
 
     return function (data, element) {
-        if (this.modal) {
-            this.modal.html($(element).html());
+
+        if (modal.modal) {
+            modal.modal.html($(element).html());
         } else {
-            this.modal = $(element).modal({
+            modal.modal = $(element).modal({
                 modalClass: data.class,
                 type: 'popup',
                 buttons: []
             });
         }
-        this.modal.modal('openModal');
+
+        modal.modal.modal('openModal');
     };
 });
diff --git a/app/code/Magento/Analytics/ReportXml/ReportProvider.php b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
index 60e722930c244..8966d018dc6b9 100644
--- a/app/code/Magento/Analytics/ReportXml/ReportProvider.php
+++ b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
@@ -55,7 +55,7 @@ public function __construct(
     private function getIteratorName(Query $query)
     {
         $config = $query->getConfig();
-        return isset($config['iterator']) ? $config['iterator'] : null;
+        return $config['iterator'] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php
index 3f658ee90bf4e..fb2daa283f111 100644
--- a/app/code/Magento/Backend/App/AbstractAction.php
+++ b/app/code/Magento/Backend/App/AbstractAction.php
@@ -205,10 +205,6 @@ private function _moveBlockToContainer(\Magento\Framework\View\Element\AbstractB
      */
     public function dispatch(\Magento\Framework\App\RequestInterface $request)
     {
-        if (!$this->_processUrlKeys()) {
-            return parent::dispatch($request);
-        }
-
         if ($request->isDispatched() && $request->getActionName() !== 'denied' && !$this->_isAllowed()) {
             $this->_response->setStatusHeader(403, '1.1', 'Forbidden');
             if (!$this->_auth->isLoggedIn()) {
@@ -252,6 +248,9 @@ protected function _isUrlChecked()
      * Check url keys. If non valid - redirect
      *
      * @return bool
+     *
+     * @see \Magento\Backend\App\Request\BackendValidator for default
+     * request validation.
      */
     public function _processUrlKeys()
     {
diff --git a/app/code/Magento/Backend/App/DefaultPath.php b/app/code/Magento/Backend/App/DefaultPath.php
index df8b718389741..b790a2edc3fab 100644
--- a/app/code/Magento/Backend/App/DefaultPath.php
+++ b/app/code/Magento/Backend/App/DefaultPath.php
@@ -42,6 +42,6 @@ public function __construct(\Magento\Backend\App\ConfigInterface $config)
      */
     public function getPart($code)
     {
-        return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
+        return $this->_parts[$code] ?? null;
     }
 }
diff --git a/app/code/Magento/Backend/App/Request/BackendValidator.php b/app/code/Magento/Backend/App/Request/BackendValidator.php
new file mode 100644
index 0000000000000..878f9cb4dc4c1
--- /dev/null
+++ b/app/code/Magento/Backend/App/Request/BackendValidator.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Backend\App\Request;
+
+use Magento\Backend\App\AbstractAction;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\Request\ValidatorInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Backend\Model\Auth;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\Controller\Result\Raw as RawResult;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
+use Magento\Backend\Model\UrlInterface as BackendUrl;
+use Magento\Framework\Phrase;
+
+/**
+ * Do backend validations.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BackendValidator implements ValidatorInterface
+{
+    /**
+     * @var Auth
+     */
+    private $auth;
+
+    /**
+     * @var FormKeyValidator
+     */
+    private $formKeyValidator;
+
+    /**
+     * @var BackendUrl
+     */
+    private $backendUrl;
+
+    /**
+     * @var RedirectFactory
+     */
+    private $redirectFactory;
+
+    /**
+     * @var RawFactory
+     */
+    private $rawResultFactory;
+
+    /**
+     * @param Auth $auth
+     * @param FormKeyValidator $formKeyValidator
+     * @param BackendUrl $backendUrl
+     * @param RedirectFactory $redirectFactory
+     * @param RawFactory $rawResultFactory
+     */
+    public function __construct(
+        Auth $auth,
+        FormKeyValidator $formKeyValidator,
+        BackendUrl $backendUrl,
+        RedirectFactory $redirectFactory,
+        RawFactory $rawResultFactory
+    ) {
+        $this->auth = $auth;
+        $this->formKeyValidator = $formKeyValidator;
+        $this->backendUrl = $backendUrl;
+        $this->redirectFactory = $redirectFactory;
+        $this->rawResultFactory = $rawResultFactory;
+    }
+
+    /**
+     * @param RequestInterface $request
+     * @param ActionInterface $action
+     *
+     * @return bool
+     */
+    private function validateRequest(
+        RequestInterface $request,
+        ActionInterface $action
+    ): bool {
+        /** @var bool|null $valid */
+        $valid = null;
+
+        if ($action instanceof CsrfAwareActionInterface) {
+            $valid = $action->validateForCsrf($request);
+        }
+
+        if ($valid === null) {
+            $validFormKey = true;
+            $validSecretKey = true;
+            if ($request instanceof HttpRequest && $request->isPost()) {
+                $validFormKey = $this->formKeyValidator->validate($request);
+            } elseif ($this->auth->isLoggedIn()
+                && $this->backendUrl->useSecretKey()
+            ) {
+                $secretKeyValue = (string)$request->getParam(
+                    BackendUrl::SECRET_KEY_PARAM_NAME,
+                    null
+                );
+                $secretKey = $this->backendUrl->getSecretKey();
+                $validSecretKey = ($secretKeyValue === $secretKey);
+            }
+            $valid = $validFormKey && $validSecretKey;
+        }
+
+        return $valid;
+    }
+
+    /**
+     * @param RequestInterface $request
+     * @param ActionInterface $action
+     *
+     * @return InvalidRequestException
+     */
+    private function createException(
+        RequestInterface $request,
+        ActionInterface $action
+    ): InvalidRequestException {
+        /** @var InvalidRequestException|null $exception */
+        $exception = null;
+
+        if ($action instanceof CsrfAwareActionInterface) {
+            $exception = $action->createCsrfValidationException($request);
+        }
+
+        if ($exception === null) {
+            if ($request instanceof HttpRequest && $request->isAjax()) {
+                //Sending empty response for AJAX request since we don't know
+                //the expected response format and it's pointless to redirect.
+                /** @var RawResult $response */
+                $response = $this->rawResultFactory->create();
+                $response->setHttpResponseCode(401);
+                $response->setContents('');
+                $exception = new InvalidRequestException($response);
+            } else {
+                //For regular requests.
+                $response = $this->redirectFactory->create()
+                    ->setUrl($this->backendUrl->getStartupPageUrl());
+                $exception = new InvalidRequestException(
+                    $response,
+                    [
+                        new Phrase(
+                            'Invalid security or form key. Please refresh the page.'
+                        )
+                    ]
+                );
+            }
+        }
+
+        return $exception;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(
+        RequestInterface $request,
+        ActionInterface $action
+    ): void {
+        if ($action instanceof AbstractAction) {
+            //Abstract Action has build-in validation.
+            if (!$action->_processUrlKeys()) {
+                throw new InvalidRequestException($action->getResponse());
+            }
+        } else {
+            //Fallback validation.
+            if (!$this->validateRequest($request, $action)) {
+                throw $this->createException($request, $action);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Backend/Model/Menu/Builder.php b/app/code/Magento/Backend/Model/Menu/Builder.php
index ae572deab53d9..1c6e900bc5cfc 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder.php
@@ -102,6 +102,6 @@ public function getResult(\Magento\Backend\Model\Menu $menu)
      */
     protected function _getParam($params, $paramName, $defaultValue = null)
     {
-        return isset($params[$paramName]) ? $params[$paramName] : $defaultValue;
+        return $params[$paramName] ?? $defaultValue;
     }
 }
diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml
index e08d4ac202756..d8e9674d2b4cb 100644
--- a/app/code/Magento/Backend/etc/adminhtml/di.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/di.xml
@@ -14,6 +14,8 @@
     <preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Backend\App\DefaultPath" />
     <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
     <preference for="Magento\Framework\App\Response\Http\FileFactory" type="Magento\Backend\App\Response\Http\FileFactory" />
+    <preference for="Magento\Framework\App\Request\ValidatorInterface"
+                type="Magento\Backend\App\Request\BackendValidator" />
     <type name="Magento\Framework\Stdlib\DateTime\Timezone">
         <arguments>
             <argument name="scopeType" xsi:type="const">Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT</argument>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
index 8feccc9cf1b8f..f952001f5e2ff 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -17,7 +17,7 @@
             <?= /* @escapeNotVerified */ $edition ?>
             class="logo">
             <img class="logo-img" src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($logoSrc) ?>"
-            alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
+            alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>" title="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
         </a>
     <?php break; ?>
     <?php case 'user': ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
index 4f8d9a56a38a3..e11c0efc123ff 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
@@ -34,7 +34,7 @@
         <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type): ?>
             <td class="gallery" align="center" style="vertical-align:bottom;">
             <a href="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>" target="_blank" onclick="imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>');return false;">
-            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
+            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" title="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
             <input type="file" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_<?= /* @escapeNotVerified */ $type ?>[<?= /* @escapeNotVerified */ $image->getValueId() ?>]" size="1"></td>
         <?php endforeach; ?>
         <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[position][<?= /* @escapeNotVerified */ $image->getValueId() ?>]" value="<?= /* @escapeNotVerified */ $image->getPosition() ?>" id="<?= $block->getElement()->getHtmlId() ?>_position_<?= /* @escapeNotVerified */ $image->getValueId() ?>" size="3"/></td>
diff --git a/app/code/Magento/Backup/Helper/Data.php b/app/code/Magento/Backup/Helper/Data.php
index 3d60bf9d9c9cf..b0bc292ffe926 100644
--- a/app/code/Magento/Backup/Helper/Data.php
+++ b/app/code/Magento/Backup/Helper/Data.php
@@ -110,7 +110,7 @@ public function getBackupsDir()
     public function getExtensionByType($type)
     {
         $extensions = $this->getExtensions();
-        return isset($extensions[$type]) ? $extensions[$type] : '';
+        return $extensions[$type] ?? '';
     }
 
     /**
diff --git a/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php
index a0704002842ea..d08bf62da8e4f 100644
--- a/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -12,7 +12,7 @@
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Convert data fro php native serialized data to JSON.
+ * Convert data from php native serialized data to JSON.
  */
 class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
index f5c8c15c8f3ba..e47024b7d2330 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
@@ -12,7 +12,7 @@
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
         <label class="label" data-bind="attr: {'for': getCode()}">
             <!-- PayPal Logo -->
-            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}"
+            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}, title: $t('Acceptance Mark')}"
                  class="payment-icon"/>
             <!-- PayPal Logo -->
             <span text="getTitle()"></span>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
index 1cc0ce147ae0e..28fca883350e1 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
@@ -10,10 +10,10 @@
           xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ApiBundleLink" type="bundle_link">
         <var key="sku" entityKey="sku" entityType="product2"/>
-        <var key="option_id" entityKey="option_id" entityType="bundle_options"/>
+        <var key="option_id" entityKey="return" entityType="bundle_option"/>
         <var key="sku" entityKey="sku" entityType="product"/>
         <data key="qty">1</data>
-        <data key="is_default">1</data>
+        <data key="is_default">0</data>
         <data key="price">1.11</data>
         <data key="price_type">1</data>
         <data key="can_change_quantity">1</data>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
index 80d9307255e59..e10fe4e33c208 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
@@ -8,13 +8,34 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="DropdownBundleOption" type="bundle_option">
+    <entity name="DropDownBundleOption" type="bundle_option">
         <data key="title" unique="suffix">bundle-option-dropdown</data>
         <data key="required">true</data>
-        <data key="type">dropdown</data>
+        <data key="type">select</data>
+        <data key="position">0</data>
+        <var key="sku" entityKey="sku" entityType="product2"/>
+    </entity>
+    <entity name="RadioButtonsOption" type="bundle_option">
+        <data key="title" unique="suffix">bundle-option-radio</data>
+        <data key="required">true</data>
+        <data key="type">radio</data>
         <data key="position">1</data>
         <var key="sku" entityKey="sku" entityType="product2"/>
     </entity>
+    <entity name="CheckboxOption" type="bundle_option">
+        <data key="title" unique="suffix">bundle-option-checkbox</data>
+        <data key="required">true</data>
+        <data key="type">checkbox</data>
+        <data key="position">3</data>
+        <var key="sku" entityKey="sku" entityType="product2"/>
+    </entity>
+    <entity name="MultipleSelectOption" type="bundle_option">
+        <data key="title" unique="suffix">bundle-option-multipleselect</data>
+        <data key="required">true</data>
+        <data key="type">multi</data>
+        <data key="position">4</data>
+        <var key="sku" entityKey="sku" entityType="product2"/>
+    </entity>
     <entity name="AllBundleOptions" type="bundle_options">
         <var key="sku" entityKey="sku" entityType="product"/>
     </entity>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
index 65ac763460151..380b5b8959025 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
@@ -19,4 +19,8 @@
         <data key="attribute_code">price_view</data>
         <data key="value">1</data>
     </entity>
+    <entity name="CustomAttributePriceViewRange" type="custom_attribute">
+        <data key="attribute_code">price_view</data>
+        <data key="value">0</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
index 80ffe13ff3fe4..9c48b904bb7fd 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
@@ -45,4 +45,19 @@
         <requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
     </entity>
+    <entity name="ApiBundleProductPriceViewRange" type="product2">
+        <data key="name" unique="suffix">Api Bundle Product</data>
+        <data key="sku" unique="suffix">api-bundle-product</data>
+        <data key="type_id">bundle</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">api-bundle-product</data>
+        <requiredEntity type="custom_attribute">CustomAttributeCategoryIds</requiredEntity>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributePriceViewRange</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
index 435cf59c6cbfd..ca39253aa54a0 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
@@ -8,7 +8,7 @@
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateBundleLink" dataType="bundle_link" type="create" auth="adminOauth" url="/V1/bundle-products/{sku}/links/{option_id}" method="POST">
+    <operation name="CreateBundleLink" dataType="bundle_link" type="create" auth="adminOauth" url="/V1/bundle-products/{sku}/links/{return}" method="POST">
         <contentType>application/json</contentType>
         <object dataType="bundle_link" key="linkedProduct">
             <field key="sku">string</field>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml
new file mode 100644
index 0000000000000..c76f822a0913f
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryProductSection">
+        <element name="priceToByProductId" type="text" selector="div[data-product-id='{{id}}'] .price-to" parameterized="true"/>
+        <element name="priceFromByProductId" type="text" selector="div[data-product-id='{{id}}'] .price-from" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..41c00b5eda184
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="priceFrom" type="text" selector=".product-info-price .price-from"/>
+        <element name="priceTo" type="text" selector=".product-info-price .price-to"/>
+        <element name="minPrice" type="text" selector="span[data-price-type='minPrice']"/>
+        <element name="maxPrice" type="text" selector="span[data-price-type='minPrice']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
new file mode 100644
index 0000000000000..1b1a46d1c8ba4
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest">
+        <annotations>
+            <features value="Bundle"/>
+            <title value="Verify dynamic bundle product prices for combination of options"/>
+            <description value="Verify prices for various configurations of Dynamic Bundle product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-43619"/>
+            <group value="bundle"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
+
+            <!--Create 5 simple product-->
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+                <field key="price">4.99</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+                <field key="price">2.89</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct3">
+                <field key="price">7.33</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct4">
+                <field key="price">18.25</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct5">
+                <field key="price">10.00</field>
+            </createData>
+
+            <!--Add special price to simple product-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct5.id$$)}}" stepKey="openAdminEditPage"/>
+            <actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="addSpecialPrice"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
+
+            <!--Create Bundle product-->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct">
+                <requiredEntity createDataKey="createSubCategory"/>
+            </createData>
+            <createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <field key="required">false</field>
+            </createData>
+            <createData entity="CheckboxOption" stepKey="createBundleOption1_2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct3">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_2"/>
+                <requiredEntity createDataKey="simpleProduct3"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct4">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_2"/>
+                <requiredEntity createDataKey="simpleProduct4"/>
+            </createData>
+
+            <!--Create Bundle product 2-->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct2">
+                <requiredEntity createDataKey="createSubCategory"/>
+            </createData>
+            <createData entity="DropDownBundleOption" stepKey="createBundleOption2_1">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+            </createData>
+            <createData entity="RadioButtonsOption" stepKey="createBundleOption2_2">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct5">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+                <requiredEntity createDataKey="createBundleOption2_1"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+                <field key="qty">2</field>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct6">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+                <requiredEntity createDataKey="createBundleOption2_1"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct7">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+                <requiredEntity createDataKey="createBundleOption2_2"/>
+                <requiredEntity createDataKey="simpleProduct3"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct8">
+                <requiredEntity createDataKey="createBundleProduct2"/>
+                <requiredEntity createDataKey="createBundleOption2_2"/>
+                <requiredEntity createDataKey="simpleProduct4"/>
+                <field key="qty">5</field>
+            </createData>
+
+            <!--Create Bundle product 3-->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct3">
+                <requiredEntity createDataKey="createSubCategory"/>
+            </createData>
+            <createData entity="MultipleSelectOption" stepKey="createBundleOption3_1">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+            </createData>
+            <createData entity="DropDownBundleOption" stepKey="createBundleOption3_2">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+                <field key="required">false</field>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct9">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+                <requiredEntity createDataKey="createBundleOption3_1"/>
+                <requiredEntity createDataKey="simpleProduct4"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct10">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+                <requiredEntity createDataKey="createBundleOption3_1"/>
+                <requiredEntity createDataKey="simpleProduct5"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct11">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+                <requiredEntity createDataKey="createBundleOption3_2"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct12">
+                <requiredEntity createDataKey="createBundleProduct3"/>
+                <requiredEntity createDataKey="createBundleOption3_2"/>
+                <requiredEntity createDataKey="simpleProduct3"/>
+            </createData>
+
+            <!-- navigate to the tax configuration page -->
+            <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToAdminTaxPage"/>
+            <waitForPageLoad stepKey="waitForTaxConfigLoad"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationSettings}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationSettingsOpened}}" visible="false" stepKey="openCalculationSettingsTab"/>
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationAlgorithmInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationAlgorithmDisabled}}" visible="true" stepKey="clickCalculationMethodBasedCheckBox"/>
+            <selectOption userInput="Total" selector="{{AdminConfigureTaxSection.taxCalculationAlgorithm}}" stepKey="fillCalculationMethodBased"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationBasedInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationBasedDisabled}}" visible="true" stepKey="clickTaxCalculationBasedCheckBox"/>
+            <selectOption userInput="Shipping Origin" selector="{{AdminConfigureTaxSection.taxCalculationBased}}" stepKey="fillTaxCalculationBased"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationPricesDisabled}}" visible="true" stepKey="clickCalculationPricesCheckBox"/>
+            <selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxCalculationPrices}}" stepKey="clickCalculationPrices"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxPriceDisplaySettings}}" dependentSelector="{{AdminConfigureTaxSection.taxPriceDisplaySettingsOpened}}" visible="false" stepKey="openPriceDisplaySettings"/>
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxDisplayProductPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxDisplayProductPricesDisabled}}" visible="true" stepKey="clickDisplayProductPricesCheckBox"/>
+            <selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxDisplayProductPrices}}" stepKey="clickDisplayProductPrices"/>
+
+            <!-- Save the settings -->
+            <scrollToTopOfPage stepKey="scrollToTop"/>
+            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
+            <waitForPageLoad stepKey="waitForTaxSaved"/>
+            <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
+
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        </before>
+        <after>
+            <!-- navigate to the tax configuration page -->
+            <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToAdminTaxPage"/>
+            <waitForPageLoad stepKey="waitForTaxConfigLoad"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationSettings}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationSettingsOpened}}" visible="false" stepKey="openCalculationSettingsTab"/>
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationAlgorithmInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationAlgorithmDisabled}}" visible="true" stepKey="clickCalculationMethodBasedCheckBox"/>
+            <selectOption userInput="Total" selector="{{AdminConfigureTaxSection.taxCalculationAlgorithm}}" stepKey="fillCalculationMethodBased"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationBasedInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationBasedDisabled}}" visible="true" stepKey="clickTaxCalculationBasedCheckBox"/>
+            <selectOption userInput="Shipping Address" selector="{{AdminConfigureTaxSection.taxCalculationBased}}" stepKey="fillTaxCalculationBased"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationPricesDisabled}}" visible="true" stepKey="clickCalculationPricesCheckBox"/>
+            <selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxCalculationPrices}}" stepKey="clickCalculationPrices"/>
+
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxPriceDisplaySettings}}" dependentSelector="{{AdminConfigureTaxSection.taxPriceDisplaySettingsOpened}}" visible="false" stepKey="openPriceDisplaySettings"/>
+            <conditionalClick selector="{{AdminConfigureTaxSection.taxDisplayProductPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxDisplayProductPricesDisabled}}" visible="true" stepKey="clickDisplayProductPricesCheckBox"/>
+            <selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxDisplayProductPrices}}" stepKey="clickDisplayProductPrices"/>
+
+            <!-- Save the settings -->
+            <scrollToTopOfPage stepKey="scrollToTop"/>
+            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
+            <waitForPageLoad stepKey="waitForTaxSaved"/>
+            <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+            <deleteData createDataKey="createSubCategory" stepKey="deleteSubCategory1"/>
+
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
+            <deleteData createDataKey="simpleProduct5" stepKey="deleteSimpleProduct5"/>
+
+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
+            <deleteData createDataKey="createBundleProduct2" stepKey="deleteBundleProduct2"/>
+            <deleteData createDataKey="createBundleProduct3" stepKey="deleteBundleProduct3"/>
+        </after>
+
+        <!-- Go to storefront category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createSubCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+
+        <see userInput="From $7.33" selector="{{StorefrontCategoryProductSection.priceFromByProductId($$createBundleProduct.id$$)}}" stepKey="seePriceFromInCategoryBundle1"/>
+        <see userInput="To $33.46" selector="{{StorefrontCategoryProductSection.priceToByProductId($$createBundleProduct.id$$)}}" stepKey="seePriceToInCategoryBundle1"/>
+
+        <see userInput="From $10.22" selector="{{StorefrontCategoryProductSection.priceFromByProductId($$createBundleProduct2.id$$)}}" stepKey="seePriceFromInCategoryBundle2"/>
+        <see userInput="To $101.23" selector="{{StorefrontCategoryProductSection.priceToByProductId($$createBundleProduct2.id$$)}}" stepKey="seePriceToInCategoryBundle2"/>
+
+        <see userInput="From $8.00 Regular Price $10.00" selector="{{StorefrontCategoryProductSection.priceFromByProductId($$createBundleProduct3.id$$)}}" stepKey="seePriceFromInCategoryBundle3"/>
+        <see userInput="To $33.58 Regular Price $35.58" selector="{{StorefrontCategoryProductSection.priceToByProductId($$createBundleProduct3.id$$)}}" stepKey="seePriceToInCategoryBundle3"/>
+
+        <!-- Go to storefront product pages -->
+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProduct.custom_attributes[url_key]$$)}}" stepKey="onPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="From $7.33" selector="{{StorefrontProductInfoMainSection.priceFrom}}" stepKey="seePriceFromBundle1"/>
+        <see userInput="To $33.46" selector="{{StorefrontProductInfoMainSection.priceTo}}" stepKey="seePriceToBundle1"/>
+
+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProduct2.custom_attributes[url_key]$$)}}" stepKey="onPageBundle2"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <see userInput="From $10.22" selector="{{StorefrontProductInfoMainSection.priceFrom}}" stepKey="seePriceFromBundle2"/>
+        <see userInput="To $101.23" selector="{{StorefrontProductInfoMainSection.priceTo}}" stepKey="seePriceToBundle2"/>
+
+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProduct3.custom_attributes[url_key]$$)}}" stepKey="onPageBundle3"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <see userInput="From $8.00 Regular Price $10.00" selector="{{StorefrontProductInfoMainSection.priceFrom}}" stepKey="seePriceFromBundle3"/>
+        <see userInput="To $33.58 Regular Price $35.58" selector="{{StorefrontProductInfoMainSection.priceTo}}" stepKey="seePriceToBundle3"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
index d35619bb043a0..9f35251b3f926 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
@@ -121,7 +121,7 @@ protected function setupSelectionPrice($useRegularPrice = false)
     }
 
     /**
-     *  test fro method getValue with dynamic productType
+     *  Test for method getValue with dynamic productType
      *
      * @param bool $useRegularPrice
      * @dataProvider useRegularPriceDataProvider
diff --git a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
index e0c94097e4d3f..2cefc60a42976 100644
--- a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
@@ -322,7 +322,7 @@ function ($title, $storeName) {
      */
     protected function getTypeValue($type)
     {
-        return isset($this->typeMapping[$type]) ? $this->typeMapping[$type] : self::VALUE_DYNAMIC;
+        return $this->typeMapping[$type] ?? self::VALUE_DYNAMIC;
     }
 
     /**
@@ -333,7 +333,7 @@ protected function getTypeValue($type)
      */
     protected function getPriceViewValue($type)
     {
-        return isset($this->priceViewMapping[$type]) ? $this->priceViewMapping[$type] : self::VALUE_PRICE_RANGE;
+        return $this->priceViewMapping[$type] ?? self::VALUE_PRICE_RANGE;
     }
 
     /**
@@ -344,7 +344,7 @@ protected function getPriceViewValue($type)
      */
     protected function getPriceTypeValue($type)
     {
-        return isset($this->priceTypeMapping[$type]) ? $this->priceTypeMapping[$type] : null;
+        return $this->priceTypeMapping[$type] ?? null;
     }
 
     /**
@@ -355,7 +355,7 @@ protected function getPriceTypeValue($type)
      */
     private function getShipmentTypeValue($type)
     {
-        return isset($this->shipmentTypeMapping[$type]) ? $this->shipmentTypeMapping[$type] : null;
+        return $this->shipmentTypeMapping[$type] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php b/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
index 9b97225e60de9..39579616fa928 100644
--- a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
+++ b/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
@@ -18,6 +18,6 @@ public function resolve(\Magento\Framework\App\RequestInterface $request, $formI
     {
         $captchaParams = $request->getPost(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE);
 
-        return isset($captchaParams[$formId]) ? $captchaParams[$formId] : '';
+        return $captchaParams[$formId] ?? '';
     }
 }
diff --git a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
index 1e2f595a0087f..97c05249eb463 100644
--- a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
+++ b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
@@ -15,6 +15,7 @@
                 <div class="control captcha-image">
                     <img data-bind="attr: {
                                         alt: $t('Please type the letters and numbers below'),
+                                        title: $t('Please type the letters and numbers below'),
                                         height: imageHeight(),
                                         src: getImageSource(),
                                         }"
diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index ab01fc6d134e9..8de765afd80a4 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -205,7 +205,7 @@ public function getImageAttribute($imageId, $attributeName, $default = null)
     {
         $attributes =
             $this->getConfigView()->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
-        return isset($attributes[$attributeName]) ? $attributes[$attributeName] : $default;
+        return $attributes[$attributeName] ?? $default;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
index 8f570e35989cb..0a54475b15f9c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
@@ -44,12 +44,12 @@ public function execute()
                 $this->_eventManager->dispatch('catalog_controller_category_delete', ['category' => $category]);
                 $this->_auth->getAuthStorage()->setDeletedPath($category->getPath());
                 $this->categoryRepository->delete($category);
-                $this->messageManager->addSuccess(__('You deleted the category.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the category.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 return $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('Something went wrong while trying to delete the category.'));
+                $this->messageManager->addErrorMessage(__('Something went wrong while trying to delete the category.'));
                 return $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
             }
         }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
index 775097c5eba1d..ca7652ebb43b5 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -54,7 +54,7 @@ protected function _validateProducts()
         }
 
         if ($error) {
-            $this->messageManager->addError($error);
+            $this->messageManager->addErrorMessage($error);
         }
 
         return !$error;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 82496446aef9f..0fbf9054ef1bd 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -192,7 +192,7 @@ public function execute()
                 $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
             }
 
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 __('A total of %1 record(s) were updated.', count($this->attributeHelper->getProductIds()))
             );
 
@@ -205,9 +205,9 @@ public function execute()
                 $this->_productPriceIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException(
+            $this->messageManager->addExceptionMessage(
                 $e,
                 __('Something went wrong while updating the product(s) attributes.')
             );
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
index bb18436be6102..a873f08d082d7 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php
@@ -68,7 +68,7 @@ public function execute()
             $response->setError(true);
             $response->setMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException(
+            $this->messageManager->addExceptionMessage(
                 $e,
                 __('Something went wrong while updating the product(s) attributes.')
             );
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
index cc5a658a9296d..bef6aee0e2afd 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
@@ -21,23 +21,23 @@ public function execute()
             // entity type check
             $model->load($id);
             if ($model->getEntityTypeId() != $this->_entityTypeId) {
-                $this->messageManager->addError(__('We can\'t delete the attribute.'));
+                $this->messageManager->addErrorMessage(__('We can\'t delete the attribute.'));
                 return $resultRedirect->setPath('catalog/*/');
             }
 
             try {
                 $model->delete();
-                $this->messageManager->addSuccess(__('You deleted the product attribute.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the product attribute.'));
                 return $resultRedirect->setPath('catalog/*/');
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 return $resultRedirect->setPath(
                     'catalog/*/edit',
                     ['attribute_id' => $this->getRequest()->getParam('attribute_id')]
                 );
             }
         }
-        $this->messageManager->addError(__('We can\'t find an attribute to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find an attribute to delete.'));
         return $resultRedirect->setPath('catalog/*/');
     }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
index fd97aaa50389e..a99cbdbade181 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
@@ -25,14 +25,14 @@ public function execute()
             $model->load($id);
 
             if (!$model->getId()) {
-                $this->messageManager->addError(__('This attribute no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This attribute no longer exists.'));
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('catalog/*/');
             }
 
             // entity type check
             if ($model->getEntityTypeId() != $this->_entityTypeId) {
-                $this->messageManager->addError(__('This attribute cannot be edited.'));
+                $this->messageManager->addErrorMessage(__('This attribute cannot be edited.'));
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('catalog/*/');
             }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
index 7e8b03a66f603..63e52eead064c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
@@ -43,11 +43,11 @@ public function execute()
         $product = $this->productBuilder->build($this->getRequest());
         try {
             $newProduct = $this->productCopier->copy($product);
-            $this->messageManager->addSuccess(__('You duplicated the product.'));
+            $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
             $resultRedirect->setPath('catalog/*/edit', ['_current' => true, 'id' => $newProduct->getId()]);
         } catch (\Exception $e) {
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
         }
         return $resultRedirect;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
index 838bce7272250..1b9316a95ad59 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
@@ -52,12 +52,12 @@ public function execute()
         if (($productId && !$product->getEntityId())) {
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
-            $this->messageManager->addError(__('This product doesn\'t exist.'));
+            $this->messageManager->addErrorMessage(__('This product doesn\'t exist.'));
             return $resultRedirect->setPath('catalog/*/');
         } elseif ($productId === 0) {
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
-            $this->messageManager->addError(__('Invalid product id. Should be numeric value greater than 0'));
+            $this->messageManager->addErrorMessage(__('Invalid product id. Should be numeric value greater than 0'));
             return $resultRedirect->setPath('catalog/*/');
         }
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php
index 4909e22775e55..8a5f375f2b706 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php
@@ -29,12 +29,12 @@ public function execute()
         );
 
         if ($model->itemExists()) {
-            $this->messageManager->addError(__('A group with the same name already exists.'));
+            $this->messageManager->addErrorMessage(__('A group with the same name already exists.'));
         } else {
             try {
                 $model->save();
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('Something went wrong while saving this group.'));
+                $this->messageManager->addErrorMessage(__('Something went wrong while saving this group.'));
             }
         }
     }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
index b49a4dabe223c..f2695311732f0 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
@@ -36,10 +36,10 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
         try {
             $this->attributeSetRepository->deleteById($setId);
-            $this->messageManager->addSuccess(__('The attribute set has been removed.'));
+            $this->messageManager->addSuccessMessage(__('The attribute set has been removed.'));
             $resultRedirect->setPath('catalog/*/');
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t delete this set right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t delete this set right now.'));
             $resultRedirect->setUrl($this->_redirect->getRedirectUrl($this->getUrl('*')));
         }
         return $resultRedirect;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
index dfddcf7e92b97..c5dd9ce6d8e77 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
@@ -127,15 +127,15 @@ public function execute()
                 $model->initFromSkeleton($this->getRequest()->getParam('skeleton_set'));
             }
             $model->save();
-            $this->messageManager->addSuccess(__('You saved the attribute set.'));
+            $this->messageManager->addSuccessMessage(__('You saved the attribute set.'));
         } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
             $hasError = true;
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $hasError = true;
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Something went wrong while saving the attribute set.'));
+            $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the attribute set.'));
             $hasError = true;
         }
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
index 63f46fd32e6f7..e131bfe38c546 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
@@ -137,7 +137,7 @@ public function execute()
             $response->setError(true);
             $response->setMessages([$e->getMessage()]);
         } catch (\Exception $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $layout = $this->layoutFactory->create();
             $layout->initMessages();
             $response->setError(true);
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
index 30470d13f002d..568fbf1d05677 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
@@ -30,12 +30,12 @@ public function execute()
 
         try {
             $items->clear();
-            $this->messageManager->addSuccess(__('You cleared the comparison list.'));
+            $this->messageManager->addSuccessMessage(__('You cleared the comparison list.'));
             $this->_objectManager->get(\Magento\Catalog\Helper\Product\Compare::class)->calculate();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Something went wrong  clearing the comparison list.'));
+            $this->messageManager->addExceptionMessage($e, __('Something went wrong  clearing the comparison list.'));
         }
 
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
index fadb94761a236..2acbe5ce4d582 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
@@ -44,7 +44,7 @@ public function execute()
                     $item->delete();
                     $productName = $this->_objectManager->get(\Magento\Framework\Escaper::class)
                         ->escapeHtml($product->getName());
-                    $this->messageManager->addSuccess(
+                    $this->messageManager->addSuccessMessage(
                         __('You removed product %1 from the comparison list.', $productName)
                     );
                     $this->_eventManager->dispatch(
diff --git a/app/code/Magento/Catalog/Controller/Product/View.php b/app/code/Magento/Catalog/Controller/Product/View.php
index 4c577eb897589..ed437361fddd3 100644
--- a/app/code/Magento/Catalog/Controller/Product/View.php
+++ b/app/code/Magento/Catalog/Controller/Product/View.php
@@ -78,13 +78,16 @@ public function execute()
 
         if ($this->getRequest()->isPost() && $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED)) {
             $product = $this->_initProduct();
+            
             if (!$product) {
                 return $this->noProductRedirect();
             }
+            
             if ($specifyOptions) {
                 $notice = $product->getTypeInstance()->getSpecifyOptionMessage();
-                $this->messageManager->addNotice($notice);
+                $this->messageManager->addNoticeMessage($notice);
             }
+            
             if ($this->getRequest()->isAjax()) {
                 $this->getResponse()->representJson(
                     $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
diff --git a/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php b/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php
index 6e7699abb4776..99e9898eab3c0 100644
--- a/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php
+++ b/app/code/Magento/Catalog/Cron/FrontendActionsFlush.php
@@ -57,8 +57,7 @@ private function getLifeTimeByNamespace($namespace)
             ];
         }
 
-        return isset($configuration['lifetime']) ?
-            (int) $configuration['lifetime'] : FrontendStorageConfigurationInterface::DEFAULT_LIFETIME;
+        return (int)$configuration['lifetime'] ?? FrontendStorageConfigurationInterface::DEFAULT_LIFETIME;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index 9eebcdb2df34f..ae20cda460796 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -32,6 +32,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     const CONFIG_USE_STATIC_URLS = 'cms/wysiwyg/use_static_urls_in_catalog';
 
+    /**
+     * @deprecated
+     * @see \Magento\Catalog\Helper\Output::isDirectivesExists
+     */
     const CONFIG_PARSE_URL_DIRECTIVES = 'catalog/frontend/parse_url_directives';
 
     const XML_PATH_DISPLAY_PRODUCT_COUNT = 'catalog/layered_navigation/display_product_count';
@@ -443,6 +447,8 @@ public function isUsingStaticUrlsAllowed()
      * Check if the parsing of URL directives is allowed for the catalog
      *
      * @return bool
+     * @deprecated
+     * @see \Magento\Catalog\Helper\Output::isDirectivesExists
      */
     public function isUrlDirectivesParsingAllowed()
     {
@@ -457,6 +463,7 @@ public function isUrlDirectivesParsingAllowed()
      * Retrieve template processor for catalog content
      *
      * @return \Magento\Framework\Filter\Template
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getPageTemplateProcessor()
     {
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 4f128d639b2bb..758e59790d241 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -859,7 +859,7 @@ public function getFrame()
      */
     protected function getAttribute($name)
     {
-        return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
+        return $this->attributes[$name] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Helper/Output.php b/app/code/Magento/Catalog/Helper/Output.php
index facd5351f269a..33e261dc353b4 100644
--- a/app/code/Magento/Catalog/Helper/Output.php
+++ b/app/code/Magento/Catalog/Helper/Output.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Helper;
 
 use Magento\Catalog\Model\Category as ModelCategory;
@@ -45,20 +47,29 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_escaper;
 
     /**
+     * @var array
+     */
+    private $directivePatterns;
+
+    /**
+     * Output constructor.
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param Data $catalogData
      * @param \Magento\Framework\Escaper $escaper
+     * @param array $directivePatterns
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Eav\Model\Config $eavConfig,
         Data $catalogData,
-        \Magento\Framework\Escaper $escaper
+        \Magento\Framework\Escaper $escaper,
+        $directivePatterns = []
     ) {
         $this->_eavConfig = $eavConfig;
         $this->_catalogData = $catalogData;
         $this->_escaper = $escaper;
+        $this->directivePatterns = $directivePatterns;
         parent::__construct($context);
     }
 
@@ -105,7 +116,7 @@ public function addHandler($method, $handler)
     public function getHandlers($method)
     {
         $method = strtolower($method);
-        return isset($this->_handlers[$method]) ? $this->_handlers[$method] : [];
+        return $this->_handlers[$method] ?? [];
     }
 
     /**
@@ -134,6 +145,7 @@ public function process($method, $result, $params)
      * @param string $attributeName
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function productAttribute($product, $attributeHtml, $attributeName)
     {
@@ -151,10 +163,12 @@ public function productAttribute($product, $attributeHtml, $attributeName)
                 $attributeHtml = nl2br($attributeHtml);
             }
         }
-        if ($attribute->getIsHtmlAllowedOnFront() && $attribute->getIsWysiwygEnabled()) {
-            if ($this->_catalogData->isUrlDirectivesParsingAllowed()) {
-                $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
-            }
+        if ($attributeHtml !== null
+            && $attribute->getIsHtmlAllowedOnFront()
+            && $attribute->getIsWysiwygEnabled()
+            && $this->isDirectivesExists($attributeHtml)
+        ) {
+            $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
         }
 
         $attributeHtml = $this->process(
@@ -173,6 +187,7 @@ public function productAttribute($product, $attributeHtml, $attributeName)
      * @param string $attributeHtml
      * @param string $attributeName
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function categoryAttribute($category, $attributeHtml, $attributeName)
     {
@@ -185,10 +200,13 @@ public function categoryAttribute($category, $attributeHtml, $attributeName)
         ) {
             $attributeHtml = $this->_escaper->escapeHtml($attributeHtml);
         }
-        if ($attribute->getIsHtmlAllowedOnFront() && $attribute->getIsWysiwygEnabled()) {
-            if ($this->_catalogData->isUrlDirectivesParsingAllowed()) {
-                $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
-            }
+        if ($attributeHtml !== null
+            && $attribute->getIsHtmlAllowedOnFront()
+            && $attribute->getIsWysiwygEnabled()
+            && $this->isDirectivesExists($attributeHtml)
+
+        ) {
+            $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
         }
         $attributeHtml = $this->process(
             'categoryAttribute',
@@ -197,4 +215,22 @@ public function categoryAttribute($category, $attributeHtml, $attributeName)
         );
         return $attributeHtml;
     }
+
+    /**
+     * Check if string has directives
+     *
+     * @param string $attributeHtml
+     * @return bool
+     */
+    public function isDirectivesExists($attributeHtml)
+    {
+        $matches = false;
+        foreach ($this->directivePatterns as $pattern) {
+            if (preg_match($pattern, $attributeHtml)) {
+                $matches = true;
+                break;
+            }
+        }
+        return $matches;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php
index d072acf4c719c..71b9a9c470374 100644
--- a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php
+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/NativeAttributeCondition.php
@@ -77,7 +77,7 @@ private function mapConditionType(string $conditionType, string $field): string
             ];
         }
 
-        return isset($conditionsMap[$conditionType]) ? $conditionsMap[$conditionType] : $conditionType;
+        return $conditionsMap[$conditionType] ?? $conditionType;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php
index f8cf810ffb570..8de708dd467c8 100644
--- a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php
+++ b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php
@@ -21,8 +21,13 @@ class ProductCategoryFilter implements CustomFilterInterface
      */
     public function apply(Filter $filter, AbstractDb $collection)
     {
-        $conditionType = $filter->getConditionType() ?: 'eq';
-        $categoryFilter = [$conditionType => [$filter->getValue()]];
+        $value = $filter->getValue();
+        $conditionType = $filter->getConditionType() ?: 'in';
+        $filterValue = [$value];
+        if (($conditionType === 'in' || $conditionType === 'nin') && is_string($value)) {
+            $filterValue = explode(',', $value);
+        }
+        $categoryFilter = [$conditionType => $filterValue];
 
         /** @var Collection $collection */
         $collection->addCategoriesFilter($categoryFilter);
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index d2ffd6f440041..5dce940308a4f 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -381,7 +381,7 @@ public function getProductTypeName($id)
 
         $this->loadProductTypes();
 
-        return isset($this->_productTypesById[$id]) ? $this->_productTypesById[$id] : false;
+        return $this->_productTypesById[$id] ?? false;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
index 09dbed350c5e4..f8121b55dbf99 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -8,6 +8,7 @@
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
 use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Indexer\Model\ProcessManager;
 
 /**
  * Class Full reindex action
@@ -44,6 +45,11 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var ProcessManager
+     */
+    private $processManager;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -52,9 +58,10 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      * @param \Magento\Framework\Indexer\BatchSizeManagementInterface|null $batchSizeManagement
      * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
      * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
-     * @param \Magento\Indexer\Model\Indexer\StateFactory|null $stateFactory
      * @param int|null $batchRowsCount
      * @param ActiveTableSwitcher|null $activeTableSwitcher
+     * @param ProcessManager $processManager
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -65,7 +72,8 @@ public function __construct(
         \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
         $batchRowsCount = null,
-        ActiveTableSwitcher $activeTableSwitcher = null
+        ActiveTableSwitcher $activeTableSwitcher = null,
+        ProcessManager $processManager = null
     ) {
         parent::__construct(
             $resource,
@@ -85,6 +93,7 @@ public function __construct(
         );
         $this->batchRowsCount = $batchRowsCount;
         $this->activeTableSwitcher = $activeTableSwitcher ?: $objectManager->get(ActiveTableSwitcher::class);
+        $this->processManager = $processManager ?: $objectManager->get(ProcessManager::class);
     }
 
     /**
@@ -133,6 +142,38 @@ public function execute()
         return $this;
     }
 
+    /**
+     * Run reindexation
+     *
+     * @return void
+     */
+    protected function reindex()
+    {
+        $userFunctions = [];
+
+        foreach ($this->storeManager->getStores() as $store) {
+            if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
+                $userFunctions[$store->getId()] = function () use ($store) {
+                    return $this->reindexStore($store);
+                };
+            }
+        }
+
+        $this->processManager->execute($userFunctions);
+    }
+
+    /**
+     * Execute indexation by store
+     *
+     * @param \Magento\Store\Model\Store $store
+     */
+    private function reindexStore($store)
+    {
+        $this->reindexRootCategory($store);
+        $this->reindexAnchorCategories($store);
+        $this->reindexNonAnchorCategories($store);
+    }
+
     /**
      * Publish data from tmp to replica table
      *
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php
index 1278434fcad43..105a6dbf30456 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php
@@ -139,7 +139,7 @@ public function getMainTable(int $storeId)
     public function createTablesForStore(int $storeId)
     {
         $mainTableName = $this->getMainTable($storeId);
-        //Create index table for store based on on main replica table
+        //Create index table for store based on main replica table
         //Using main replica table is necessary for backward capability and TableResolver plugin work
         $this->createTable(
             $this->getTable(AbstractAction::MAIN_INDEX_TABLE . $this->additionalTableSuffix),
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
index a4db630f0234b..d21a8666ec0ac 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
@@ -241,7 +241,7 @@ protected function _createItem($label, $value, $count = 0)
     }
 
     /**
-     * Get all product ids from from collection with applied filters
+     * Get all product ids from collection with applied filters
      *
      * @return array
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php
new file mode 100644
index 0000000000000..68d0877c6cd66
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * {@inheritdoc}
+ */
+class ItemResolverComposite implements ItemResolverInterface
+{
+    /** @var string[] */
+    private $itemResolvers = [];
+
+    /** @var ItemResolverInterface[] */
+    private $itemResolversInstances = [];
+
+    /**
+     * @param string[] $itemResolvers
+     */
+    public function __construct(array $itemResolvers)
+    {
+        $this->itemResolvers = $itemResolvers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFinalProduct(ItemInterface $item) : ProductInterface
+    {
+        $finalProduct = $item->getProduct();
+        foreach ($this->itemResolvers as $resolver) {
+            $resolvedProduct = $this->getItemResolverInstance($resolver)->getFinalProduct($item);
+            if ($resolvedProduct !== $finalProduct) {
+                $finalProduct = $resolvedProduct;
+                break;
+            }
+        }
+        return $finalProduct;
+    }
+
+    /**
+     * Get the instance of the item resolver by class name.
+     *
+     * @param string $className
+     * @return ItemResolverInterface
+     */
+    private function getItemResolverInstance(string $className) : ItemResolverInterface
+    {
+        if (!isset($this->itemResolversInstances[$className])) {
+            $this->itemResolversInstances[$className] = ObjectManager::getInstance()->get($className);
+        }
+        return $this->itemResolversInstances[$className];
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php
new file mode 100644
index 0000000000000..35c0a7835cb6c
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Resolves the product from a configured item.
+ *
+ * @api
+ */
+interface ItemResolverInterface
+{
+    /**
+     * Get the final product from a configured item by product type and selection.
+     *
+     * @param ItemInterface $item
+     * @return ProductInterface
+     */
+    public function getFinalProduct(ItemInterface $item) : ProductInterface;
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index acfc454883e1d..b4a4ec08d390d 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -323,7 +323,7 @@ public function getGroupByType($type = null)
             self::OPTION_TYPE_TIME => self::OPTION_GROUP_DATE,
         ];
 
-        return isset($optionGroupsToTypes[$type]) ? $optionGroupsToTypes[$type] : '';
+        return $optionGroupsToTypes[$type] ?? '';
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index 2390a049fbeb6..c388be8b6f394 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -279,7 +279,7 @@ public function getFormattedOptionValue($optionValue)
      */
     public function getCustomizedView($optionInfo)
     {
-        return isset($optionInfo['value']) ? $optionInfo['value'] : $optionInfo;
+        return $optionInfo['value'] ?? $optionInfo;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
index 1e00654249556..2256f031098f1 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Pool.php
@@ -29,6 +29,6 @@ public function __construct(array $validators)
      */
     public function get($type)
     {
-        return isset($this->validators[$type]) ? $this->validators[$type] : $this->validators['default'];
+        return $this->validators[$type] ?? $this->validators['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Type.php b/app/code/Magento/Catalog/Model/Product/Type.php
index dc3971397acb2..7be199884be1f 100644
--- a/app/code/Magento/Catalog/Model/Product/Type.php
+++ b/app/code/Magento/Catalog/Model/Product/Type.php
@@ -232,7 +232,7 @@ public function getOptions()
     public function getOptionText($optionId)
     {
         $options = $this->getOptionArray();
-        return isset($options[$optionId]) ? $options[$optionId] : null;
+        return $options[$optionId] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 9b87515450a12..0189263d7cdfb 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -913,7 +913,7 @@ private function mapConditionType($conditionType)
             'eq' => 'in',
             'neq' => 'nin'
         ];
-        return isset($conditionsMap[$conditionType]) ? $conditionsMap[$conditionType] : $conditionType;
+        return $conditionsMap[$conditionType] ?? $conditionType;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
index 4775b96e3a448..179da06b59990 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
@@ -307,7 +307,7 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje
     }
 
     /**
-     * Get first col from from first row for option table
+     * Get first col from first row for option table
      *
      * @param string $tableName
      * @param int $optionId
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
index 91bb99ca971a7..4ebcd1f4b9ae4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
@@ -300,7 +300,7 @@ protected function _saveValueTitles(AbstractModel $object)
     }
 
     /**
-     * Get first col from from first row for option table
+     * Get first col from first row for option table
      *
      * @param string $tableName
      * @param int $optionId
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php b/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php
index ea8f6bbf39b31..226b94ceb1749 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
+declare(strict_types=1);
 namespace Magento\Catalog\Setup\Patch\Data;
 
 use Magento\Catalog\Setup\CategorySetupFactory;
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/EnableDirectiveParsing.php b/app/code/Magento/Catalog/Setup/Patch/Data/EnableDirectiveParsing.php
new file mode 100644
index 0000000000000..f881b2f49f600
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/EnableDirectiveParsing.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Class EnableDirectiveParsing
+ * @package Magento\Catalog\Setup\Patch
+ */
+class EnableDirectiveParsing implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $configTable = $this->moduleDataSetup->getTable('core_config_data');
+        $select = $this->moduleDataSetup->getConnection()->select()
+            ->from($configTable)
+            ->where('path = ?', 'catalog/frontend/parse_url_directives');
+        $config = $this->moduleDataSetup->getConnection()->fetchAll($select);
+        if (!empty($config)) {
+            $this->moduleDataSetup->getConnection()->update(
+                $configTable,
+                ['value' => '1'],
+                ['path = ?' => 'catalog/frontend/parse_url_directives', 'value IN (?)' => '0']
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index f64812fd5bf49..bca6ae2b60bf3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -181,6 +181,19 @@
         </arguments>
         <conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openTab"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
-        <see selector="{{element}}" userInput="{{expectedText}}" stepKey="AssertText"/>
+        <see selector="{{element}}" userInput="{{expectedText}}" stepKey="assertText"/>
     </actionGroup>
+
+    <!--Add special price to product in Admin product page-->
+    <actionGroup name="AddSpecialPriceToProductActionGroup">
+        <arguments>
+            <argument name="price" type="string" defaultValue="8"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitSpecialPrice"/>
+        <fillField userInput="{{price}}" selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="fillSpecialPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDone"/>
+        <waitForElementNotVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitForCloseModalWindow"/>
+      </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
index 25f059c84f4ef..4376e78242fbd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -45,4 +45,9 @@
         <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
         <seeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+
+    <actionGroup name="StorefrontSwitchCategoryViewToListMode">
+        <click selector="{{StorefrontCategoryMainSection.modeListButton}}" stepKey="switchCategoryViewToListMode"/>
+        <waitForElement selector="{{StorefrontCategoryMainSection.CategoryTitle}}" time="30" stepKey="waitForCategoryReload"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index ccb5da7a6af6f..48313230ff1ca 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -197,6 +197,15 @@
         <data key="filename">magento-logo</data>
         <data key="file_extension">png</data>
     </entity>
+    <entity name="TestImageNew" type="image">
+        <data key="title" unique="suffix">magento-again</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="file">magento-again.jpg</data>
+        <data key="filename">magento-again</data>
+        <data key="file_extension">jpg</data>
+    </entity>
     <entity name="ProductWithUnicode" type="product">
         <data key="sku" unique="suffix">&#38657;&#20135;&#21697;</data>
         <data key="type_id">simple</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
index 35fa00efcfe8e..be7c44e378f08 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -16,5 +16,6 @@
         <section name="AdminAddProductsToOptionPanel"/>
         <section name="AdminProductMessagesSection"/>
         <section name="AdminProductFormRelatedUpSellCrossSellSection"/>
+        <section name="AdminProductFormAdvancedPricingSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
new file mode 100644
index 0000000000000..1042b1e5a5464
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormAdvancedPricingSection">
+        <element name="customerGroupPriceAddButton" type="button" selector="[data-action='add_new_row']" timeout="30"/>
+        <element name="customerGroupPriceDeleteButton" type="button" selector="[data-action='remove_row']" timeout="30"/>
+        <element name="advancedPricingCloseButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-close" timeout="30"/>
+        <element name="productTierPriceWebsiteSelect" type="select" selector="[name='product[tier_price][{{var1}}][website_id]']" parameterized="true"/>
+        <element name="productTierPriceCustGroupSelect" type="select" selector="[name='product[tier_price][{{var1}}][cust_group]']" parameterized="true"/>
+        <element name="productTierPriceQtyInput" type="input" selector="[name='product[tier_price][{{var1}}][price_qty]']" parameterized="true"/>
+        <element name="productTierPriceValueTypeSelect" type="select" selector="[name='product[tier_price][{{var1}}][value_type]']" parameterized="true"/>
+        <element name="productTierPriceFixedPriceInput" type="input" selector="[name='product[tier_price][{{var1}}][price]']" parameterized="true"/>
+        <element name="productTierPricePercentageValuePriceInput" type="input" selector="[name='product[tier_price][{{var1}}][percentage_value]']" parameterized="true"/>
+        <element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
+        <element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="5"/>
+        <element name="save" type="button" selector="#save-button"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
index de3c2b731a3d5..98afed124c698 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -28,5 +28,6 @@
         <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
         <element name="productGridCheckboxOnRow" type="checkbox" selector="//*[@id='container']//tr[{{row}}]/td[1]//input" parameterized="true"/>
         <element name="productGridNameProduct" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
+        <element name="selectRowBasedOnName" type="input" selector="//td/div[text()='{{var1}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index 4892e25818e2c..19b3a5cc127a7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -23,6 +23,10 @@
         <element name="ProductImageByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
         <element name="ProductImageBySrc" type="text" selector=".products-grid img[src*='{{pattern}}']" parameterized="true"/>
         <element name="ProductInfoByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//div[@class='product-item-info']" parameterized="true"/>
+        <element name="productPriceFinal" type="text" selector="//span[@data-price-type='finalPrice']//span[@class='price'][contains(.,'{{var1}}')]" parameterized="true"/>
+        <element name="productPriceOld" type="text" selector="//span[@data-price-type='oldPrice']//span[@class='price'][contains(., '{{var1}}')]" parameterized="true"/>
+        <element name="productPriceLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="productPriceLinkAfterLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]/following::span[contains(text(), '{{var2}}')]" parameterized="true"/>
         <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocart')]" parameterized="true"/>
         <element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>
         <element name="ProductImageByNameAndSrc" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[contains(@src, '{{src}}')]" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
index 40f49fc2cc77b..5688811cb96a6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoDetailsSection">
         <element name="productNameForReview" type="text" selector=".legend.review-legend>strong" />
+        <element name="detailsTab" type="button" selector="#tab-label-description-title" />
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 7e1bec48aeebc..42ca3836e6c1c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -14,6 +14,7 @@
         <element name="productSku" type="text" selector=".product.attribute.sku>.value"/>
         <element name="productPriceLabel" type="text" selector=".price-label"/>
         <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
+        <element name="qty" type="input" selector="#qty"/>
         <element name="specialPrice" type="text" selector=".special-price"/>
         <element name="updatedPrice" type="text" selector="div.price-box.price-final_price [data-price-type='finalPrice'] .price"/>
         <element name="oldPrice" type="text" selector=".old-price"/>
@@ -63,5 +64,10 @@
         <element name="productAddToCompare" type="button" selector="a.action.tocompare"/>
         <element name="productOptionDropDownTitle" type="text" selector="//label[contains(.,'{{var1}}')]" parameterized="true"/>
         <element name="productOptionDropDownOptionTitle" type="text" selector="//label[contains(.,'{{var1}}')]/../div[@class='control']//select//option[contains(.,'{{var2}}')]" parameterized="true"/>
+
+        <!-- Tier price selectors -->
+        <element name="productTierPriceByForTextLabel" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}][contains(text(),'Buy {{var2}} for')]" parameterized="true"/>
+        <element name="productTierPriceAmount" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}]//span[contains(text(), '{{var2}}')]" parameterized="true"/>
+        <element name="productTierPriceSavePercentageAmount" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}]//span[contains(@class, 'percent')][contains(text(), '{{var2}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest.xml
new file mode 100644
index 0000000000000..902f51c4a15a7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest.xml
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminApplyTierPriceToProductTest">
+        <annotations>
+            <features value="Apply tier price to a product"/>
+            <title value="You should be able to apply tier price to a product."/>
+            <description value="You should be able to apply tier price to a product."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-68921"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createSimpleUSCustomer">
+                <field key="group_id">1</field>
+            </createData>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">100</field>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleUSCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex1"/>
+            <waitForPageLoad time="30" stepKey="waitForProductIndexPageLoad"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <!--Case: Group Price-->
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton1"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton1"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAnd10percent"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="1" stepKey="fillProductTierPriceQtyInput1"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('0')}}" userInput="Discount" stepKey="selectProductTierPriceValueType1"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" userInput="10" stepKey="selectProductTierPricePriceInput"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton1"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin1">
+            <argument name="Customer" value="$$createSimpleUSCustomer$$" />
+        </actionGroup>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage1"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_1"/>
+        <amOnPage url="customer/account/logout/" stepKey="logoutCustomer1"/>
+        <waitForPageLoad  time="30" stepKey="waitForPageLoad2"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage2"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_2"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_2"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_2"/>
+        <!--Case: Tier Price for General Customer Group-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex2"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageToLoad1"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton2"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton2"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" time="30" stepKey="waitForSelectCustomerGroupNameAttribute1"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="General" stepKey="selectCustomerGroupGeneral"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton2"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct2"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage3"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_1"/>
+        <dontSeeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_3"/>
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin2">
+            <argument name="Customer" value="$$createSimpleUSCustomer$$" />
+        </actionGroup>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage4"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_3"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_4"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_3"/>
+        <!--Case: Tier Price applied if Product quantity meets Tier Price Condition-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex3"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageToLoad2"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct3">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage3"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton3"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton3"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" stepKey="waitForSelectCustomerGroupNameAttribute2"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="ALL GROUPS" stepKey="selectCustomerGroupAllGroups"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="15" stepKey="fillProductTierPriceQtyInput15"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickToLoseFocusOnRequiredInputElement"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty20PriceDiscountAnd18percent2"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" userInput="20" stepKey="fillProductTierPriceQtyInput20"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('1')}}" userInput="Discount" stepKey="selectProductTierPriceValueType2"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('1')}}" userInput="18" stepKey="selectProductTierPricePriceInput18"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton3"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct3"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage5"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_2"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('As low as')}}" stepKey="assertAsLowAsPriceLabel_1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLinkAfterLabel('As low as', '82')}}" stepKey="assertPriceAfterAsLowAsLabel_1"/>
+        <amOnPage url="customer/account/logout/" stepKey="logoutCustomer2"/>
+        <waitForPageLoad  time="30" stepKey="waitForPageLoad7"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage6"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_3"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('As low as')}}" stepKey="assertAsLowAsPriceLabel_2"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLinkAfterLabel('As low as', '82')}}" stepKey="assertPriceAfterAsLowAsLabel_2"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="goToProductPage1"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', '15')}}" stepKey="assertProductTierPriceByForTextLabelForFirstRow1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', '20')}}" stepKey="assertProductTierPriceByForTextLabelForSecondRow1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('1', '90')}}" stepKey="assertProductTierPriceAmountForFirstRow1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('2', '82')}}" stepKey="assertProductTierPriceAmountForSecondRow1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('1', '10')}}" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow1"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('2', '18')}}" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow1"/>
+        <fillField userInput="10" selector="{{StorefrontProductInfoMainSection.qty}}" stepKey="fillProductQuantity1"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToCheckoutFromMinicart"/>
+        <seeInField userInput="10" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField10"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField1"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,000" stepKey="assertSubtotalField1">
+            <expectedResult type="string">$1,000.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField1</actualResult>
+        </assertEquals>
+        <fillField userInput="15" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="fillProductQuantity2"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCartButton1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField2"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,350" stepKey="assertSubtotalField2">
+            <expectedResult type="string">$1,350.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField2</actualResult>
+        </assertEquals>
+        <fillField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="fillProductQuantity3"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCartButton2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField3"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,640" stepKey="assertSubtotalField3">
+            <expectedResult type="string">$1,640.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField3</actualResult>
+        </assertEquals>
+        <!--Tier Price is changed in Shopping Cart and is changed on Product page if Tier Price parameters are changed in Admin-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex4"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageToLoa4"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct4">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage4"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton4"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton4"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('1')}}" userInput="25" stepKey="selectProductTierPricePercentageValue2"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton4"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct4"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage1"/>
+        <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad1"/>
+        <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField4"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField4">
+            <expectedResult type="string">$1,500.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField4</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="grabTextFromCheckoutCartSummarySectionSubtotal1"/>
+        <assertEquals message="Shopping cart summary section should contain subtotal $1,500" stepKey="assertSubtotalFieldFromCheckoutCartSummarySection1">
+            <expectedResult type="string">$1,500.00</expectedResult>
+            <actualResult type="variable">grabTextFromCheckoutCartSummarySectionSubtotal1</actualResult>
+        </assertEquals>
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart1"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="waitForminiCartSubtotalField1"/>
+        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabTextFromMiniCartSubtotalField"/>
+        <assertEquals message="Mini shopping cart should contain subtotal $1,500" stepKey="assertSubtotalFieldFromMiniShoppingCart1">
+            <expectedResult type="string">$1,500.00</expectedResult>
+            <actualResult type="variable">grabTextFromMiniCartSubtotalField</actualResult>
+        </assertEquals>
+        <amOnPage url="{{AdminSalesConfigPage.url('#sales_msrp-link')}}" stepKey="navigateToAdminSalesConfigPageMAPTab1"/>
+        <waitForPageLoad time="30" stepKey="waitForAdminSalesConfigPageLoad1"/>
+        <uncheckOption selector="{{AdminSalesConfigSection.enableMAPUseSystemValue}}" stepKey="uncheckMAPUseSystemValue"/>
+        <selectOption selector="{{AdminSalesConfigSection.enableMAPSelect}}" userInput="Yes" stepKey="setEnableMAPYes"/>
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig1"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigSuccessMessage1"/>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache1"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage2"/>
+        <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad2"/>
+        <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_2"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField5"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField5">
+            <expectedResult type="string">$1,500.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField5</actualResult>
+        </assertEquals>
+        <amOnPage url="{{AdminSalesConfigPage.url('#sales_msrp-link')}}" stepKey="navigateToAdminSalesConfigPageMAPTab2"/>
+        <waitForPageLoad time="30" stepKey="waitForAdminSalesConfigPageLoad2"/>
+        <selectOption selector="{{AdminSalesConfigSection.enableMAPSelect}}" userInput="No" stepKey="setEnableMAPNo"/>
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig2"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigSuccessMessage2"/>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache2"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage3"/>
+        <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad3"/>
+        <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_3"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField6"/>
+        <assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField6">
+            <expectedResult type="string">$1,500.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField6</actualResult>
+        </assertEquals>
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="goToProductPage2"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', '15')}}" stepKey="assertProductTierPriceByForTextLabelForFirstRow2"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', '20')}}" stepKey="assertProductTierPriceByForTextLabelForSecondRow2"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('1', '90')}}" stepKey="assertProductTierPriceAmountForFirstRow2"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('2', '75')}}" stepKey="assertProductTierPriceAmountForSecondRow2"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('1', '10')}}" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow2"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('2', '25')}}" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow2"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex5"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageToLoad3"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct5">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage5"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton5"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButton}}" stepKey="waitForcustomerGroupPriceDeleteButton"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButton}}" stepKey="deleteFirstRowOfCustomerGroupPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButton}}" stepKey="deleteSecondRowOfCustomerGroupPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton5"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct5"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage6"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton6"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton5"/>
+        <dontSeeElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" stepKey="dontSeeQtyInputOfFirstRow"/>
+        <dontSeeElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" stepKey="dontSeeQtyInputOfSecondRow"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="closeAdvancedPricingPopup"/>
+        <waitForElementVisible selector="{{AdminProductFormSection.productPrice}}" stepKey="waitForAdminProductFormSectionProductPriceInput"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="200" stepKey="fillProductPrice200"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage4"/>
+        <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad4"/>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}"  stepKey="grabTextFromSubtotalField7"/>
+        <assertEquals message="Shopping cart should contain subtotal $4,000" stepKey="assertSubtotalField7">
+            <expectedResult type="string">$4,000.00</expectedResult>
+            <actualResult type="variable">grabTextFromSubtotalField7</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="grabTextFromCheckoutCartSummarySectionSubtotal2"/>
+        <assertEquals message="Shopping cart summary section should contain subtotal $4,000" stepKey="assertSubtotalFieldFromCheckoutCartSummarySection2">
+            <expectedResult type="string">$4,000.00</expectedResult>
+            <actualResult type="variable">grabTextFromCheckoutCartSummarySectionSubtotal2</actualResult>
+        </assertEquals>
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart2"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="waitForminiCartSubtotalField2"/>
+        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabTextFromMiniCartSubtotalField2"/>
+        <assertEquals message="Mini shopping cart should contain subtotal $4,000" stepKey="assertSubtotalFieldFromMiniShoppingCart2">
+            <expectedResult type="string">$4,000.00</expectedResult>
+            <actualResult type="variable">grabTextFromMiniCartSubtotalField2</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php
index 942a87ce3414f..157c72fcedf10 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php
@@ -66,7 +66,7 @@ public function testApplyWithoutCondition()
 
         $collectionMock->expects($this->once())
             ->method('addCategoriesFilter')
-            ->with(['eq' => ['value']]);
+            ->with(['in' => ['value']]);
 
         $this->assertTrue($this->model->apply($filterMock, $collectionMock));
     }
diff --git a/app/code/Magento/Catalog/Ui/Component/FilterFactory.php b/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
index fcc500c891607..dd8eaffb0a658 100644
--- a/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
+++ b/app/code/Magento/Catalog/Ui/Component/FilterFactory.php
@@ -71,8 +71,6 @@ public function create($attribute, $context, $config = [])
      */
     protected function getFilterType($attribute)
     {
-        return isset($this->filterMap[$attribute->getFrontendInput()])
-            ? $this->filterMap[$attribute->getFrontendInput()]
-            : $this->filterMap['default'];
+        return $this->filterMap[$attribute->getFrontendInput()] ?? $this->filterMap['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
index c96498b054d25..8ea6d8b9e5a06 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
@@ -80,6 +80,6 @@ public function prepare()
      */
     protected function getFilterType($frontendInput)
     {
-        return isset($this->filterMap[$frontendInput]) ? $this->filterMap[$frontendInput] : $this->filterMap['default'];
+        return $this->filterMap[$frontendInput] ?? $this->filterMap['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index 7cd81419c0347..34e4c7afda989 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -854,7 +854,7 @@ private function getFormElementsMapValue($value)
     {
         $valueMap = $this->formElementMapper->getMappings();
 
-        return isset($valueMap[$value]) ? $valueMap[$value] : $value;
+        return $valueMap[$value] ?? $value;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index e6dbb10e811b4..71a799fd22427 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -92,18 +92,12 @@
                     <comment>Whether to show "All" option in the "Show X Per Page" dropdown</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="parse_url_directives" translate="label comment" type="select" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                    <label>Allow Dynamic Media URLs</label>
-                    <comment>E.g. {{media url="path/to/image.jpg"}} {{skin url="path/to/picture.gif"}}. Dynamic directives parsing impacts catalog performance.</comment>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
             </group>
             <group id="placeholder" translate="label" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Product Image Placeholders</label>
                 <clone_fields>1</clone_fields>
                 <clone_model>Magento\Catalog\Model\Config\CatalogClone\Media\Image</clone_model>
                 <field id="placeholder" type="image" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label></label>
                     <backend_model>Magento\Config\Model\Config\Backend\Image</backend_model>
                     <upload_dir config="system/filesystem/media" scope_info="1">catalog/product/placeholder</upload_dir>
                     <base_url type="media" scope_info="1">catalog/product/placeholder</base_url>
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 9f1fb020ef95a..c9e18e7b8c823 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -70,7 +70,8 @@
     <preference for="Magento\Catalog\Api\Data\ProductRender\FormattedPriceInfoInterface" type="Magento\Catalog\Model\ProductRender\FormattedPriceInfo" />
     <preference for="Magento\Framework\Indexer\BatchProviderInterface" type="Magento\Framework\Indexer\BatchProvider" />
     <preference for="Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface" type="Magento\Catalog\Model\Indexer\Product\Price\InvalidateIndex" />
-    <preference for="\Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="\Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
+    <preference for="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
+    <preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
@@ -173,10 +174,17 @@
     </type>
     <type name="Magento\Catalog\Helper\Data">
         <arguments>
-            <argument name="templateFilterModel" xsi:type="string">Magento\Catalog\Model\Template\Filter</argument>
+            <argument name="templateFilterModel" xsi:type="string">Magento\Widget\Model\Template\Filter</argument>
             <argument name="catalogSession" xsi:type="object">Magento\Catalog\Model\Session\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Helper\Output">
+        <arguments>
+            <argument name="directivePatterns" xsi:type="array">
+                <item name="construct" xsi:type="const">\Magento\Framework\Filter\Template::CONSTRUCTION_PATTERN</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Model\Config\Source\GridPerPage">
         <arguments>
             <argument name="perPageValues" xsi:type="string">9,15,30</argument>
diff --git a/app/code/Magento/Catalog/etc/widget.xml b/app/code/Magento/Catalog/etc/widget.xml
index a11d206e2ce42..f3b37d7d32e31 100644
--- a/app/code/Magento/Catalog/etc/widget.xml
+++ b/app/code/Magento/Catalog/etc/widget.xml
@@ -296,7 +296,7 @@
         </parameters>
         <containers>
             <container name="sidebar.main">
-                <template name="default" value="list" />
+                <template name="default" value="sidebar" />
             </container>
             <container name="content">
                 <template name="grid" value="grid" />
diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv
index f2a7cf0b1950b..a399f67e3130f 100644
--- a/app/code/Magento/Catalog/i18n/en_US.csv
+++ b/app/code/Magento/Catalog/i18n/en_US.csv
@@ -658,7 +658,6 @@ Comma-separated.,Comma-separated.
 "Product Listing Sort by","Product Listing Sort by"
 "Allow All Products per Page","Allow All Products per Page"
 "Whether to show ""All"" option in the ""Show X Per Page"" dropdown","Whether to show ""All"" option in the ""Show X Per Page"" dropdown"
-"Allow Dynamic Media URLs","Allow Dynamic Media URLs"
 "E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance.","E.g. {{media url=""path/to/image.jpg""}} {{skin url=""path/to/picture.gif""}}. Dynamic directives parsing impacts catalog performance."
 "Product Image Placeholders","Product Image Placeholders"
 "Search Engine Optimization","Search Engine Optimization"
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js
index 475c9d2dc0601..94300e31f74b5 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js
@@ -67,10 +67,10 @@ define([
         },
 
         /**
-         * Has weight swither
+         * Has weight switcher
          * @returns {*}
          */
-        hasWeightSwither: function () {
+        hasWeightSwitcher: function () {
             return this.$weightSwitcher().is(':visible');
         },
 
@@ -107,7 +107,7 @@ define([
         'Magento_Catalog/js/product/weight-handler': function () {
             this.bindAll();
 
-            if (this.hasWeightSwither()) {
+            if (this.hasWeightSwitcher()) {
                 this.switchWeight();
             }
         },
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html b/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html
index 04b4990f9cace..bf17624517f2a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html
+++ b/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html
@@ -14,7 +14,8 @@
                 event="load: $parent.onPreviewLoad.bind($parent)"
                 attr="
                     src: $parent.getFilePreview($file),
-                    alt: $file.name">
+                    alt: $file.name,
+                    title: $file.name">
         </a>
 
         <div class="actions">
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image.html b/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image.html
index 318a6ceed69d1..cf76762b1ff58 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image.html
@@ -11,6 +11,7 @@
              class="product-image-photo"
              attr="src: getImageUrl($row()),
                alt: getLabel($row()),
+               title: getLabel($row()),
                width: getResizedImageWidth($row()),
                height: getResizedImageHeight($row())"/>
     </a>
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image_with_borders.html b/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image_with_borders.html
index 2baa9926df5f1..68b7f4e386896 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image_with_borders.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/list/columns/image_with_borders.html
@@ -14,7 +14,7 @@
                   data-bind="style: {'padding-bottom': getHeight($row())/getWidth($row()) * 100 + '%'}">
                 <img class="product-image-photo"
                      data-bind="attr: {src: getImageUrl($row()),
-                                       alt: getLabel($row())}" />
+                                       alt: getLabel($row()), title: getLabel($row())}" />
             </span>
         </span>
     </a>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
index 16a5147e13458..adf0f44d0c831 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/** @var $block \Magento\Catalog\Block\Catalog\Product\View\Addto\Compare */
+/** @var $block \Magento\Catalog\Block\Product\View\Addto\Compare */
 ?>
 
 <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getPostDataParams() ?>'
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
index f1b2f1a214945..2d2c91aadd473 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
@@ -17,10 +17,8 @@
         'listing' => [
             'displayMode' => 'grid'
         ],
-        'column' => [
-            'image' => [
-                'imageCode' => 'recently_compared_products_images_names_widget'
-            ]
+        'image' => [
+            'imageCode' => 'recently_compared_products_images_names_widget'
         ]
     ]
 );
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php
new file mode 100644
index 0000000000000..d49c7f5e5674d
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Breadcrumbs.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use \Magento\CatalogGraphQl\Model\Resolver\Category\DataProvider\Breadcrumbs as BreadcrumbsDataProvider;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+
+/**
+ * Retrieves breadcrumbs
+ */
+class Breadcrumbs implements ResolverInterface
+{
+    /**
+     * @var BreadcrumbsDataProvider
+     */
+    private $breadcrumbsDataProvider;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @param BreadcrumbsDataProvider $breadcrumbsDataProvider
+     * @param ValueFactory $valueFactory
+     */
+    public function __construct(
+        BreadcrumbsDataProvider $breadcrumbsDataProvider,
+        ValueFactory $valueFactory
+    ) {
+        $this->breadcrumbsDataProvider = $breadcrumbsDataProvider;
+        $this->valueFactory = $valueFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null): Value
+    {
+        if (!isset($value['path'])) {
+            $result = function () {
+                return null;
+            };
+            return $this->valueFactory->create($result);
+        }
+
+        $result = function () use ($value) {
+            $breadcrumbsData = $this->breadcrumbsDataProvider->getData($value['path']);
+            return count($breadcrumbsData) ? $breadcrumbsData : null;
+        };
+        return $this->valueFactory->create($result);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
new file mode 100644
index 0000000000000..9e23c4f1e9736
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Category\DataProvider;
+
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+
+/**
+ * Breadcrumbs data provider
+ */
+class Breadcrumbs
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * @param string $categoryPath
+     * @return array
+     */
+    public function getData(string $categoryPath): array
+    {
+        $breadcrumbsData = [];
+
+        $pathCategoryIds = explode('/', $categoryPath);
+        $parentCategoryIds = array_slice($pathCategoryIds, 2, -1);
+
+        if (count($parentCategoryIds)) {
+            $collection = $this->collectionFactory->create();
+            $collection->addAttributeToSelect(['name', 'url_key']);
+            $collection->addAttributeToFilter('entity_id', $parentCategoryIds);
+
+            foreach ($collection as $category) {
+                $breadcrumbsData[] = [
+                    'category_id' => $category->getId(),
+                    'category_name' => $category->getName(),
+                    'category_level' => $category->getLevel(),
+                    'category_url_key' => $category->getUrlKey(),
+                ];
+            }
+        }
+        return $breadcrumbsData;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Attributes/Collection.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Attributes/Collection.php
index d0413813aab37..ab0531ad09513 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Attributes/Collection.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Attributes/Collection.php
@@ -46,6 +46,24 @@ public function getAttributes() : AttributeCollection
             $this->collection = $this->collectionFactory->create();
             $this->collection->addFieldToFilter('is_user_defined', '1');
             $this->collection->addFieldToFilter('attribute_code', ['neq' => 'cost']);
+            $this->collection->addFieldToFilter(
+                [
+                    'is_comparable',
+                    'is_filterable',
+                    'is_filterable_in_search',
+                    'is_visible_on_front',
+                    'used_in_product_listing',
+                    'used_for_sort_by'
+                ],
+                [
+                    ['eq' => '1'],
+                    ['eq' => '1'],
+                    ['eq' => '1'],
+                    ['eq' => '1'],
+                    ['eq' => '1'],
+                    ['eq' => '1']
+                ]
+            );
         }
 
         return $this->collection->load();
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index da457279728bb..d2fc174fb1ed5 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -100,7 +100,7 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
         $collection->addFieldToFilter('level', ['lteq' => $level + $depth - self::DEPTH_OFFSET]);
         $collection->setOrder('level');
         $collection->getSelect()->orWhere(
-            $this->metadata->getMetadata(CategoryInterface::class)->getLinkField() . ' = ?',
+            $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField() . ' = ?',
             $rootCategoryId
         );
         return $this->processTree($collection->getIterator());
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 762861de94e67..9235ec271a3c2 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -381,6 +381,14 @@ interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model
         currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1."),
         sort: ProductSortInput @doc(description: "Specifies which attribute to sort on, and whether to return the results in ascending or descending order.")
     ): CategoryProducts @doc(description: "The list of products assigned to the category") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Products")
+    breadcrumbs: [Breadcrumb] @doc(description: "Breadcrumbs, parent categories info") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\Breadcrumbs")
+}
+
+type Breadcrumb @doc(description: "Breadcrumb item"){
+    category_id: Int @doc(description: "Category ID")
+    category_name: String @doc(description: "Category name")
+    category_level: Int @doc(description: "Category level")
+    category_url_key: String @doc(description: "Category URL key")
 }
 
 type CustomizableRadioOption implements CustomizableOptionInterface @doc(description: "CustomizableRadioOption contains information about a set of radio buttons that are defined as part of a customizable option") {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 097db293ab77c..6c3bef2a52b0c 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -294,7 +294,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         ValidatorInterface::ERROR_MEDIA_PATH_NOT_ACCESSIBLE => 'Imported resource (image) does not exist in the local media storage',
         ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE => 'Imported resource (image) could not be downloaded from external resource due to timeout or access permissions',
         ValidatorInterface::ERROR_INVALID_WEIGHT => 'Product weight is invalid',
-        ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Url key: \'%s\' was already generated for an item with the SKU: \'%s\'. You need to specify the unique URL key manually'
+        ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Url key: \'%s\' was already generated for an item with the SKU: \'%s\'. You need to specify the unique URL key manually',
+        ValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES => "Value for multiselect attribute %s contains duplicated values",
     ];
     //@codingStandardsIgnoreEnd
 
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
index db5b07279ed1c..a5aefff656bd3 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
@@ -234,7 +234,7 @@ public function clearFailedCategories()
      */
     public function getCategoryById($categoryId)
     {
-        return isset($this->categoriesCache[$categoryId]) ? $this->categoriesCache[$categoryId] : null;
+        return $this->categoriesCache[$categoryId] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
index 17f7fae28ba75..f41596ad185a6 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php
@@ -85,6 +85,8 @@ interface RowValidatorInterface extends \Magento\Framework\Validator\ValidatorIn
 
     const ERROR_DUPLICATE_URL_KEY = 'duplicatedUrlKey';
 
+    const ERROR_DUPLICATE_MULTISELECT_VALUES = 'duplicatedMultiselectValues';
+
     /**
      * Value that means all entities (e.g. websites, groups etc.)
      */
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
index addd1523f87a0..ea6049ba651a5 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/SkuProcessor.php
@@ -142,7 +142,7 @@ public function getNewSku($sku = null)
     {
         if ($sku !== null) {
             $sku = strtolower($sku);
-            return isset($this->newSkus[$sku]) ? $this->newSkus[$sku] : null;
+            return $this->newSkus[$sku] ?? null;
         }
         return $this->newSkus;
     }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
index be5644e22b05b..3dff0188a7dbb 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
@@ -75,7 +75,7 @@ public function getWebsiteCodeToId($code = null)
             $this->_initWebsites();
         }
         if ($code) {
-            return isset($this->websiteCodeToId[$code]) ? $this->websiteCodeToId[$code] : null;
+            return $this->websiteCodeToId[$code] ?? null;
         }
         return $this->websiteCodeToId;
     }
@@ -90,7 +90,7 @@ public function getWebsiteCodeToStoreIds($code = null)
             $this->_initWebsites();
         }
         if ($code) {
-            return isset($this->websiteCodeToStoreIds[$code]) ? $this->websiteCodeToStoreIds[$code] : null;
+            return $this->websiteCodeToStoreIds[$code] ?? null;
         }
         return $this->websiteCodeToStoreIds;
     }
@@ -119,7 +119,7 @@ public function getStoreCodeToId($code = null)
             $this->_initStores();
         }
         if ($code) {
-            return isset($this->storeCodeToId[$code]) ? $this->storeCodeToId[$code] : null;
+            return $this->storeCodeToId[$code] ??  null;
         }
         return $this->storeCodeToId;
     }
@@ -134,7 +134,7 @@ public function getStoreIdToWebsiteStoreIds($code = null)
             $this->_initStores();
         }
         if ($code) {
-            return isset($this->storeIdToWebsiteStoreIds[$code]) ? $this->storeIdToWebsiteStoreIds[$code] : null;
+            return $this->storeIdToWebsiteStoreIds[$code] ?? null;
         }
         return $this->storeIdToWebsiteStoreIds;
     }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index e1a6188551c0c..2aa2105991883 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -219,6 +219,12 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
                         break;
                     }
                 }
+
+                $uniqueValues = array_unique($values);
+                if (count($uniqueValues) != count($values)) {
+                    $valid = false;
+                    $this->_addMessages([RowValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES]);
+                }
                 break;
             case 'datetime':
                 $val = trim($rowData[$attrCode]);
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php
index 1179783fdd3f9..64b925955519e 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php
@@ -167,6 +167,26 @@ public function attributeValidationProvider()
                 ['product_type' => 'any', 'attribute_code' => 'Option 1|Option 2'],
                 true
             ],
+            [
+                Import::BEHAVIOR_APPEND,
+                ['is_required' => true, 'type' => 'multiselect',
+                    'options' => ['option 1' => 0, 'option 2' => 1, 'option 3']],
+                ['product_type' => 'any', 'attribute_code' => 'Option 1|Option 2|Option 1'],
+                false
+            ],
+            [
+                Import::BEHAVIOR_APPEND,
+                ['is_required' => true, 'type' => 'multiselect',
+                    'options' => ['option 1' => 0, 'option 2' => 1, 'option 3']],
+                ['product_type' => 'any', 'attribute_code' => 'Option 3|Option 3|Option 3|Option 1'],
+                false
+            ],
+            [
+                Import::BEHAVIOR_APPEND,
+                ['is_required' => true, 'type' => 'multiselect', 'options' => ['option 1' => 0]],
+                ['product_type' => 'any', 'attribute_code' => 'Option 1|Option 1|Option 1|Option 1'],
+                false
+            ],
             [
                 Import::BEHAVIOR_APPEND,
                 ['is_required' => true, 'type' => 'datetime'],
diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
index dc992378d128b..f349e94235a9c 100644
--- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php
@@ -84,7 +84,7 @@ protected function _getCustomerGroups($groupId = null)
             $this->_customerGroups[$notLoggedInGroup->getId()] = $notLoggedInGroup->getCode();
         }
         if ($groupId !== null) {
-            return isset($this->_customerGroups[$groupId]) ? $this->_customerGroups[$groupId] : null;
+            return $this->_customerGroups[$groupId] ?? null;
         }
         return $this->_customerGroups;
     }
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php b/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
index 0a54adfe91c51..8238c1e8f6b21 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
@@ -68,7 +68,7 @@ public function removeStock($scopeId = null)
      */
     public function getStockItem($productId, $scopeId)
     {
-        return isset($this->stockItems[$productId][$scopeId]) ? $this->stockItems[$productId][$scopeId] : null;
+        return $this->stockItems[$productId][$scopeId] ?? null;
     }
 
     /**
@@ -103,7 +103,7 @@ public function removeStockItem($productId, $scopeId = null)
      */
     public function getStockStatus($productId, $scopeId)
     {
-        return isset($this->stockStatuses[$productId][$scopeId]) ? $this->stockStatuses[$productId][$scopeId] : null;
+        return $this->stockStatuses[$productId][$scopeId] ?? null;
     }
 
     /**
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Job.php b/app/code/Magento/CatalogRule/Model/Rule/Job.php
index 63ff98d4ca5b7..71734eb3c5d46 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Job.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Job.php
@@ -8,6 +8,10 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\CatalogRule\Model\Rule;
+
+use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
+
 /**
  * Catalog Rule job model
  *
@@ -18,13 +22,8 @@
  * @method bool hasSuccess()
  * @method bool hasError()
  *
- * @author    Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\CatalogRule\Model\Rule;
-
-use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
-
-/**
+ * @author Magento Core Team <core@magentocommerce.com>
+ *
  * @api
  * @since 100.0.2
  */
@@ -39,10 +38,14 @@ class Job extends \Magento\Framework\DataObject
      * Basic object initialization
      *
      * @param RuleProductProcessor $ruleProcessor
+     * @param array $data
      */
-    public function __construct(RuleProductProcessor $ruleProcessor)
-    {
+    public function __construct(
+        RuleProductProcessor $ruleProcessor,
+        array $data = []
+    ) {
         $this->ruleProcessor = $ruleProcessor;
+        parent::__construct($data);
     }
 
     /**
diff --git a/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php b/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
index 8a3a821707624..110fef48c37e3 100644
--- a/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
+++ b/app/code/Magento/CatalogRule/Observer/RulePricesStorage.php
@@ -22,7 +22,7 @@ class RulePricesStorage
      */
     public function getRulePrice($id)
     {
-        return isset($this->rulePrices[$id]) ? $this->rulePrices[$id] : false;
+        return $this->rulePrices[$id]) ?? false;
     }
 
     /**
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
index ad92af9bb3b1b..2d437ab086f82 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
@@ -18,7 +18,7 @@
         <waitForPageLoad stepKey="waitForPriceRulePage"/>
         <click stepKey="addNewRule" selector="{{AdminGridMainControls.add}}"/>
 
-        <!-- Fill the form according the the attributes of the entity -->
+        <!-- Fill the form according the attributes of the entity -->
         <fillField stepKey="fillName" selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"/>
         <fillField stepKey="fillDescription" selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}"/>
         <selectOption stepKey="selectSite" selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{catalogRule.website_ids[0]}}"/>
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
index d51be12f01db5..df9eb6e78990a 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
@@ -10,10 +10,13 @@
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext as FulltextResource;
 use Magento\Framework\Indexer\Dimension\DimensionProviderInterface;
 use Magento\Store\Model\StoreDimensionProvider;
+use Magento\Indexer\Model\ProcessManager;
 
 /**
  * Provide functionality for Fulltext Search indexing.
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
  * @api
  * @since 100.0.2
  */
@@ -62,14 +65,20 @@ class Fulltext implements
      */
     private $dimensionProvider;
 
+    /**
+     * @var ProcessManager
+     */
+    private $processManager;
+
     /**
      * @param FullFactory $fullActionFactory
      * @param IndexerHandlerFactory $indexerHandlerFactory
      * @param FulltextResource $fulltextResource
-     * @param array $data
      * @param IndexSwitcherInterface $indexSwitcher
      * @param StateFactory $indexScopeStateFactory
      * @param DimensionProviderInterface $dimensionProvider
+     * @param array $data
+     * @param ProcessManager $processManager
      */
     public function __construct(
         FullFactory $fullActionFactory,
@@ -78,7 +87,8 @@ public function __construct(
         IndexSwitcherInterface $indexSwitcher,
         StateFactory $indexScopeStateFactory,
         DimensionProviderInterface $dimensionProvider,
-        array $data
+        array $data,
+        ProcessManager $processManager = null
     ) {
         $this->fullAction = $fullActionFactory->create(['data' => $data]);
         $this->indexerHandlerFactory = $indexerHandlerFactory;
@@ -87,6 +97,9 @@ public function __construct(
         $this->indexSwitcher = $indexSwitcher;
         $this->indexScopeState = $indexScopeStateFactory->create();
         $this->dimensionProvider = $dimensionProvider;
+        $this->processManager = $processManager ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            ProcessManager::class
+        );
     }
 
     /**
@@ -145,9 +158,13 @@ public function executeByDimension(array $dimensions, \Traversable $entityIds =
      */
     public function executeFull()
     {
+        $userFunctions = [];
         foreach ($this->dimensionProvider->getIterator() as $dimension) {
-            $this->executeByDimension($dimension);
+            $userFunctions[] = function () use ($dimension) {
+                $this->executeByDimension($dimension);
+            };
         }
+        $this->processManager->execute($userFunctions);
     }
 
     /**
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
index 0c3bd42a1b5eb..595e32b4c1988 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
@@ -44,6 +44,11 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
      */
     private $dimensionProviderMock;
 
+    /**
+     * @var \Magento\Indexer\Model\ProcessManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $processManager;
+
     protected function setUp()
     {
         $this->fullAction = $this->getClassMock(\Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::class);
@@ -70,6 +75,11 @@ protected function setUp()
         $stateMock = $this->getMockBuilder(\Magento\CatalogSearch\Model\Indexer\Scope\State::class)
             ->getMock();
         $objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->processManager = new \Magento\Indexer\Model\ProcessManager(
+            $this->getClassMock(\Magento\Framework\App\ResourceConnection::class)
+        );
+
         $this->model = $objectManagerHelper->getObject(
             \Magento\CatalogSearch\Model\Indexer\Fulltext::class,
             [
@@ -80,6 +90,7 @@ protected function setUp()
                 'indexSwitcher' => $this->indexSwitcher,
                 'dimensionProvider' => $this->dimensionProviderMock,
                 'indexScopeState' => $stateMock,
+                'processManager' => $this->processManager,
             ]
         );
     }
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 72bf2ec90a582..298511ef428a9 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -9,6 +9,7 @@
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-catalog": "*",
+        "magento/module-indexer": "100.2.*",
         "magento/module-catalog-inventory": "*",
         "magento/module-customer": "*",
         "magento/module-directory": "*",
diff --git a/app/code/Magento/CatalogSearch/etc/module.xml b/app/code/Magento/CatalogSearch/etc/module.xml
index 68253014ec150..8fe282ce7539b 100644
--- a/app/code/Magento/CatalogSearch/etc/module.xml
+++ b/app/code/Magento/CatalogSearch/etc/module.xml
@@ -10,6 +10,7 @@
         <sequence>
             <module name="Magento_Search"/>
             <module name="Magento_Catalog"/>
+            <module name="Magento_Indexer"/>
             <module name="Magento_CatalogRule" />
             <module name="Magento_CatalogInventory" />
         </sequence>
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
index 06be39d0f3516..a43f074d8df67 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -11,6 +11,8 @@
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 
 /**
  * Shopping cart item render block
@@ -21,6 +23,7 @@
  * @method \Magento\Checkout\Block\Cart\Item\Renderer setProductName(string)
  * @method \Magento\Checkout\Block\Cart\Item\Renderer setDeleteUrl(string)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class Renderer extends \Magento\Framework\View\Element\Template implements
     \Magento\Framework\DataObject\IdentityInterface
@@ -91,6 +94,9 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      */
     private $messageInterpretationStrategy;
 
+    /** @var ItemResolverInterface */
+    private $itemResolver;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfig
@@ -102,6 +108,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param InterpretationStrategyInterface $messageInterpretationStrategy
      * @param array $data
+     * @param ItemResolverInterface|null $itemResolver
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
      */
@@ -115,7 +122,8 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Module\Manager $moduleManager,
         InterpretationStrategyInterface $messageInterpretationStrategy,
-        array $data = []
+        array $data = [],
+        ItemResolverInterface $itemResolver = null
     ) {
         $this->priceCurrency = $priceCurrency;
         $this->imageBuilder = $imageBuilder;
@@ -127,6 +135,7 @@ public function __construct(
         $this->_isScopePrivate = true;
         $this->moduleManager = $moduleManager;
         $this->messageInterpretationStrategy = $messageInterpretationStrategy;
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
     }
 
     /**
@@ -172,7 +181,7 @@ public function getProduct()
      */
     public function getProductForThumbnail()
     {
-        return $this->getProduct();
+        return $this->itemResolver->getFinalProduct($this->getItem());
     }
 
     /**
diff --git a/app/code/Magento/Checkout/CustomerData/DefaultItem.php b/app/code/Magento/Checkout/CustomerData/DefaultItem.php
index 9351685405a60..21580d1275d0c 100644
--- a/app/code/Magento/Checkout/CustomerData/DefaultItem.php
+++ b/app/code/Magento/Checkout/CustomerData/DefaultItem.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\CustomerData;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 
 /**
  * Default item
@@ -39,12 +40,15 @@ class DefaultItem extends AbstractItem
     protected $checkoutHelper;
 
     /**
-     * Escaper
-     *
      * @var \Magento\Framework\Escaper
      */
     private $escaper;
 
+    /**
+     * @var ItemResolverInterface
+     */
+    private $itemResolver;
+
     /**
      * @param \Magento\Catalog\Helper\Image $imageHelper
      * @param \Magento\Msrp\Helper\Data $msrpHelper
@@ -52,6 +56,7 @@ class DefaultItem extends AbstractItem
      * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param \Magento\Framework\Escaper|null $escaper
+     * @param ItemResolverInterface|null $itemResolver
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -60,7 +65,8 @@ public function __construct(
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool,
         \Magento\Checkout\Helper\Data $checkoutHelper,
-        \Magento\Framework\Escaper $escaper = null
+        \Magento\Framework\Escaper $escaper = null,
+        ItemResolverInterface $itemResolver = null
     ) {
         $this->configurationPool = $configurationPool;
         $this->imageHelper = $imageHelper;
@@ -68,6 +74,7 @@ public function __construct(
         $this->urlBuilder = $urlBuilder;
         $this->checkoutHelper = $checkoutHelper;
         $this->escaper = $escaper ?: ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
     }
 
     /**
@@ -119,7 +126,7 @@ protected function getOptionList()
      */
     protected function getProductForThumbnail()
     {
-        return $this->getProduct();
+        return $this->itemResolver->getFinalProduct($this->item);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
index d8d0003d8ca7e..cdadf3573c8ec 100644
--- a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
+++ b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
@@ -5,8 +5,10 @@
  */
 namespace Magento\Checkout\Model\Cart;
 
+use Magento\Checkout\CustomerData\DefaultItem;
+use Magento\Framework\App\ObjectManager;
+
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  */
 class ImageProvider
@@ -18,20 +20,27 @@ class ImageProvider
 
     /**
      * @var \Magento\Checkout\CustomerData\ItemPoolInterface
+     * @deprecated No need for the pool as images are resolved in the default item implementation
+     * @see \Magento\Checkout\CustomerData\DefaultItem::getProductForThumbnail
      */
     protected $itemPool;
 
+    /** @var \Magento\Checkout\CustomerData\DefaultItem */
+    protected $customerDataItem;
+
     /**
      * @param \Magento\Quote\Api\CartItemRepositoryInterface $itemRepository
      * @param \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool
-     * @codeCoverageIgnore
+     * @param DefaultItem|null $customerDataItem
      */
     public function __construct(
         \Magento\Quote\Api\CartItemRepositoryInterface $itemRepository,
-        \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool
+        \Magento\Checkout\CustomerData\ItemPoolInterface $itemPool,
+        \Magento\Checkout\CustomerData\DefaultItem $customerDataItem = null
     ) {
         $this->itemRepository = $itemRepository;
         $this->itemPool = $itemPool;
+        $this->customerDataItem = $customerDataItem ?: ObjectManager::getInstance()->get(DefaultItem::class);
     }
 
     /**
@@ -45,7 +54,7 @@ public function getImages($cartId)
         $items = $this->itemRepository->getList($cartId);
         /** @var \Magento\Quote\Model\Quote\Item $cartItem */
         foreach ($items as $cartItem) {
-            $allData = $this->itemPool->getItemData($cartItem);
+            $allData = $this->customerDataItem->getItemData($cartItem);
             $itemData[$cartItem->getItemId()] = $allData['product_image'];
         }
         return $itemData;
diff --git a/app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php b/app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php
new file mode 100644
index 0000000000000..3791b28917e97
--- /dev/null
+++ b/app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Plugin\Model\Quote;
+
+use Magento\Quote\Model\Quote;
+
+/**
+ * Clear quote addresses after all items were removed.
+ */
+class ResetQuoteAddresses
+{
+    /**
+     * @param Quote $quote
+     * @param Quote $result
+     * @param mixed $itemId
+     *
+     * @return Quote
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterRemoveItem(Quote $quote, Quote $result, $itemId): Quote
+    {
+        if (empty($result->getAllVisibleItems())) {
+            foreach ($result->getAllAddresses() as $address) {
+                $result->removeAddress($address->getId());
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
index dcc652829b3cc..433d397ee81a9 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="CheckoutCartPage" url="/checkout/cart" module="Checkout" area="storefront">
+    <page name="CheckoutCartPage" url="/checkout/cart" module="Magento_Checkout" area="storefront">
         <section name="CheckoutCartProductSection"/>
         <section name="CheckoutCartSummarySection"/>
     </page>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
new file mode 100644
index 0000000000000..59c3b20aca674
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="CheckoutShippingPage" url="/checkout/#shipping" module="Checkout" area="storefront">
+        <section name="CheckoutShippingGuestInfoSection"/>
+        <section name="CheckoutShippingSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index 6e2262d58b89d..b3e3f082319fb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -29,5 +29,7 @@
         <element name="nthItemOption" type="block" selector=".item:nth-of-type({{numElement}}) .item-options" parameterized="true"/>
         <element name="nthEditButton" type="block" selector=".item:nth-of-type({{numElement}}) .action-edit" parameterized="true"/>
         <element name="nthBundleOptionName" type="text" selector=".product-item-details .item-options:nth-of-type({{numOption}}) dt" parameterized="true"/>
+        <element name="productSubtotalByName" type="input" selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'subtotal')]//span[@class='price']" parameterized="true"/>
+        <element name="updateShoppingCartButton" type="button" selector="#form-validate button[type='submit'].update" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
index ce4069a0c916d..01b483c8ecf0b 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -16,8 +16,10 @@
         <element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
         <element name="discountAmount" type="text" selector="td[data-th='Discount']"/>
         <element name="shippingHeading" type="button" selector="#block-shipping-heading"/>
-        <element name="postcode" type="input" selector="input[name='postcode']"/>
-        <element name="stateProvince" type="select" selector="select[name='region_id']"/>
-        <element name="country" type="select" selector="select[name='country_id']"/>
+        <element name="postcode" type="input" selector="input[name='postcode']" timeout="10"/>
+        <element name="stateProvince" type="select" selector="select[name='region_id']" timeout="10"/>
+        <element name="country" type="select" selector="select[name='country_id']" timeout="10"/>
+        <element name="estimateShippingAndTax" type="text" selector="#block-shipping-heading" timeout="5"/>
+        <element name="flatRateShippingMethod" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
index 0da16a34134b8..faee71a54a0be 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
@@ -23,6 +23,7 @@
         <element name="viewAndEditCart" type="button" selector=".action.viewcart" timeout="30"/>
         <element name="miniCartItemsText" type="text" selector=".minicart-items"/>
         <element name="deleteMiniCartItem" type="button" selector=".action.delete" timeout="30"/>
+        <element name="miniCartSubtotalField" type="text" selector=".block-minicart .amount span.price"/>
         <element name="itemQuantity" type="input" selector="//a[text()='{{productName}}']/../..//input[contains(@class,'cart-item-qty')]" parameterized="true"/>
         <element name="itemQuantityUpdate" type="button" selector="//a[text()='{{productName}}']/../..//span[text()='Update']" parameterized="true"/>
     </section>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
new file mode 100644
index 0000000000000..4b8d48a84073a
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest">
+        <annotations>
+            <features value="Checkout"/>
+            <title value="Guest Checkout"/>
+            <description value="Address State Field For UK Customers Remain Option even After Browser Refresh"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93329"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
+        <selectOption stepKey="selectCounty" selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country_id}}"/>
+        <waitForPageLoad stepKey="waitFormToReload"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{UK_Address.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{UK_Address.city}}" stepKey="enterCity"/>
+        <waitForPageLoad stepKey="waitFormToReload2"/>
+        <see userInput="State/Province" stepKey="StateFieldStillExists"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{UK_Address.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
index 9c9c5fd33bd07..40154563774d5 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
@@ -9,6 +9,7 @@
 use Magento\Catalog\Model\Product;
 use Magento\Checkout\Block\Cart\Item\Renderer;
 use Magento\Quote\Model\Quote\Item;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -18,17 +19,22 @@ class RendererTest extends \PHPUnit\Framework\TestCase
     /**
      * @var Renderer
      */
-    protected $_renderer;
+    private $renderer;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $layout;
+    private $layout;
 
     /**
      * @var \Magento\Catalog\Block\Product\ImageBuilder|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $imageBuilder;
+    private $imageBuilder;
+
+    /**
+     * @var ItemResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $itemResolver;
 
     protected function setUp()
     {
@@ -41,17 +47,22 @@ protected function setUp()
             ->getMock();
         $context->expects($this->once())
             ->method('getLayout')
-            ->will($this->returnValue($this->layout));
+            ->willReturn($this->layout);
 
         $this->imageBuilder = $this->getMockBuilder(\Magento\Catalog\Block\Product\ImageBuilder::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->_renderer = $objectManagerHelper->getObject(
+        $this->itemResolver = $this->createMock(
+            ItemResolverInterface::class
+        );
+
+        $this->renderer = $objectManagerHelper->getObject(
             \Magento\Checkout\Block\Cart\Item\Renderer::class,
             [
                 'context' => $context,
                 'imageBuilder' => $this->imageBuilder,
+                'itemResolver' => $this->itemResolver,
             ]
         );
     }
@@ -59,7 +70,7 @@ protected function setUp()
     public function testGetProductForThumbnail()
     {
         $product = $this->_initProduct();
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
+        $productForThumbnail = $this->renderer->getProductForThumbnail();
         $this->assertEquals($product->getName(), $productForThumbnail->getName(), 'Invalid product was returned.');
     }
 
@@ -75,13 +86,18 @@ protected function _initProduct()
             Product::class,
             ['getName', '__wakeup', 'getIdentities']
         );
-        $product->expects($this->any())->method('getName')->will($this->returnValue('Parent Product'));
+        $product->expects($this->any())->method('getName')->willReturn('Parent Product');
 
         /** @var Item|\PHPUnit_Framework_MockObject_MockObject $item */
         $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($product));
+        $item->expects($this->any())->method('getProduct')->willReturn($product);
+
+        $this->itemResolver->expects($this->any())
+            ->method('getFinalProduct')
+            ->with($item)
+            ->willReturn($product);
 
-        $this->_renderer->setItem($item);
+        $this->renderer->setItem($item);
         return $product;
     }
 
@@ -91,14 +107,14 @@ public function testGetIdentities()
         $identities = [1 => 1, 2 => 2, 3 => 3];
         $product->expects($this->exactly(2))
             ->method('getIdentities')
-            ->will($this->returnValue($identities));
+            ->willReturn($identities);
 
-        $this->assertEquals($product->getIdentities(), $this->_renderer->getIdentities());
+        $this->assertEquals($product->getIdentities(), $this->renderer->getIdentities());
     }
 
     public function testGetIdentitiesFromEmptyItem()
     {
-        $this->assertEmpty($this->_renderer->getIdentities());
+        $this->assertEmpty($this->renderer->getIdentities());
     }
 
     /**
@@ -119,7 +135,7 @@ public function testGetProductPriceHtml()
         $this->layout->expects($this->atLeastOnce())
             ->method('getBlock')
             ->with('product.price.render.default')
-            ->will($this->returnValue($priceRender));
+            ->willReturn($priceRender);
 
         $priceRender->expects($this->once())
             ->method('render')
@@ -131,9 +147,9 @@ public function testGetProductPriceHtml()
                     'display_minimal_price' => true,
                     'zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST
                 ]
-            )->will($this->returnValue($priceHtml));
+            )->willReturn($priceHtml);
 
-        $this->assertEquals($priceHtml, $this->_renderer->getProductPriceHtml($product));
+        $this->assertEquals($priceHtml, $this->renderer->getProductPriceHtml($product));
     }
 
     public function testGetActions()
@@ -150,7 +166,7 @@ public function testGetActions()
 
         $this->layout->expects($this->once())
             ->method('getChildName')
-            ->with($this->_renderer->getNameInLayout(), 'actions')
+            ->with($this->renderer->getNameInLayout(), 'actions')
             ->willReturn($blockNameInLayout);
         $this->layout->expects($this->once())
             ->method('getBlock')
@@ -171,14 +187,14 @@ public function testGetActions()
             ->method('toHtml')
             ->willReturn($blockHtml);
 
-        $this->assertEquals($blockHtml, $this->_renderer->getActions($itemMock));
+        $this->assertEquals($blockHtml, $this->renderer->getActions($itemMock));
     }
 
     public function testGetActionsWithNoBlock()
     {
         $this->layout->expects($this->once())
             ->method('getChildName')
-            ->with($this->_renderer->getNameInLayout(), 'actions')
+            ->with($this->renderer->getNameInLayout(), 'actions')
             ->willReturn(false);
 
         /**
@@ -188,7 +204,7 @@ public function testGetActionsWithNoBlock()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->assertEquals('', $this->_renderer->getActions($itemMock));
+        $this->assertEquals('', $this->renderer->getActions($itemMock));
     }
 
     public function testGetImage()
@@ -198,14 +214,14 @@ public function testGetImage()
         $product = $this->createMock(Product::class);
         $imageMock = $this->createMock(Image::class);
 
-        $this->imageBuilder->expects(self::once())
+        $this->imageBuilder->expects($this->once())
             ->method('create')
             ->with($product, $imageId, $attributes)
             ->willReturn($imageMock);
 
-        static::assertInstanceOf(
+        $this->assertInstanceOf(
             Image::class,
-            $this->_renderer->getImage($product, $imageId, $attributes)
+            $this->renderer->getImage($product, $imageId, $attributes)
         );
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php b/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
index 8a7c2e951dd72..9a408f1ecd1c8 100644
--- a/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
@@ -5,12 +5,14 @@
  */
 namespace Magento\Checkout\Test\Unit\CustomerData;
 
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+
 class DefaultItemTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Checkout\CustomerData\DefaultItem
      */
-    protected $model;
+    private $model;
 
     /**
      * @var \Magento\Catalog\Helper\Image
@@ -22,6 +24,11 @@ class DefaultItemTest extends \PHPUnit\Framework\TestCase
      */
     private $configurationPool;
 
+    /**
+     * @var ItemResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $itemResolver;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -35,12 +42,14 @@ protected function setUp()
         $checkoutHelper = $this->getMockBuilder(\Magento\Checkout\Helper\Data::class)
             ->setMethods(['formatPrice'])->disableOriginalConstructor()->getMock();
         $checkoutHelper->expects($this->any())->method('formatPrice')->willReturn(5);
+        $this->itemResolver = $this->createMock(ItemResolverInterface::class);
         $this->model = $objectManager->getObject(
             \Magento\Checkout\CustomerData\DefaultItem::class,
             [
                 'imageHelper' => $this->imageHelper,
                 'configurationPool' => $this->configurationPool,
-                'checkoutHelper' => $checkoutHelper
+                'checkoutHelper' => $checkoutHelper,
+                'itemResolver' => $this->itemResolver,
             ]
         );
     }
@@ -73,6 +82,11 @@ public function testGetItemData()
         $this->imageHelper->expects($this->any())->method('getHeight')->willReturn(100);
         $this->configurationPool->expects($this->any())->method('getByProductType')->willReturn($product);
 
+        $this->itemResolver->expects($this->any())
+            ->method('getFinalProduct')
+            ->with($item)
+            ->will($this->returnValue($product));
+
         $itemData = $this->model->getItemData($item);
         $this->assertArrayHasKey('options', $itemData);
         $this->assertArrayHasKey('qty', $itemData);
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
index 5330d93b46f6a..993a01d922c1c 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/ImageProviderTest.php
@@ -11,25 +11,34 @@ class ImageProviderTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Checkout\Model\Cart\ImageProvider
      */
-    public $model;
+    private $model;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Quote\Api\CartItemRepositoryInterface
      */
-    protected $itemRepositoryMock;
+    private $itemRepositoryMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Checkout\CustomerData\ItemPoolInterface
      */
-    protected $itemPoolMock;
+    private $itemPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Checkout\CustomerData\DefaultItem
+     */
+    private $customerItem;
 
     protected function setUp()
     {
         $this->itemRepositoryMock = $this->createMock(\Magento\Quote\Api\CartItemRepositoryInterface::class);
         $this->itemPoolMock = $this->createMock(\Magento\Checkout\CustomerData\ItemPoolInterface::class);
+        $this->customerItem = $this->getMockBuilder(\Magento\Checkout\CustomerData\DefaultItem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->model = new \Magento\Checkout\Model\Cart\ImageProvider(
             $this->itemRepositoryMock,
-            $this->itemPoolMock
+            $this->itemPoolMock,
+            $this->customerItem
         );
     }
 
@@ -44,7 +53,7 @@ public function testGetImages()
         $expectedResult = [$itemId => $itemData['product_image']];
 
         $this->itemRepositoryMock->expects($this->once())->method('getList')->with($cartId)->willReturn([$itemMock]);
-        $this->itemPoolMock->expects($this->once())->method('getItemData')->with($itemMock)->willReturn($itemData);
+        $this->customerItem->expects($this->once())->method('getItemData')->with($itemMock)->willReturn($itemData);
 
         $this->assertEquals($expectedResult, $this->model->getImages($cartId));
     }
diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
index 4ebd594a28562..71dfd12bb4779 100644
--- a/app/code/Magento/Checkout/etc/di.xml
+++ b/app/code/Magento/Checkout/etc/di.xml
@@ -49,4 +49,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote">
+        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index 889689e6c0d16..f2aced01b3942 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -39,7 +39,7 @@
     </type>
     <preference for="Magento\Checkout\CustomerData\ItemPoolInterface"
                 type="Magento\Checkout\CustomerData\ItemPool"/>
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
+    <type name="Magento\Checkout\CustomerData\ItemPool">
         <arguments>
             <argument name="defaultItemId" xsi:type="string">Magento\Checkout\CustomerData\DefaultItem</argument>
         </arguments>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
index 086cca814bec1..dcd726076d900 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
@@ -16,8 +16,8 @@
             <!--/ko-->
             <!-- ko if: (isCustomerLoggedIn && customerHasAddresses) -->
             <div class="choice field">
-                <input type="checkbox" class="checkbox" id="billing-save-in-address-book" data-bind="checked: saveInAddressBook" />
-                <label class="label" for="billing-save-in-address-book">
+                <input type="checkbox" class="checkbox"  data-bind="checked: saveInAddressBook, attr: {id: 'billing-save-in-address-book-' + getCode($parent)}" />
+                <label class="label" data-bind="attr: {for: 'billing-save-in-address-book-' + getCode($parent)}" >
                     <span data-bind="i18n: 'Save in address book'"></span>
                 </label>
             </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html
index 981541e7251e7..eb218bbee9941 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html
@@ -8,6 +8,6 @@
       data-bind="attr: {'style': 'height: ' + getHeight($parents[1]) + 'px; width: ' + getWidth($parents[1]) + 'px;' }">
     <span class="product-image-wrapper">
         <img
-            data-bind="attr: {'src': getSrc($parents[1]), 'width': getWidth($parents[1]), 'height': getHeight($parents[1]), 'alt': getAlt($parents[1]) }"/>
+            data-bind="attr: {'src': getSrc($parents[1]), 'width': getWidth($parents[1]), 'height': getHeight($parents[1]), 'alt': getAlt($parents[1]), 'title': getAlt($parents[1]) }"/>
     </span>
 </span>
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
index 76b6aeb013285..3aaf40e7d0ab2 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
@@ -26,18 +26,18 @@ public function execute()
                 $model->load($id);
                 $model->delete();
                 // display success message
-                $this->messageManager->addSuccess(__('You deleted the block.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the block.'));
                 // go to grid
                 return $resultRedirect->setPath('*/*/');
             } catch (\Exception $e) {
                 // display error message
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 // go back to edit form
                 return $resultRedirect->setPath('*/*/edit', ['block_id' => $id]);
             }
         }
         // display error message
-        $this->messageManager->addError(__('We can\'t find a block to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a block to delete.'));
         // go to grid
         return $resultRedirect->setPath('*/*/');
     }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
index d4c0517621144..8756089063237 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
@@ -42,7 +42,7 @@ public function execute()
         if ($id) {
             $model->load($id);
             if (!$model->getId()) {
-                $this->messageManager->addError(__('This block no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This block no longer exists.'));
                 /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('*/*/');
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
index e267c568fa9e5..3a7e73fbe5eaa 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
@@ -46,6 +46,7 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
index cff9c8a39b746..92bc7ad71f590 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
@@ -60,7 +60,7 @@ public function execute()
             $block->delete();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize));
+        $this->messageManager->addSuccessMessage(__('A total of %1 record(s) have been deleted.', $collectionSize));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
index c604e683f9aee..16c99e9857c33 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
@@ -26,21 +26,26 @@ public function execute()
         $id = $this->getRequest()->getParam('page_id');
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
+        
         if ($id) {
             $title = "";
             try {
                 // init model and delete
                 $model = $this->_objectManager->create(\Magento\Cms\Model\Page::class);
                 $model->load($id);
+                
                 $title = $model->getTitle();
                 $model->delete();
+                
                 // display success message
-                $this->messageManager->addSuccess(__('The page has been deleted.'));
+                $this->messageManager->addSuccessMessage(__('The page has been deleted.'));
+                
                 // go to grid
-                $this->_eventManager->dispatch(
-                    'adminhtml_cmspage_on_delete',
-                    ['title' => $title, 'status' => 'success']
-                );
+                $this->_eventManager->dispatch('adminhtml_cmspage_on_delete', [
+                    'title' => $title,
+                    'status' => 'success'
+                ]);
+                
                 return $resultRedirect->setPath('*/*/');
             } catch (\Exception $e) {
                 $this->_eventManager->dispatch(
@@ -48,13 +53,15 @@ public function execute()
                     ['title' => $title, 'status' => 'fail']
                 );
                 // display error message
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 // go back to edit form
                 return $resultRedirect->setPath('*/*/edit', ['page_id' => $id]);
             }
         }
+        
         // display error message
-        $this->messageManager->addError(__('We can\'t find a page to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a page to delete.'));
+        
         // go to grid
         return $resultRedirect->setPath('*/*/');
     }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
index ca50a935ce915..6d51c28b6aca7 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
@@ -76,7 +76,7 @@ public function execute()
         if ($id) {
             $model->load($id);
             if (!$model->getId()) {
-                $this->messageManager->addError(__('This page no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This page no longer exists.'));
                 /** \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
                 $resultRedirect = $this->resultRedirectFactory->create();
                 return $resultRedirect->setPath('*/*/');
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
index 6d75f490d42dc..8774d7e69adfe 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
@@ -57,6 +57,7 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
index a711f20d65639..a1d32aa97a382 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
@@ -59,10 +59,11 @@ public function execute()
             $page->delete();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize));
+        $this->messageManager->addSuccessMessage(__('A total of %1 record(s) have been deleted.', $collectionSize));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        
         return $resultRedirect->setPath('*/*/');
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
index e39c2115f961e..a85b8ecd5e5a1 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
@@ -59,7 +59,9 @@ public function execute()
             $item->save();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been disabled.', $collection->getSize()));
+        $this->messageManager->addSuccessMessage(
+            __('A total of %1 record(s) have been disabled.', $collection->getSize())
+        );
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
index 8278c28a1e696..3f26769e4c9e9 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
@@ -59,7 +59,9 @@ public function execute()
             $item->save();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been enabled.', $collection->getSize()));
+        $this->messageManager->addSuccessMessage(
+            __('A total of %1 record(s) have been enabled.', $collection->getSize())
+        );
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
index 57f92a713ecb0..9b8933c8dba2e 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
@@ -119,7 +119,7 @@ public function validateRequireEntry(array $data)
         foreach ($data as $field => $value) {
             if (in_array($field, array_keys($requiredFields)) && $value == '') {
                 $errorNo = false;
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('To apply changes you should fill in hidden required "%1" field', $requiredFields[$field])
                 );
             }
@@ -140,6 +140,7 @@ private function validateData($data, $layoutXmlValidator)
             if (!empty($data['layout_update_xml']) && !$layoutXmlValidator->isValid($data['layout_update_xml'])) {
                 return false;
             }
+            
             if (!empty($data['custom_layout_update_xml']) &&
                 !$layoutXmlValidator->isValid($data['custom_layout_update_xml'])
             ) {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
index 525fd31052db8..13765e9faca04 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
@@ -39,7 +39,7 @@ public function execute()
         try {
             $this->_objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class)->getCurrentPath();
         } catch (\Exception $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         }
         $this->_initAction();
         /** @var \Magento\Framework\View\Result\Layout $resultLayout */
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
index 73e2d6256ce61..5df8ebab2d380 100644
--- a/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
@@ -27,7 +27,7 @@
         <data key="identifier" unique="suffix">testpage-</data>
     </entity>
     <entity name="simpleCmsPage" type="cms_page">
-        <data key="title">Test CMS Page</data>
+        <data key="title" unique="suffix">Test CMS Page</data>
         <data key="content_heading">Test Content Heading</data>
         <data key="content">Sample page content. Yada yada yada.</data>
         <data key="identifier" unique="suffix">test-page-</data>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
index c3797d758d860..50441574d7a0d 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
@@ -17,6 +17,8 @@
             <description value="Admin should be able to create a CMS page with widget type: Recently Compared Products"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-83792"/>
+            <!--Skip test due to MC-1284-->
+            <group value="skip"/>
         </annotations>
         <!--Main test-->
         <before>
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php
index ff1ed408eb131..55e8382d9ca23 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php
@@ -134,10 +134,10 @@ public function testDeleteAction()
             ->with($this->blockId);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You deleted the block.'));
         $this->messageManagerMock->expects($this->never())
-            ->method('addError');
+            ->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
@@ -154,10 +154,10 @@ public function testDeleteActionNoId()
             ->willReturn(null);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('We can\'t find a block to delete.'));
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
@@ -181,10 +181,10 @@ public function testDeleteActionThrowsException()
             ->willThrowException(new \Exception(__($errorMsg)));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($errorMsg);
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php
index 875dde9fb226b..a28a1b793d943 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php
@@ -139,7 +139,7 @@ public function testEditActionBlockNoExists()
             ->willReturn(null);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('This block no longer exists.'));
 
         $this->resultRedirectFactoryMock->expects($this->atLeastOnce())
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
index 2dc14154c85e5..39a7d0d74e4d8 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
@@ -68,9 +68,9 @@ public function testMassDeleteAction()
             ->willReturn(new \ArrayIterator($collection));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('A total of %1 record(s) have been deleted.', $deletedBlocksCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
+        $this->messageManagerMock->expects($this->never())->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php
index 7f994bf5b3df5..09b36bc41d405 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php
@@ -124,10 +124,10 @@ public function testDeleteAction()
             ->method('delete');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('The page has been deleted.'));
         $this->messageManagerMock->expects($this->never())
-            ->method('addError');
+            ->method('addErrorMessage');
 
         $this->eventManagerMock->expects($this->once())
             ->method('dispatch')
@@ -151,10 +151,10 @@ public function testDeleteActionNoId()
             ->willReturn(null);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('We can\'t find a page to delete.'));
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
@@ -195,10 +195,10 @@ public function testDeleteActionThrowsException()
             );
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($errorMsg);
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/EditTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/EditTest.php
index 335abb837523a..5ea5ce5a9fdbb 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/EditTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/EditTest.php
@@ -139,7 +139,7 @@ public function testEditActionPageNoExists()
             ->willReturn(null);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('This page no longer exists.'));
 
         $this->resultRedirectFactoryMock->expects($this->atLeastOnce())
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
index 8f1a651b0a7e1..f51ab152ba2a4 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
@@ -68,9 +68,9 @@ public function testMassDeleteAction()
             ->willReturn(new \ArrayIterator($collection));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('A total of %1 record(s) have been deleted.', $deletedPagesCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
+        $this->messageManagerMock->expects($this->never())->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
index 0185654434be1..5b80dd1873d5c 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
@@ -67,9 +67,9 @@ public function testMassDisableAction()
             ->willReturn(new \ArrayIterator($collection));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('A total of %1 record(s) have been disabled.', $disabledPagesCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
+        $this->messageManagerMock->expects($this->never())->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
index b5907e7b3ffed..16b3dfe4ee638 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
@@ -67,9 +67,9 @@ public function testMassEnableAction()
             ->willReturn(new \ArrayIterator($collection));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('A total of %1 record(s) have been enabled.', $enabledPagesCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
+        $this->messageManagerMock->expects($this->never())->method('addErrorMessage');
 
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php
index 31d99df5f6289..d13dfc628201d 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php
@@ -65,7 +65,7 @@ public function testValidateRequireEntry()
             'title' => ''
         ];
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('To apply changes you should fill in hidden required "%1" field', 'Page Title'));
 
         $this->assertFalse($this->postDataProcessor->validateRequireEntry($postData));
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
index c24e578c9109c..8d5aaa5830b92 100644
--- a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
@@ -12,6 +12,9 @@
     <page name="AdminContentManagementPage" url="admin/system_config/edit/section/cms/" area="admin" module="Magento_Config">
         <section name="ContentManagementSection"/>
     </page>
+    <page name="CatalogConfigPage" url="admin/system_config/edit/section/catalog/" area="admin" module="Magento_Config">
+        <section name="ContentManagementSection"/>
+    </page>
     <page name="AdminSalesTaxClassPage" url="admin/system_config/edit/section/tax/" area="admin" module="Magento_Config">
         <section name="SalesTaxClassSection"/>
     </page>
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml
new file mode 100644
index 0000000000000..1a99ff6533dbb
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminSalesConfigPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminSalesConfigPage" url="admin/system_config/edit/section/sales/{{var1}}" area="admin" parameterized="true" module="Magento_Config">
+        <section name="AdminSalesConfigSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
new file mode 100644
index 0000000000000..4897e8415c1b8
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminSalesConfigSection">
+        <element name="enableMAPUseSystemValue" type="checkbox" selector="#sales_msrp_enabled_inherit"/>
+        <element name="enableMAPSelect" type="select" selector="#sales_msrp_enabled"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml b/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml
new file mode 100644
index 0000000000000..78b9d1f72f66d
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CatalogSection">
+        <element name="storefront" type="select" selector="#catalog_frontend-head"/>
+        <element name="CheckIfTabExpand" type="button" selector="#catalog_frontend-head:not(.open)"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml b/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml
new file mode 100644
index 0000000000000..0e1a6f4717c6b
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Test/ConfigurationTest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="VerifyAllowDynamicMediaURLsSettingIsRemoved">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Dynamic Media URL"/>
+            <title value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
+            <description value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="MC-1364"/>
+            <testCaseId value="MC-3178"/>
+            <group value="configuration"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPage" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick stepKey="expandStorefrontTab" selector="{{CatalogSection.storefront}}" dependentSelector="{{CatalogSection.CheckIfTabExpand}}" visible="true" />
+        <dontSee stepKey="dontSeeDynamicMediaURLsSetting" userInput="Allow Dynamic Media URLs"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
index 151bf5aa9263e..fdbd8560c2664 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -25,6 +25,12 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
     /**
      * Error codes.
      */
+    const ERROR_ATTRIBUTE_CODE_DOES_NOT_EXIST = 'attrCodeDoesNotExist';
+
+    const ERROR_ATTRIBUTE_CODE_NOT_GLOBAL_SCOPE = 'attrCodeNotGlobalScope';
+
+    const ERROR_ATTRIBUTE_CODE_NOT_TYPE_SELECT = 'attrCodeNotTypeSelect';
+
     const ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER = 'attrCodeIsNotSuper';
 
     const ERROR_INVALID_OPTION_VALUE = 'invalidOptionValue';
@@ -39,10 +45,19 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * Validation failure message template definitions
      *
      * @var array
+     *
+     * Note: Some of these messages exceed maximum limit of 120 characters per line. Split up accordingly.
      */
     protected $_messageTemplates = [
-        self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => 'Attribute with code "%s" is not super',
-        self::ERROR_INVALID_OPTION_VALUE => 'Invalid option value for attribute "%s"',
+        self::ERROR_ATTRIBUTE_CODE_DOES_NOT_EXIST => 'Column configurable_variations: Attribute with code ' .
+            '"%s" does not exist or is missing from product attribute set',
+        self::ERROR_ATTRIBUTE_CODE_NOT_GLOBAL_SCOPE => 'Column configurable_variations: Attribute with code ' .
+            '"%s" is not super - it needs to have Global Scope',
+        self::ERROR_ATTRIBUTE_CODE_NOT_TYPE_SELECT => 'Column configurable_variations: Attribute with code ' .
+            '"%s" is not super - it needs to be Input Type of Dropdown, Visual Swatch or Text Swatch',
+        self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => 'Column configurable_variations: Attribute with code ' .
+            '"%s" is not super',
+        self::ERROR_INVALID_OPTION_VALUE => 'Column configurable_variations: Invalid option value for attribute "%s"',
         self::ERROR_INVALID_WEBSITE => 'Invalid website code for super attribute',
         self::ERROR_DUPLICATED_VARIATIONS => 'SKU %s contains duplicated variations',
         self::ERROR_UNIDENTIFIABLE_VARIATION => 'Configurable variation "%s" is unidentifiable',
@@ -289,10 +304,11 @@ protected function _isParticularAttributesValid(array $rowData, $rowNum)
     {
         if (!empty($rowData['_super_attribute_code'])) {
             $superAttrCode = $rowData['_super_attribute_code'];
-
             if (!$this->_isAttributeSuper($superAttrCode)) {
-                // check attribute superity
-                $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER, $rowNum, $superAttrCode);
+                // Identify reason why attribute is not super:
+                if (!$this->identifySuperAttributeError($superAttrCode, $rowNum)) {
+                    $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER, $rowNum, $superAttrCode);
+                }
                 return false;
             } elseif (isset($rowData['_super_attribute_option']) && strlen($rowData['_super_attribute_option'])) {
                 $optionKey = strtolower($rowData['_super_attribute_option']);
@@ -305,6 +321,66 @@ protected function _isParticularAttributesValid(array $rowData, $rowNum)
         return true;
     }
 
+    /**
+     * Identify exactly why a super attribute code is not super.
+     *
+     * @param string $superAttrCode
+     * @param int $rowNum
+     * @return bool
+     */
+    private function identifySuperAttributeError($superAttrCode, $rowNum)
+    {
+        // This attribute code is not a super attribute. Need to give a clearer message why?
+        $reasonFound = false;
+        $codeExists = false;
+
+        // Does this attribute code exist?
+        $sourceAttribute = $this->doesSuperAttributeExist($superAttrCode);
+        if (is_array($sourceAttribute)) {
+            $codeExists = true;
+            // Does attribute have the correct settings?
+            if (isset($sourceAttribute['is_global']) && $sourceAttribute['is_global'] !== '1') {
+                $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_NOT_GLOBAL_SCOPE, $rowNum, $superAttrCode);
+                $reasonFound = true;
+            } elseif (isset($sourceAttribute['type']) && $sourceAttribute['type'] !== 'select') {
+                $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_NOT_TYPE_SELECT, $rowNum, $superAttrCode);
+                $reasonFound = true;
+            }
+        }
+
+        if ($codeExists === false) {
+            $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_DOES_NOT_EXIST, $rowNum, $superAttrCode);
+            $reasonFound = true;
+        }
+
+        return $reasonFound;
+    }
+
+    /**
+     * Does the super attribute exist in the current attribute set?
+     *
+     * @param string $superAttrCode
+     * @return array
+     */
+    private function doesSuperAttributeExist($superAttrCode)
+    {
+        $returnAttributeArray = null;
+        if (is_array(self::$commonAttributesCache)) {
+            $filteredAttribute = array_filter(
+                self::$commonAttributesCache,
+                function ($element) use ($superAttrCode) {
+                    return $element['code'] == $superAttrCode;
+                }
+            );
+
+            // Return the first element of the filtered array (if found).
+            if (count($filteredAttribute)) {
+                $returnAttributeArray = array_shift($filteredAttribute);
+            }
+        }
+        return $returnAttributeArray;
+    }
+
     /**
      * Array of SKU to array of super attribute values for all products.
      *
diff --git a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
index 2698da8dcb368..3b657dd1ab2d0 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
@@ -19,6 +19,8 @@ class Configurable extends Renderer implements IdentityInterface
 {
     /**
      * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     * @deprecated moved to model because of class refactoring
+     * @see \Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver::CONFIG_THUMBNAIL_SOURCE
      */
     const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/configurable_product_image';
 
@@ -55,29 +57,6 @@ public function getOptionList()
         return $this->_productConfig->getOptions($this->getItem());
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProductForThumbnail()
-    {
-        /**
-         * Show parent product thumbnail if it must be always shown according to the related setting in system config
-         * or if child thumbnail is not available
-         */
-        if ($this->_scopeConfig->getValue(
-            self::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE
-          || !($this->getChildProduct()
-          && $this->getChildProduct()->getThumbnail() && $this->getChildProduct()->getThumbnail() != 'no_selection')
-        ) {
-            $product = $this->getProduct();
-        } else {
-            $product = $this->getChildProduct();
-        }
-        return $product;
-    }
-
     /**
      * Return identifiers for produced content
      *
diff --git a/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php b/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
deleted file mode 100644
index 3a9ed653305c5..0000000000000
--- a/app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\ConfigurableProduct\CustomerData;
-
-use Magento\Catalog\Model\Config\Source\Product\Thumbnail as ThumbnailSource;
-use Magento\Checkout\CustomerData\DefaultItem;
-
-/**
- * Configurable item
- */
-class ConfigurableItem extends DefaultItem
-{
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @param \Magento\Catalog\Helper\Image $imageHelper
-     * @param \Magento\Msrp\Helper\Data $msrpHelper
-     * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
-     * @param \Magento\Checkout\Helper\Data $checkoutHelper
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Escaper|null $escaper
-     */
-    public function __construct(
-        \Magento\Catalog\Helper\Image $imageHelper,
-        \Magento\Msrp\Helper\Data $msrpHelper,
-        \Magento\Framework\UrlInterface $urlBuilder,
-        \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool,
-        \Magento\Checkout\Helper\Data $checkoutHelper,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Escaper $escaper = null
-    ) {
-        parent::__construct(
-            $imageHelper,
-            $msrpHelper,
-            $urlBuilder,
-            $configurationPool,
-            $checkoutHelper,
-            $escaper
-        );
-        $this->_scopeConfig = $scopeConfig;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getProductForThumbnail()
-    {
-        /**
-         * Show parent product thumbnail if it must be always shown according to the related setting in system config
-         * or if child thumbnail is not available
-         */
-        $config = $this->_scopeConfig->getValue(
-            \Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-
-        $product = $config == ThumbnailSource::OPTION_USE_PARENT_IMAGE
-            || (!$this->getChildProduct()->getThumbnail() || $this->getChildProduct()->getThumbnail() == 'no_selection')
-            ? $this->getProduct()
-            : $this->getChildProduct();
-
-        return $product;
-    }
-
-    /**
-     * Get item configurable child product
-     *
-     * @return \Magento\Catalog\Model\Product
-     */
-    protected function getChildProduct()
-    {
-        if ($option = $this->item->getOptionByCode('simple_product')) {
-            return $option->getProduct();
-        }
-        return $this->getProduct();
-    }
-}
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php b/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php
new file mode 100644
index 0000000000000..6c33ecc138aea
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Configuration/Item/ItemProductResolver.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Catalog\Model\Product;
+
+/**
+ * {@inheritdoc}
+ */
+class ItemProductResolver implements ItemResolverInterface
+{
+    /**
+     * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     */
+    const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/configurable_product_image';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFinalProduct(ItemInterface $item) : ProductInterface
+    {
+        /**
+         * Show parent product thumbnail if it must be always shown according to the related setting in system config
+         * or if child thumbnail is not available.
+         */
+        $parentProduct = $item->getProduct();
+        $finalProduct = $parentProduct;
+        $childProduct = $this->getChildProduct($item);
+        if ($childProduct !== $parentProduct) {
+            $configValue = $this->scopeConfig->getValue(
+                self::CONFIG_THUMBNAIL_SOURCE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            );
+            $childThumb = $childProduct->getData('thumbnail');
+            $finalProduct =
+                ($configValue == Thumbnail::OPTION_USE_PARENT_IMAGE) || (!$childThumb || $childThumb == 'no_selection')
+                    ? $parentProduct
+                    : $childProduct;
+        }
+        return $finalProduct;
+    }
+
+    /**
+     * Get item configurable child product.
+     *
+     * @param ItemInterface $item
+     * @return Product
+     */
+    private function getChildProduct(ItemInterface $item) : Product
+    {
+        $option = $item->getOptionByCode('simple_product');
+        $product = $item->getProduct();
+        if ($option) {
+            $product = $option->getProduct();
+        }
+        return $product;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/composer.json b/app/code/Magento/ConfigurableProduct/Test/Mftf/composer.json
index 78063660f0025..64ef047693cf0 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/composer.json
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/composer.json
@@ -14,12 +14,12 @@
         "magento/functional-test-module-customer": "100.0.0-dev",
         "magento/functional-test-module-eav": "100.0.0-dev",
         "magento/functional-test-module-media-storage": "100.0.0-dev",
-        "magento/functional-test-module-msrp": "100.0.0-dev",
         "magento/functional-test-module-quote": "100.0.0-dev",
         "magento/functional-test-module-store": "100.0.0-dev",
         "magento/functional-test-module-ui": "100.0.0-dev"
     },
     "suggest": {
+        "magento/functional-test-module-msrp": "100.0.0-dev",
         "magento/functional-test-module-webapi": "100.0.0-dev",
         "magento/functional-test-module-sales": "100.0.0-dev",
         "magento/functional-test-module-product-video": "100.0.0-dev",
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
index e199841cbcdc4..9a21431ffcfa5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
@@ -11,154 +11,48 @@
 class ConfigurableTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Framework\View\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_configManager;
+    private $configManager;
 
     /** @var \Magento\Catalog\Helper\Image|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_imageHelper;
+    private $imageHelper;
 
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_scopeConfig;
+    private $scopeConfig;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $productConfigMock;
+    private $productConfigMock;
 
     /** @var Renderer */
-    protected $_renderer;
+    private $renderer;
 
     protected function setUp()
     {
         parent::setUp();
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_configManager = $this->createMock(\Magento\Framework\View\ConfigInterface::class);
-        $this->_imageHelper = $this->createPartialMock(
+        $this->configManager = $this->createMock(\Magento\Framework\View\ConfigInterface::class);
+        $this->imageHelper = $this->createPartialMock(
             \Magento\Catalog\Helper\Image::class,
             ['init', 'resize', '__toString']
         );
-        $this->_scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->productConfigMock = $this->createMock(\Magento\Catalog\Helper\Product\Configuration::class);
-        $this->_renderer = $objectManagerHelper->getObject(
+        $this->renderer = $objectManagerHelper->getObject(
             \Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable::class,
             [
-                'viewConfig' => $this->_configManager,
-                'imageHelper' => $this->_imageHelper,
-                'scopeConfig' => $this->_scopeConfig,
+                'viewConfig' => $this->configManager,
+                'imageHelper' => $this->imageHelper,
+                'scopeConfig' => $this->scopeConfig,
                 'productConfig' => $this->productConfigMock
             ]
         );
     }
 
-    /**
-     * Child thumbnail is available and config option is not set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnail()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['childProduct'],
-            $productForThumbnail,
-            'Child product was expected to be returned.'
-        );
-    }
-
-    /**
-     * Child thumbnail is not available and config option is not set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnailChildThumbnailNotAvailable()
-    {
-        $childHasThumbnail = false;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned.'
-        );
-    }
-
-    /**
-     * Child thumbnail is available and config option is set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnailConfigUseParent()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = true;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned ' .
-            'if "checkout/cart/configurable_product_image option" is set to "parent" in system config.'
-        );
-    }
-
-    /**
-     * Initialize parent configurable product and child product.
-     *
-     * @param bool $childHasThumbnail
-     * @param bool $useParentThumbnail
-     * @return \Magento\Catalog\Model\Product[]|\PHPUnit_Framework_MockObject_MockObject[]
-     */
-    protected function _initProducts($childHasThumbnail = true, $useParentThumbnail = false)
-    {
-        /** Set option which can force usage of parent product thumbnail when configurable product is displayed */
-        $thumbnailToBeUsed = $useParentThumbnail
-            ? ThumbnailSource::OPTION_USE_PARENT_IMAGE
-            : ThumbnailSource::OPTION_USE_OWN_IMAGE;
-        $this->_scopeConfig->expects(
-            $this->any()
-        )->method(
-            'getValue'
-        )->with(
-            Renderer::CONFIG_THUMBNAIL_SOURCE
-        )->will(
-            $this->returnValue($thumbnailToBeUsed)
-        );
-
-        /** Initialized parent product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $parentProduct */
-        $parentProduct = $this->createMock(\Magento\Catalog\Model\Product::class);
-
-        /** Initialize child product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $childProduct */
-        $childProduct = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getThumbnail', '__wakeup']);
-        $childThumbnail = $childHasThumbnail ? 'thumbnail.jpg' : 'no_selection';
-        $childProduct->expects($this->any())->method('getThumbnail')->will($this->returnValue($childThumbnail));
-
-        /** Mock methods which return parent and child products */
-        /** @var \Magento\Quote\Model\Quote\Item\Option|\PHPUnit_Framework_MockObject_MockObject $itemOption */
-        $itemOption = $this->createMock(\Magento\Quote\Model\Quote\Item\Option::class);
-        $itemOption->expects($this->any())->method('getProduct')->will($this->returnValue($childProduct));
-        /** @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject $item */
-        $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($parentProduct));
-        $item->expects(
-            $this->any()
-        )->method(
-            'getOptionByCode'
-        )->with(
-            'simple_product'
-        )->will(
-            $this->returnValue($itemOption)
-        );
-        $this->_renderer->setItem($item);
-
-        return ['parentProduct' => $parentProduct, 'childProduct' => $childProduct];
-    }
-
     public function testGetOptionList()
     {
         $itemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $this->_renderer->setItem($itemMock);
+        $this->renderer->setItem($itemMock);
         $this->productConfigMock->expects($this->once())->method('getOptions')->with($itemMock);
-        $this->_renderer->getOptionList();
+        $this->renderer->getOptionList();
     }
 
     public function testGetIdentities()
@@ -168,7 +62,7 @@ public function testGetIdentities()
         $product->expects($this->exactly(2))->method('getIdentities')->will($this->returnValue($productTags));
         $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
         $item->expects($this->exactly(2))->method('getProduct')->will($this->returnValue($product));
-        $this->_renderer->setItem($item);
-        $this->assertEquals(array_merge($productTags, $productTags), $this->_renderer->getIdentities());
+        $this->renderer->setItem($item);
+        $this->assertEquals(array_merge($productTags, $productTags), $this->renderer->getIdentities());
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 959c036981878..b03a8a65702be 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -14,12 +14,12 @@
         "magento/module-customer": "*",
         "magento/module-eav": "*",
         "magento/module-media-storage": "*",
-        "magento/module-msrp": "*",
         "magento/module-quote": "*",
         "magento/module-store": "*",
         "magento/module-ui": "*"
     },
     "suggest": {
+        "magento/module-msrp": "*",
         "magento/module-webapi": "*",
         "magento/module-sales": "*",
         "magento/module-product-video": "*",
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index 15dbc53a5447a..bba9cdae0debb 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -205,4 +205,11 @@
     <type name="Magento\Catalog\Model\Product">
         <plugin name="product_identities_extender" type="Magento\ConfigurableProduct\Model\Plugin\ProductIdentitiesExtender" />
     </type>
+    <type name="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite">
+        <arguments>
+            <argument name="itemResolvers" xsi:type="array">
+                <item name="configurable" xsi:type="string">Magento\ConfigurableProduct\Model\Product\Configuration\Item\ItemProductResolver</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
index 592b0292c98ab..bb830c36b929d 100644
--- a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
@@ -7,13 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
-        <arguments>
-            <argument name="itemMap" xsi:type="array">
-                <item name="configurable" xsi:type="string">Magento\ConfigurableProduct\CustomerData\ConfigurableItem</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
         <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
     </type>
diff --git a/app/code/Magento/Cookie/view/frontend/web/js/notices.js b/app/code/Magento/Cookie/view/frontend/web/js/notices.js
index 253950747ce14..f1f3754ea54b1 100644
--- a/app/code/Magento/Cookie/view/frontend/web/js/notices.js
+++ b/app/code/Magento/Cookie/view/frontend/web/js/notices.js
@@ -29,7 +29,7 @@ define([
                 });
 
                 if ($.mage.cookies.get(this.options.cookieName)) {
-                    window.location.reload();
+                    this.element.hide();
                 } else {
                     window.location.href = this.options.noCookiesUrl;
                 }
diff --git a/app/code/Magento/Cron/etc/cron_groups.xml b/app/code/Magento/Cron/etc/cron_groups.xml
index a01426eab723e..9aa57662427c8 100644
--- a/app/code/Magento/Cron/etc/cron_groups.xml
+++ b/app/code/Magento/Cron/etc/cron_groups.xml
@@ -11,8 +11,8 @@
         <schedule_ahead_for>20</schedule_ahead_for>
         <schedule_lifetime>15</schedule_lifetime>
         <history_cleanup_every>10</history_cleanup_every>
-        <history_success_lifetime>10080</history_success_lifetime>
-        <history_failure_lifetime>10080</history_failure_lifetime>
+        <history_success_lifetime>60</history_success_lifetime>
+        <history_failure_lifetime>4320</history_failure_lifetime>
         <use_separate_process>0</use_separate_process>
     </group>
 </config>
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
index 27d8ddd99344c..bb94063226f41 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -11,8 +11,13 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Helper\Address;
@@ -29,12 +34,13 @@
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Data\Form\FormKey\Validator;
+use Magento\Customer\Controller\AbstractAccount;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CreatePost extends \Magento\Customer\Controller\AbstractAccount
+class CreatePost extends AbstractAccount implements CsrfAwareActionInterface
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
@@ -273,6 +279,31 @@ protected function extractAddress()
         return $addressDataObject;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $url = $this->urlModel->getUrl('*/*/create', ['_secure' => true]);
+        $resultRedirect->setUrl($this->_redirect->error($url));
+
+        return new InvalidRequestException(
+            $resultRedirect,
+            [new Phrase('Invalid Form Key. Please refresh the page.')]
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return null;
+    }
+
     /**
      * Create customer account action
      *
@@ -282,17 +313,19 @@ protected function extractAddress()
      */
     public function execute()
     {
-        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
         if ($this->session->isLoggedIn() || !$this->registration->isAllowed()) {
             $resultRedirect->setPath('*/*/');
             return $resultRedirect;
         }
 
-        if (!$this->getRequest()->isPost() || !$this->formKeyValidator->validate($this->getRequest())) {
+        if (!$this->getRequest()->isPost()
+            || !$this->formKeyValidator->validate($this->getRequest())
+        ) {
             $url = $this->urlModel->getUrl('*/*/create', ['_secure' => true]);
-            $resultRedirect->setUrl($this->_redirect->error($url));
-            return $resultRedirect;
+            return $this->resultRedirectFactory->create()
+                ->setUrl($this->_redirect->error($url));
         }
 
         $this->session->regenerateId();
@@ -375,8 +408,7 @@ public function execute()
 
         $this->session->setCustomerFormData($this->getRequest()->getPostValue());
         $defaultUrl = $this->urlModel->getUrl('*/*/create', ['_secure' => true]);
-        $resultRedirect->setUrl($this->_redirect->error($defaultUrl));
-        return $resultRedirect;
+        return $resultRedirect->setUrl($this->_redirect->error($defaultUrl));
     }
 
     /**
diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
index a10795533a2a5..aa5e088f9c892 100644
--- a/app/code/Magento/Customer/Controller/Account/EditPost.php
+++ b/app/code/Magento/Customer/Controller/Account/EditPost.php
@@ -10,8 +10,11 @@
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Customer\Model\Customer\Mapper;
 use Magento\Customer\Model\EmailNotificationInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
@@ -21,12 +24,14 @@
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
 use Magento\Framework\Exception\State\UserLockedException;
+use Magento\Customer\Controller\AbstractAccount;
+use Magento\Framework\Phrase;
 
 /**
  * Class EditPost
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class EditPost extends \Magento\Customer\Controller\AbstractAccount
+class EditPost extends AbstractAccount implements CsrfAwareActionInterface
 {
     /**
      * Form code for data extractor
@@ -131,6 +136,30 @@ private function getEmailNotification()
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setPath('*/*/edit');
+
+        return new InvalidRequestException(
+            $resultRedirect,
+            [new Phrase('Invalid Form Key. Please refresh the page.')]
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return null;
+    }
+
     /**
      * Change customer email or password action
      *
@@ -190,7 +219,10 @@ public function execute()
             $this->session->setCustomerFormData($this->getRequest()->getPostValue());
         }
 
-        return $resultRedirect->setPath('*/*/edit');
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setPath('*/*/edit');
+        return $resultRedirect;
     }
 
     /**
diff --git a/app/code/Magento/Customer/Controller/Account/Login.php b/app/code/Magento/Customer/Controller/Account/Login.php
index 51c244ec0cfe9..d685191bf43b5 100644
--- a/app/code/Magento/Customer/Controller/Account/Login.php
+++ b/app/code/Magento/Customer/Controller/Account/Login.php
@@ -9,8 +9,9 @@
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\Customer\Controller\AbstractAccount;
 
-class Login extends \Magento\Customer\Controller\AbstractAccount
+class Login extends AbstractAccount
 {
     /**
      * @var Session
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
index 31e2a3aeca9e3..5c7eee78e5f4a 100644
--- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -11,17 +11,23 @@
 use Magento\Customer\Model\Session;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Model\Url as CustomerUrl;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Customer\Controller\AbstractAccount;
+use Magento\Framework\Phrase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class LoginPost extends \Magento\Customer\Controller\AbstractAccount
+class LoginPost extends AbstractAccount implements CsrfAwareActionInterface
 {
     /**
      * @var \Magento\Customer\Api\AccountManagementInterface
@@ -131,6 +137,30 @@ private function getCookieMetadataFactory()
         return $this->cookieMetadataFactory;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setPath('*/*/');
+
+        return new InvalidRequestException(
+            $resultRedirect,
+            [new Phrase('Invalid Form Key. Please refresh the page.')]
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return null;
+    }
+
     /**
      * Login post action
      *
@@ -172,31 +202,28 @@ public function execute()
                         'This account is not confirmed. <a href="%1">Click here</a> to resend confirmation email.',
                         $value
                     );
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (UserLockedException $e) {
                     $message = __(
                         'The account sign-in was incorrect or your account is disabled temporarily. '
                         . 'Please wait and try again later.'
                     );
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (AuthenticationException $e) {
                     $message = __(
                         'The account sign-in was incorrect or your account is disabled temporarily. '
                         . 'Please wait and try again later.'
                     );
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (LocalizedException $e) {
                     $message = $e->getMessage();
-                    $this->messageManager->addError($message);
-                    $this->session->setUsername($login['username']);
                 } catch (\Exception $e) {
                     // PA DSS violation: throwing or logging an exception here can disclose customer password
                     $this->messageManager->addError(
                         __('An unspecified error occurred. Please contact us for assistance.')
                     );
+                } finally {
+                    if (isset($message)) {
+                        $this->messageManager->addError($message);
+                        $this->session->setUsername($login['username']);
+                    }
                 }
             } else {
                 $this->messageManager->addError(__('A login and a password are required.'));
diff --git a/app/code/Magento/Customer/Controller/Account/Logout.php b/app/code/Magento/Customer/Controller/Account/Logout.php
index 3d5d5480c502b..19dabf9effa56 100644
--- a/app/code/Magento/Customer/Controller/Account/Logout.php
+++ b/app/code/Magento/Customer/Controller/Account/Logout.php
@@ -11,8 +11,9 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
+use Magento\Customer\Controller\AbstractAccount;
 
-class Logout extends \Magento\Customer\Controller\AbstractAccount
+class Logout extends AbstractAccount
 {
     /**
      * @var Session
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
index ebab2a42a02ec..e26b49aaebe7a 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
@@ -73,7 +73,7 @@ public function execute()
 
     /**
      * Return component referer url
-     * TODO: Technical dept referer url should be implement as a part of Action configuration in in appropriate way
+     * TODO: Technical dept referer url should be implement as a part of Action configuration in appropriate way
      *
      * @return null|string
      */
diff --git a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
index cb73b7ee1cb36..31e0e2727436b 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
@@ -156,6 +156,11 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group)
             ->setCode($groupModel->getCode())
             ->setTaxClassId($groupModel->getTaxClassId())
             ->setTaxClassName($groupModel->getTaxClassName());
+
+        if ($group->getExtensionAttributes()) {
+            $groupDataObject->setExtensionAttributes($group->getExtensionAttributes());
+        }
+
         return $groupDataObject;
     }
 
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index 4624dd8b6bcf5..763a7afbfa851 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Customer\Model;
 
-use Magento\Framework\Indexer\StateInterface;
-
 /**
  * Class Visitor
  * @package Magento\Customer\Model
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index a1f0277ec40ec..d26ecac28113e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -85,6 +85,12 @@
     </entity>
     <!--If required other field can be added to UK_Address entity, dont modify any existing data-->
     <entity name="UK_Address" type="address">
+        <array key="street">
+        <item>7700 xyz street</item>
+        <item>113</item>
+        </array>
+        <data key="city">London</data>
         <data key="country_id">GB</data>
+        <data key="telephone">512-345-6789</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
index 747f2d59745a1..99741a357109e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
@@ -20,11 +20,11 @@
     <entity name="RegionCA" type="region">
         <data key="region">California</data>
         <data key="region_code">CA</data>
-        <data key="region_id">2</data>
+        <data key="region_id">12</data>
     </entity>
     <entity name="RegionNY" type="region">
         <data key="region">New York</data>
         <data key="region_code">NY</data>
-        <data key="region_id">3</data>
+        <data key="region_id">43</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php
deleted file mode 100644
index aaa1c17027928..0000000000000
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php
+++ /dev/null
@@ -1,795 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Customer\Test\Unit\Controller\Account;
-
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Controller\Account\EditPost;
-use Magento\Customer\Model\AuthenticationInterface;
-use Magento\Customer\Model\CustomerExtractor;
-use Magento\Customer\Model\EmailNotificationInterface;
-use Magento\Customer\Model\Session;
-use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\Request\Http;
-use Magento\Framework\Controller\Result\Redirect;
-use Magento\Framework\Controller\Result\RedirectFactory;
-use Magento\Framework\Data\Form\FormKey\Validator;
-use Magento\Framework\Message\ManagerInterface;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class EditPostTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var EditPost
-     */
-    protected $model;
-
-    /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $context;
-
-    /**
-     * @var Session|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerSession;
-
-    /**
-     * @var \Magento\Customer\Model\AccountManagement|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerAccountManagement;
-
-    /**
-     * @var CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerRepository;
-
-    /**
-     * @var Validator|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $validator;
-
-    /**
-     * @var CustomerExtractor|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerExtractor;
-
-    /**
-     * @var EmailNotificationInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $emailNotification;
-
-    /**
-     * @var RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultRedirectFactory;
-
-    /**
-     * @var Redirect|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultRedirect;
-
-    /**
-     * @var Http|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $request;
-
-    /**
-     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $messageManager;
-
-    /**
-     * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $eventManager;
-
-    /**
-     * @var AuthenticationInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $authenticationMock;
-
-    /**
-     * @var \Magento\Customer\Model\Customer\Mapper|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $customerMapperMock;
-
-    protected function setUp()
-    {
-        $this->prepareContext();
-
-        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getCustomerId', 'setCustomerFormData', 'logout', 'start'])
-            ->getMock();
-
-        $this->customerAccountManagement = $this->getMockBuilder(\Magento\Customer\Model\AccountManagement::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->customerRepository = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->validator = $this->getMockBuilder(\Magento\Framework\Data\Form\FormKey\Validator::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->customerExtractor = $this->getMockBuilder(\Magento\Customer\Model\CustomerExtractor::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->emailNotification = $this->getMockBuilder(EmailNotificationInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->authenticationMock = $this->getMockBuilder(AuthenticationInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->customerMapperMock = $this->getMockBuilder(\Magento\Customer\Model\Customer\Mapper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->model = new EditPost(
-            $this->context,
-            $this->customerSession,
-            $this->customerAccountManagement,
-            $this->customerRepository,
-            $this->validator,
-            $this->customerExtractor
-        );
-
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $objectManager->setBackwardCompatibleProperty(
-            $this->model,
-            'emailNotification',
-            $this->emailNotification
-        );
-
-        $objectManager->setBackwardCompatibleProperty(
-            $this->model,
-            'authentication',
-            $this->authenticationMock
-        );
-        $objectManager->setBackwardCompatibleProperty(
-            $this->model,
-            'customerMapper',
-            $this->customerMapperMock
-        );
-    }
-
-    public function testInvalidFormKey()
-    {
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(false);
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/edit')
-            ->willReturnSelf();
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    public function testNoPostValues()
-    {
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('isPost')
-            ->willReturn(false);
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/edit')
-            ->willReturnSelf();
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    public function testGeneralSave()
-    {
-        $customerId = 1;
-        $currentPassword = '1234567';
-        $customerEmail = 'customer@example.com';
-
-        $address = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
-            ->getMockForAbstractClass();
-        $currentCustomerMock = $this->getCurrentCustomerMock($customerId, $address);
-        $newCustomerMock = $this->getNewCustomerMock($customerId, $address);
-
-        $currentCustomerMock->expects($this->any())
-            ->method('getEmail')
-            ->willReturn($customerEmail);
-
-        $this->customerMapperMock->expects($this->once())
-            ->method('toFlatArray')
-            ->with($currentCustomerMock)
-            ->willReturn([]);
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerId')
-            ->willReturn($customerId);
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($currentCustomerMock);
-
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('isPost')
-            ->willReturn(true);
-
-        $this->request->expects($this->exactly(3))
-            ->method('getParam')
-            ->withConsecutive(
-                ['change_email'],
-                ['change_email'],
-                ['change_password']
-            )
-            ->willReturnOnConsecutiveCalls(true, true, false);
-
-        $this->request->expects($this->once())
-            ->method('getPost')
-            ->with('current_password')
-            ->willReturn($currentPassword);
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($currentCustomerMock);
-
-        $this->customerRepository->expects($this->once())
-            ->method('save')
-            ->with($newCustomerMock)
-            ->willReturnSelf();
-
-        $this->customerExtractor->expects($this->once())
-            ->method('extract')
-            ->with('customer_account_edit', $this->request)
-            ->willReturn($newCustomerMock);
-
-        $this->emailNotification->expects($this->once())
-            ->method('credentialsChanged')
-            ->with($currentCustomerMock, $customerEmail, false)
-            ->willReturnSelf();
-
-        $newCustomerMock->expects($this->once())
-            ->method('getEmail')
-            ->willReturn($customerEmail);
-
-        $this->eventManager->expects($this->once())
-            ->method('dispatch')
-            ->with(
-                'customer_account_edited',
-                ['email' => $customerEmail]
-            );
-
-        $this->messageManager->expects($this->once())
-            ->method('addSuccess')
-            ->with(__('You saved the account information.'))
-            ->willReturnSelf();
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('customer/account')
-            ->willReturnSelf();
-
-        $this->authenticationMock->expects($this->once())
-            ->method('authenticate')
-            ->willReturn(true);
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * @param int $testNumber
-     * @param string $exceptionClass
-     * @param string $errorMessage
-     *
-     * @dataProvider changeEmailExceptionDataProvider
-     */
-    public function testChangeEmailException($testNumber, $exceptionClass, $errorMessage)
-    {
-        $customerId = 1;
-        $password = '1234567';
-
-        $address = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
-            ->getMockForAbstractClass();
-
-        $currentCustomerMock = $this->getCurrentCustomerMock($customerId, $address);
-        $newCustomerMock = $this->getNewCustomerMock($customerId, $address);
-
-        $this->customerMapperMock->expects($this->once())
-            ->method('toFlatArray')
-            ->with($currentCustomerMock)
-            ->willReturn([]);
-
-        $this->customerExtractor->expects($this->once())
-            ->method('extract')
-            ->with('customer_account_edit', $this->request)
-            ->willReturn($newCustomerMock);
-
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('isPost')
-            ->willReturn(true);
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerId')
-            ->willReturn($customerId);
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($currentCustomerMock);
-
-        $this->request->expects($this->any())
-            ->method('getParam')
-            ->with('change_email')
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('getPost')
-            ->with('current_password')
-            ->willReturn($password);
-
-        $exception = new $exceptionClass($errorMessage);
-        $this->authenticationMock->expects($this->once())
-            ->method('authenticate')
-            ->willThrowException($exception);
-
-        $this->messageManager->expects($this->once())
-            ->method('addError')
-            ->with($errorMessage)
-            ->willReturnSelf();
-
-        if ($testNumber==1) {
-            $this->resultRedirect->expects($this->once())
-                ->method('setPath')
-                ->with('*/*/edit')
-                ->willReturnSelf();
-        }
-
-        if ($testNumber==2) {
-            $this->customerSession->expects($this->once())
-                ->method('logout');
-
-            $this->customerSession->expects($this->once())
-                ->method('start');
-
-            $this->resultRedirect->expects($this->once())
-                ->method('setPath')
-                ->with('customer/account/login')
-                ->willReturnSelf();
-        }
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * @return array
-     */
-    public function changeEmailExceptionDataProvider()
-    {
-        return [
-            [
-                'testNumber' => 1,
-                'exceptionClass' => \Magento\Framework\Exception\InvalidEmailOrPasswordException::class,
-                'errorMessage' => __("The password doesn't match this account. Verify the password and try again.")
-            ],
-            [
-                'testNumber' => 2,
-                'exceptionClass' => \Magento\Framework\Exception\State\UserLockedException::class,
-                'errorMessage' => __('The account sign-in was incorrect or your account is disabled temporarily. '
-                    . 'Please wait and try again later.')
-            ]
-        ];
-    }
-
-    /**
-     * @param string $currentPassword
-     * @param string $newPassword
-     * @param string $confirmationPassword
-     * @param [] $errors
-     *
-     * @dataProvider changePasswordDataProvider
-     */
-    public function testChangePassword(
-        $currentPassword,
-        $newPassword,
-        $confirmationPassword,
-        $errors
-    ) {
-        $customerId = 1;
-        $customerEmail = 'user1@example.com';
-
-        $address = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
-            ->getMockForAbstractClass();
-
-        $currentCustomerMock = $this->getCurrentCustomerMock($customerId, $address);
-        $newCustomerMock = $this->getNewCustomerMock($customerId, $address);
-
-        $this->customerMapperMock->expects($this->once())
-            ->method('toFlatArray')
-            ->with($currentCustomerMock)
-            ->willReturn([]);
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerId')
-            ->willReturn($customerId);
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($currentCustomerMock);
-
-        $this->customerExtractor->expects($this->once())
-            ->method('extract')
-            ->with('customer_account_edit', $this->request)
-            ->willReturn($newCustomerMock);
-
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('isPost')
-            ->willReturn(true);
-
-        $this->request->expects($this->exactly(3))
-            ->method('getParam')
-            ->withConsecutive(
-                ['change_email'],
-                ['change_email'],
-                ['change_password']
-            )
-            ->willReturnOnConsecutiveCalls(false, false, true);
-
-        $this->request->expects($this->any())
-            ->method('getPostValue')
-            ->willReturn(true);
-
-        $this->request->expects($this->exactly(3))
-            ->method('getPost')
-            ->willReturnMap([
-                ['current_password', null, $currentPassword],
-                ['password', null, $newPassword],
-                ['password_confirmation', null, $confirmationPassword],
-            ]);
-
-        $currentCustomerMock->expects($this->any())
-            ->method('getEmail')
-            ->willReturn($customerEmail);
-
-        // Prepare errors processing
-        if ($errors['counter'] > 0) {
-            $this->mockChangePasswordErrors($currentPassword, $newPassword, $errors, $customerEmail);
-        } else {
-            $this->customerAccountManagement->expects($this->once())
-                ->method('changePassword')
-                ->with($customerEmail, $currentPassword, $newPassword)
-                ->willReturnSelf();
-
-            $this->customerRepository->expects($this->once())
-                ->method('save')
-                ->with($newCustomerMock)
-                ->willReturnSelf();
-
-            $this->messageManager->expects($this->once())
-                ->method('addSuccess')
-                ->with(__('You saved the account information.'))
-                ->willReturnSelf();
-
-            $this->resultRedirect->expects($this->once())
-                ->method('setPath')
-                ->with('customer/account')
-                ->willReturnSelf();
-        }
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * @return array
-     */
-    public function changePasswordDataProvider()
-    {
-        return [
-            [
-                'current_password' => '',
-                'new_password' => '',
-                'confirmation_password' => '',
-                'errors' => [
-                    'counter' => 1,
-                    'message' => __('Please enter new password.'),
-                ]
-            ],
-            [
-                'current_password' => '',
-                'new_password' => 'user2@example.com',
-                'confirmation_password' => 'user3@example.com',
-                'errors' => [
-                    'counter' => 1,
-                    'message' => __('Password confirmation doesn\'t match entered password.'),
-                ]
-            ],
-            [
-                'current_password' => 'user1@example.com',
-                'new_password' => 'user2@example.com',
-                'confirmation_password' => 'user2@example.com',
-                'errors' => [
-                    'counter' => 0,
-                    'message' => '',
-                ]
-            ],
-            [
-                'current_password' => 'user1@example.com',
-                'new_password' => 'user2@example.com',
-                'confirmation_password' => 'user2@example.com',
-                'errors' => [
-                    'counter' => 1,
-                    'message' => 'AuthenticationException',
-                    'exception' => \Magento\Framework\Exception\AuthenticationException::class,
-                ]
-            ],
-            [
-                'current_password' => 'user1@example.com',
-                'new_password' => 'user2@example.com',
-                'confirmation_password' => 'user2@example.com',
-                'errors' => [
-                    'counter' => 1,
-                    'message' => 'Exception',
-                    'exception' => '\Exception',
-                ]
-            ]
-        ];
-    }
-
-    /**
-     * @param string $message
-     * @param string $exception
-     *
-     * @dataProvider exceptionDataProvider
-     */
-    public function testGeneralException(
-        $message,
-        $exception
-    ) {
-        $customerId = 1;
-
-        $address = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
-            ->getMockForAbstractClass();
-
-        $currentCustomerMock = $this->getCurrentCustomerMock($customerId, $address);
-        $newCustomerMock = $this->getNewCustomerMock($customerId, $address);
-
-        $this->customerMapperMock->expects($this->once())
-            ->method('toFlatArray')
-            ->with($currentCustomerMock)
-            ->willReturn([]);
-
-        $exception = new $exception(__($message));
-
-        $this->validator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->request->expects($this->once())
-            ->method('isPost')
-            ->willReturn(true);
-
-        $this->request->expects($this->exactly(3))
-            ->method('getParam')
-            ->withConsecutive(
-                ['change_email'],
-                ['change_email'],
-                ['change_password']
-            )
-            ->willReturn(false);
-
-        $this->request->expects($this->any())
-            ->method('getPostValue')
-            ->willReturn(true);
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerId')
-            ->willReturn($customerId);
-        $this->customerSession->expects($this->once())
-            ->method('setCustomerFormData')
-            ->with(true)
-            ->willReturnSelf();
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($currentCustomerMock);
-        $this->customerRepository->expects($this->once())
-            ->method('save')
-            ->with($newCustomerMock)
-            ->willThrowException($exception);
-
-        $this->customerExtractor->expects($this->once())
-            ->method('extract')
-            ->with('customer_account_edit', $this->request)
-            ->willReturn($newCustomerMock);
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/edit')
-            ->willReturnSelf();
-
-        $this->assertSame($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * @return array
-     */
-    public function exceptionDataProvider()
-    {
-        return [
-            [
-                'message' => 'LocalizedException',
-                'exception' => \Magento\Framework\Exception\LocalizedException::class,
-            ],
-            [
-                'message' => 'Exception',
-                'exception' => '\Exception',
-            ],
-        ];
-    }
-
-    protected function prepareContext()
-    {
-        $this->context = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultRedirectFactory = $this->getMockBuilder(
-            \Magento\Framework\Controller\Result\RedirectFactory::class
-        )
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->resultRedirect = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->context->expects($this->any())
-            ->method('getResultRedirectFactory')
-            ->willReturn($this->resultRedirectFactory);
-
-        $this->context->expects($this->any())
-            ->method('getRequest')
-            ->willReturn($this->request);
-
-        $this->context->expects($this->any())
-            ->method('getMessageManager')
-            ->willReturn($this->messageManager);
-
-        $this->eventManager = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->context->expects($this->any())
-            ->method('getEventManager')
-            ->willReturn($this->eventManager);
-
-        $this->resultRedirectFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($this->resultRedirect);
-    }
-
-    /**
-     * @param int $customerId
-     * @param \PHPUnit_Framework_MockObject_MockObject $address
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function getNewCustomerMock($customerId, $address)
-    {
-        $newCustomerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMockForAbstractClass();
-
-        $newCustomerMock->expects($this->once())
-            ->method('setId')
-            ->with($customerId)
-            ->willReturnSelf();
-        $newCustomerMock->expects($this->once())
-            ->method('getAddresses')
-            ->willReturn(null);
-        $newCustomerMock->expects($this->once())
-            ->method('setAddresses')
-            ->with([$address])
-            ->willReturn(null);
-
-        return $newCustomerMock;
-    }
-
-    /**
-     * @param int $customerId
-     * @param \PHPUnit_Framework_MockObject_MockObject $address
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function getCurrentCustomerMock($customerId, $address)
-    {
-        $currentCustomerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMockForAbstractClass();
-
-        $currentCustomerMock->expects($this->once())
-            ->method('getAddresses')
-            ->willReturn([$address]);
-
-        $currentCustomerMock->expects($this->any())
-            ->method('getId')
-            ->willReturn($customerId);
-
-        return $currentCustomerMock;
-    }
-
-    /**
-     * @param string $currentPassword
-     * @param string $newPassword
-     * @param [] $errors
-     * @param string $customerEmail
-     * @return void
-     */
-    protected function mockChangePasswordErrors($currentPassword, $newPassword, $errors, $customerEmail)
-    {
-        if (!empty($errors['exception'])) {
-            $exception = new $errors['exception'](__($errors['message']));
-
-            $this->customerAccountManagement->expects($this->once())
-                ->method('changePassword')
-                ->with($customerEmail, $currentPassword, $newPassword)
-                ->willThrowException($exception);
-
-            $this->messageManager->expects($this->any())
-                ->method('addException')
-                ->with($exception, __('We can\'t save the customer.'))
-                ->willReturnSelf();
-        }
-
-        $this->customerSession->expects($this->once())
-            ->method('setCustomerFormData')
-            ->with(true)
-            ->willReturnSelf();
-
-        $this->messageManager->expects($this->any())
-            ->method('addError')
-            ->with($errors['message'])
-            ->willReturnSelf();
-
-        $this->resultRedirect->expects($this->any())
-            ->method('setPath')
-            ->with('*/*/edit')
-            ->willReturnSelf();
-    }
-}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupRepositoryTest.php
index 98cf8c212a784..9e8440b500989 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupRepositoryTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupRepositoryTest.php
@@ -38,6 +38,11 @@ class GroupRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     protected $group;
 
+    /**
+     * @var \Magento\Customer\Api\Data\GroupInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $factoryCreatedGroup;
+
     /**
      * @var \Magento\Customer\Model\ResourceModel\Group|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -153,6 +158,12 @@ private function setupGroupObjects()
             'group',
             false
         );
+        $this->factoryCreatedGroup = $this->getMockForAbstractClass(
+            \Magento\Customer\Api\Data\GroupInterface::class,
+            [],
+            'group',
+            false
+        );
 
         $this->groupResourceModel = $this->createMock(\Magento\Customer\Model\ResourceModel\Group::class);
     }
@@ -162,16 +173,22 @@ public function testSave()
         $groupId = 0;
 
         $taxClass = $this->getMockForAbstractClass(\Magento\Tax\Api\Data\TaxClassInterface::class, [], '', false);
+        $extensionAttributes = $this->getMockForAbstractClass(
+            \Magento\Customer\Api\Data\GroupExtensionInterface::class
+        );
 
-        $this->group->expects($this->once())
+        $this->group->expects($this->atLeastOnce())
             ->method('getCode')
             ->willReturn('Code');
         $this->group->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($groupId);
-        $this->group->expects($this->once())
+        $this->group->expects($this->atLeastOnce())
             ->method('getTaxClassId')
             ->willReturn(17);
+        $this->group->expects($this->atLeastOnce())
+            ->method('getExtensionAttributes')
+            ->willReturn($extensionAttributes);
 
         $this->groupModel->expects($this->atLeastOnce())
             ->method('getId')
@@ -185,22 +202,33 @@ public function testSave()
         $this->groupModel->expects($this->atLeastOnce())
             ->method('getTaxClassName')
             ->willReturn('Tax class name');
-        $this->group->expects($this->once())
+
+        $this->factoryCreatedGroup->expects($this->once())
             ->method('setId')
             ->with($groupId)
             ->willReturnSelf();
-        $this->group->expects($this->once())
+        $this->factoryCreatedGroup->expects($this->once())
             ->method('setCode')
             ->with('Code')
             ->willReturnSelf();
-        $this->group->expects($this->once())
+        $this->factoryCreatedGroup->expects($this->once())
             ->method('setTaxClassId')
             ->with(234)
             ->willReturnSelf();
-        $this->group->expects($this->once())
+        $this->factoryCreatedGroup->expects($this->once())
             ->method('setTaxClassName')
             ->with('Tax class name')
             ->willReturnSelf();
+        $this->factoryCreatedGroup->expects($this->once())
+            ->method('setExtensionAttributes')
+            ->with($extensionAttributes)
+            ->willReturnSelf();
+        $this->factoryCreatedGroup->expects($this->atLeastOnce())
+            ->method('getCode')
+            ->willReturn('Code');
+        $this->factoryCreatedGroup->expects($this->atLeastOnce())
+            ->method('getTaxClassId')
+            ->willReturn(17);
 
         $this->taxClassRepository->expects($this->once())
             ->method('get')
@@ -229,9 +257,12 @@ public function testSave()
             ->with($groupId);
         $this->groupDataFactory->expects($this->once())
             ->method('create')
-            ->willReturn($this->group);
+            ->willReturn($this->factoryCreatedGroup);
+
+        $updatedGroup = $this->model->save($this->group);
 
-        $this->assertSame($this->group, $this->model->save($this->group));
+        $this->assertSame($this->group->getCode(), $updatedGroup->getCode());
+        $this->assertSame($this->group->getTaxClassId(), $updatedGroup->getTaxClassId());
     }
 
     /**
diff --git a/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js b/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
index be2e0aedfe4bb..89d9b320c049d 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js
@@ -31,7 +31,7 @@ define([
             this.options.cache.label = $(this.options.passwordStrengthMeterLabelSelector, this.element);
 
             // We need to look outside the module for backward compatibility, since someone can already use the module.
-            // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the the email field from the
+            // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
             // newsletter email field or any other "email" field.
             this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
             this._bind();
diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
index 4590d5433ed72..73ae696a85187 100644
--- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
+++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
@@ -87,7 +87,7 @@ public function addProductToFilter($product)
     }
 
     /**
-     * Retrieve title for for current store
+     * Retrieve title for current store
      *
      * @param int $storeId
      * @return $this
@@ -113,7 +113,7 @@ public function addTitleToResult($storeId = 0)
     }
 
     /**
-     * Retrieve price for for current website
+     * Retrieve price for current website
      *
      * @param int $websiteId
      * @return $this
diff --git a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
index b6ec06d48a487..118535c36560b 100644
--- a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
@@ -17,7 +17,7 @@ class Elasticsearch implements ClientInterface
     /**
      * Elasticsearch Client instance
      *
-     * @var \Elasticsearch\Client
+     * @var \Elasticsearch\Client[]
      */
     protected $client;
 
@@ -53,10 +53,19 @@ public function __construct(
             $config = $this->buildConfig($options);
             $elasticsearchClient = \Elasticsearch\ClientBuilder::fromConfig($config, true);
         }
-        $this->client = $elasticsearchClient;
+        $this->client[getmypid()] = $elasticsearchClient;
         $this->clientOptions = $options;
     }
 
+    private function getClient()
+    {
+        $pid = getmypid();
+        if (!isset($this->client[$pid])) {
+            $config = $this->buildConfig($this->clientOptions);
+            $this->client[$pid] = \Elasticsearch\ClientBuilder::fromConfig($config, true);
+        }
+        return $this->client[$pid];
+    }
     /**
      * Ping the Elasticsearch client
      *
@@ -65,7 +74,7 @@ public function __construct(
     public function ping()
     {
         if ($this->pingResult === null) {
-            $this->pingResult = $this->client->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]);
+            $this->pingResult = $this->getClient()->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]);
         }
         return $this->pingResult;
     }
@@ -110,7 +119,7 @@ private function buildConfig($options = [])
      */
     public function bulkQuery($query)
     {
-        $this->client->bulk($query);
+        $this->getClient()->bulk($query);
     }
 
     /**
@@ -122,7 +131,7 @@ public function bulkQuery($query)
      */
     public function createIndex($index, $settings)
     {
-        $this->client->indices()->create([
+        $this->getClient()->indices()->create([
             'index' => $index,
             'body' => $settings,
         ]);
@@ -136,7 +145,7 @@ public function createIndex($index, $settings)
      */
     public function deleteIndex($index)
     {
-        $this->client->indices()->delete(['index' => $index]);
+        $this->getClient()->indices()->delete(['index' => $index]);
     }
 
     /**
@@ -147,7 +156,7 @@ public function deleteIndex($index)
      */
     public function isEmptyIndex($index)
     {
-        $stats = $this->client->indices()->stats(['index' => $index, 'metric' => 'docs']);
+        $stats = $this->getClient()->indices()->stats(['index' => $index, 'metric' => 'docs']);
         if ($stats['indices'][$index]['primaries']['docs']['count'] == 0) {
             return true;
         }
@@ -172,7 +181,7 @@ public function updateAlias($alias, $newIndex, $oldIndex = '')
             $params['body']['actions'][] = ['add' => ['alias' => $alias, 'index' => $newIndex]];
         }
 
-        $this->client->indices()->updateAliases($params);
+        $this->getClient()->indices()->updateAliases($params);
     }
 
     /**
@@ -183,7 +192,7 @@ public function updateAlias($alias, $newIndex, $oldIndex = '')
      */
     public function indexExists($index)
     {
-         return $this->client->indices()->exists(['index' => $index]);
+        return $this->getClient()->indices()->exists(['index' => $index]);
     }
 
     /**
@@ -198,7 +207,7 @@ public function existsAlias($alias, $index = '')
         if ($index) {
             $params['index'] = $index;
         }
-        return $this->client->indices()->existsAlias($params);
+        return $this->getClient()->indices()->existsAlias($params);
     }
 
     /**
@@ -208,7 +217,7 @@ public function existsAlias($alias, $index = '')
      */
     public function getAlias($alias)
     {
-        return $this->client->indices()->getAlias(['name' => $alias]);
+        return $this->getClient()->indices()->getAlias(['name' => $alias]);
     }
 
     /**
@@ -267,7 +276,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
         foreach ($fields as $field => $fieldInfo) {
             $params['body'][$entityType]['properties'][$field] = $fieldInfo;
         }
-        $this->client->indices()->putMapping($params);
+        $this->getClient()->indices()->putMapping($params);
     }
 
     /**
@@ -279,7 +288,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
      */
     public function deleteMapping($index, $entityType)
     {
-        $this->client->indices()->deleteMapping([
+        $this->getClient()->indices()->deleteMapping([
             'index' => $index,
             'type' => $entityType,
         ]);
@@ -293,8 +302,7 @@ public function deleteMapping($index, $entityType)
      */
     public function query($query)
     {
-        $params = array_merge($query, ['client' => ['timeout' => $this->clientOptions['timeout']]]);
-        return $this->client->search($params);
+        return $this->getClient()->search($query);
     }
 
     /**
@@ -305,6 +313,6 @@ public function query($query)
      */
     public function suggest($query)
     {
-        return $this->client->suggest($query);
+        return $this->getClient()->suggest($query);
     }
 }
diff --git a/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php b/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php
index 011324fb1cc9f..17e8e4c519ccb 100644
--- a/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php
+++ b/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php
@@ -198,7 +198,7 @@ public function saveDataProvider()
                 ],
                 'bunch' => [
                     'associated_skus' => 'sku_assoc1=1, sku_assoc2=2',
-                    'sku' => 'productSku',
+                    'sku' => 'productsku',
                     'product_type' => 'grouped'
                 ]
             ],
@@ -211,7 +211,7 @@ public function saveDataProvider()
                 ],
                 'bunch' => [
                     'associated_skus' => '',
-                    'sku' => 'productSku',
+                    'sku' => 'productsku',
                     'product_type' => 'grouped'
                 ]
             ],
@@ -219,7 +219,7 @@ public function saveDataProvider()
                 'skus' => ['newSku' => [],'oldSku' => []],
                 'bunch' => [
                     'associated_skus' => 'sku_assoc1=1, sku_assoc2=2',
-                    'sku' => 'productSku',
+                    'sku' => 'productsku',
                     'product_type' => 'grouped'
                 ]
             ],
@@ -227,13 +227,13 @@ public function saveDataProvider()
                 'skus' => [
                     'newSku' => [
                         'sku_assoc1' => ['entity_id' => 1],
-                        'productSku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
+                        'productsku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
                     ],
                     'oldSku' => []
                 ],
                 'bunch' => [
                     'associated_skus' => 'sku_assoc1=1',
-                    'sku' => 'productSku',
+                    'sku' => 'productsku',
                     'product_type' => 'simple'
                 ]
             ]
@@ -257,7 +257,7 @@ public function testSaveDataScopeStore()
 
         $bunch = [[
             'associated_skus' => 'sku_assoc1=1, sku_assoc2=2',
-            'sku' => 'productSku',
+            'sku' => 'productsku',
             'product_type' => 'grouped'
         ]];
         $this->entityModel->expects($this->at(2))->method('getNextBunch')->will($this->returnValue($bunch));
diff --git a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
index a97b1c246741e..e85d4eeca730a 100644
--- a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
@@ -19,6 +19,8 @@ class Grouped extends Renderer implements IdentityInterface
 {
     /**
      * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     * @deprecated moved to model because of class refactoring
+     * @see \Magento\GroupedProduct\Model\Product\Configuration\Item\ItemProductResolver::CONFIG_THUMBNAIL_SOURCE
      */
     const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/grouped_product_image';
 
@@ -36,28 +38,6 @@ public function getGroupedProduct()
         return $this->getProduct();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProductForThumbnail()
-    {
-        /**
-         * Show grouped product thumbnail if it must be always shown according to the related setting in system config
-         * or if child product thumbnail is not available
-         */
-        if ($this->_scopeConfig->getValue(
-            self::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
-            !($this->getProduct()->getThumbnail() && $this->getProduct()->getThumbnail() != 'no_selection')
-        ) {
-            $product = $this->getGroupedProduct();
-        } else {
-            $product = $this->getProduct();
-        }
-        return $product;
-    }
-
     /**
      * Return identifiers for produced content
      *
diff --git a/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php b/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
deleted file mode 100644
index a38ce3ac65296..0000000000000
--- a/app/code/Magento/GroupedProduct/CustomerData/GroupedItem.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\GroupedProduct\CustomerData;
-
-use Magento\Catalog\Model\Config\Source\Product\Thumbnail as ThumbnailSource;
-use Magento\Checkout\CustomerData\DefaultItem;
-
-class GroupedItem extends DefaultItem
-{
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @param \Magento\Catalog\Helper\Image $imageHelper
-     * @param \Magento\Msrp\Helper\Data $msrpHelper
-     * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @param \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool
-     * @param \Magento\Checkout\Helper\Data $checkoutHelper
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Escaper|null $escaper
-     */
-    public function __construct(
-        \Magento\Catalog\Helper\Image $imageHelper,
-        \Magento\Msrp\Helper\Data $msrpHelper,
-        \Magento\Framework\UrlInterface $urlBuilder,
-        \Magento\Catalog\Helper\Product\ConfigurationPool $configurationPool,
-        \Magento\Checkout\Helper\Data $checkoutHelper,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Escaper $escaper = null
-    ) {
-        parent::__construct(
-            $imageHelper,
-            $msrpHelper,
-            $urlBuilder,
-            $configurationPool,
-            $checkoutHelper,
-            $escaper
-        );
-        $this->_scopeConfig = $scopeConfig;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getProductForThumbnail()
-    {
-        /**
-         * Show grouped product thumbnail if it must be always shown according to the related setting in system config
-         * or if child product thumbnail is not available
-         */
-        $config = $this->_scopeConfig->getValue(
-            \Magento\GroupedProduct\Block\Cart\Item\Renderer\Grouped::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-        $product = $config == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
-            (!$this->getProduct()->getThumbnail() || $this->getProduct()->getThumbnail() == 'no_selection')
-            ? $this->getGroupedProduct()
-            : $this->getProduct();
-        return $product;
-    }
-
-    /**
-     * Get item grouped product
-     *
-     * @return \Magento\Catalog\Model\Product
-     */
-    protected function getGroupedProduct()
-    {
-        $option = $this->item->getOptionByCode('product_type');
-        if ($option) {
-            return $option->getProduct();
-        }
-        return $this->getProduct();
-    }
-}
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Configuration/Item/ItemProductResolver.php b/app/code/Magento/GroupedProduct/Model/Product/Configuration/Item/ItemProductResolver.php
new file mode 100644
index 0000000000000..207d9853f8c6b
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Model/Product/Configuration/Item/ItemProductResolver.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GroupedProduct\Model\Product\Configuration\Item;
+
+use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class ItemProductResolver implements ItemResolverInterface
+{
+    /**
+     * Path in config to the setting which defines if parent or child product should be used to generate a thumbnail.
+     */
+    const CONFIG_THUMBNAIL_SOURCE = 'checkout/cart/grouped_product_image';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFinalProduct(ItemInterface $item) : ProductInterface
+    {
+        /**
+         * Show grouped product thumbnail if it must be always shown according to the related setting in system config
+         * or if child product thumbnail is not available.
+         */
+
+        $childProduct = $item->getProduct();
+        $finalProduct = $childProduct;
+        $parentProduct = $this->getParentProduct($item);
+        if ($childProduct !== $parentProduct) {
+            $configValue = $this->scopeConfig->getValue(
+                self::CONFIG_THUMBNAIL_SOURCE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            );
+            $childThumb = $childProduct->getData('thumbnail');
+
+            $finalProduct =
+                ($configValue == Thumbnail::OPTION_USE_PARENT_IMAGE) || (!$childThumb || $childThumb == 'no_selection')
+                    ? $parentProduct
+                    : $childProduct;
+        }
+        return $finalProduct;
+    }
+
+    /**
+     * Get grouped product.
+     *
+     * @param ItemInterface $item
+     * @return Product
+     */
+    private function getParentProduct(ItemInterface $item) : Product
+    {
+        $option = $item->getOptionByCode('product_type');
+        $product = $item->getProduct();
+        if ($option) {
+            $product = $option->getProduct();
+        }
+        return $product;
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
index 6cdcfd248e798..7b9523015c882 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Initialization/Helper/ProductLinks/Plugin/Grouped.php
@@ -8,6 +8,7 @@
 use Magento\Catalog\Api\Data\ProductLinkExtensionFactory;
 use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\GroupedProduct\Model\Product\Type\Grouped as TypeGrouped;
 
 /**
@@ -60,6 +61,9 @@ public function __construct(
      * @param array $links
      *
      * @return \Magento\Catalog\Model\Product
+     *
+     * @throws NoSuchEntityException
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -70,7 +74,7 @@ public function beforeInitializeLinks(
         array $links
     ) {
         if ($product->getTypeId() === TypeGrouped::TYPE_CODE && !$product->getGroupedReadonly()) {
-            $links = (isset($links[self::TYPE_NAME])) ? $links[self::TYPE_NAME] : $product->getGroupedLinkData();
+            $links = $links[self::TYPE_NAME] ?? $product->getGroupedLinkData();
             if (!is_array($links)) {
                 $links = [];
             }
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php
index 5dc12fe39c46a..9302706342f13 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Block/Cart/Item/Renderer/GroupedTest.php
@@ -11,128 +11,22 @@
 class GroupedTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $_scopeConfig;
+    private $scopeConfig;
 
     /** @var Renderer */
-    protected $_renderer;
+    private $renderer;
 
     protected function setUp()
     {
         parent::setUp();
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $this->_renderer = $objectManagerHelper->getObject(
+        $this->scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->renderer = $objectManagerHelper->getObject(
             \Magento\GroupedProduct\Block\Cart\Item\Renderer\Grouped::class,
-            ['scopeConfig' => $this->_scopeConfig]
+            ['scopeConfig' => $this->scopeConfig]
         );
     }
 
-    /**
-     * Child thumbnail is available and config option is not set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnail()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['childProduct'],
-            $productForThumbnail,
-            'Child product was expected to be returned.'
-        );
-    }
-
-    /**
-     * Child thumbnail is not available and config option is not set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnailChildThumbnailNotAvailable()
-    {
-        $childHasThumbnail = false;
-        $useParentThumbnail = false;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned.'
-        );
-    }
-
-    /**
-     * Child thumbnail is available and config option is set to use parent thumbnail.
-     */
-    public function testGetProductForThumbnailConfigUseParent()
-    {
-        $childHasThumbnail = true;
-        $useParentThumbnail = true;
-        $products = $this->_initProducts($childHasThumbnail, $useParentThumbnail);
-
-        $productForThumbnail = $this->_renderer->getProductForThumbnail();
-        $this->assertSame(
-            $products['parentProduct'],
-            $productForThumbnail,
-            'Parent product was expected to be returned ' .
-            'if "checkout/cart/grouped_product_image" is set to "parent" in system config.'
-        );
-    }
-
-    /**
-     * Initialize parent grouped product and child product.
-     *
-     * @param bool $childHasThumbnail
-     * @param bool $useParentThumbnail
-     * @return \Magento\Catalog\Model\Product[]|\PHPUnit_Framework_MockObject_MockObject[]
-     */
-    protected function _initProducts($childHasThumbnail = true, $useParentThumbnail = false)
-    {
-        /** Set option which can force usage of parent product thumbnail when grouped product is displayed */
-        $thumbnailToBeUsed = $useParentThumbnail
-            ? ThumbnailSource::OPTION_USE_PARENT_IMAGE
-            : ThumbnailSource::OPTION_USE_OWN_IMAGE;
-        $this->_scopeConfig->expects(
-            $this->any()
-        )->method(
-            'getValue'
-        )->with(
-            Renderer::CONFIG_THUMBNAIL_SOURCE
-        )->will(
-            $this->returnValue($thumbnailToBeUsed)
-        );
-
-        /** Initialized parent product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $parentProduct */
-        $parentProduct = $this->createMock(\Magento\Catalog\Model\Product::class);
-
-        /** Initialize child product */
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $childProduct */
-        $childProduct = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getThumbnail', '__wakeup']);
-        $childThumbnail = $childHasThumbnail ? 'thumbnail.jpg' : 'no_selection';
-        $childProduct->expects($this->any())->method('getThumbnail')->will($this->returnValue($childThumbnail));
-
-        /** Mock methods which return parent and child products */
-        /** @var \Magento\Quote\Model\Quote\Item\Option|\PHPUnit_Framework_MockObject_MockObject $itemOption */
-        $itemOption = $this->createMock(\Magento\Quote\Model\Quote\Item\Option::class);
-        $itemOption->expects($this->any())->method('getProduct')->will($this->returnValue($parentProduct));
-        /** @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject $item */
-        $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($childProduct));
-        $item->expects(
-            $this->any()
-        )->method(
-            'getOptionByCode'
-        )->with(
-            'product_type'
-        )->will(
-            $this->returnValue($itemOption)
-        );
-        $this->_renderer->setItem($item);
-
-        return ['parentProduct' => $parentProduct, 'childProduct' => $childProduct];
-    }
-
     public function testGetIdentities()
     {
         $productTags = ['catalog_product_1'];
@@ -140,7 +34,7 @@ public function testGetIdentities()
         $product->expects($this->exactly(2))->method('getIdentities')->will($this->returnValue($productTags));
         $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
         $item->expects($this->exactly(2))->method('getProduct')->will($this->returnValue($product));
-        $this->_renderer->setItem($item);
-        $this->assertEquals(array_merge($productTags, $productTags), $this->_renderer->getIdentities());
+        $this->renderer->setItem($item);
+        $this->assertEquals(array_merge($productTags, $productTags), $this->renderer->getIdentities());
     }
 }
diff --git a/app/code/Magento/GroupedProduct/etc/di.xml b/app/code/Magento/GroupedProduct/etc/di.xml
index 8f688e3d06b00..0371ef2386eb7 100644
--- a/app/code/Magento/GroupedProduct/etc/di.xml
+++ b/app/code/Magento/GroupedProduct/etc/di.xml
@@ -100,4 +100,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite">
+        <arguments>
+            <argument name="itemResolvers" xsi:type="array">
+                <item name="grouped" xsi:type="string">Magento\GroupedProduct\Model\Product\Configuration\Item\ItemProductResolver</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/GroupedProduct/etc/frontend/di.xml b/app/code/Magento/GroupedProduct/etc/frontend/di.xml
deleted file mode 100644
index 755d53f46bfdd..0000000000000
--- a/app/code/Magento/GroupedProduct/etc/frontend/di.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
-        <arguments>
-            <argument name="itemMap" xsi:type="array">
-                <item name="grouped" xsi:type="string">Magento\GroupedProduct\CustomerData\GroupedItem</item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/Indexer/Model/ProcessManager.php b/app/code/Magento/Indexer/Model/ProcessManager.php
new file mode 100644
index 0000000000000..04cd713fffb11
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/ProcessManager.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Model;
+
+/**
+ * Provide functionality for executing user functions in multi-thread mode.
+ */
+class ProcessManager
+{
+    /**
+     * Threads count environment variable name
+     */
+    const THREADS_COUNT = 'MAGE_INDEXER_THREADS_COUNT';
+
+    /** @var bool */
+    private $failInChildProcess = false;
+
+    /** @var \Magento\Framework\App\ResourceConnection */
+    private $resource;
+
+    /** @var \Magento\Framework\Registry */
+    private $registry;
+
+    /** @var int|null */
+    private $threadsCount;
+
+    /**
+     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param \Magento\Framework\Registry $registry
+     * @param int|null $threadsCount
+     */
+    public function __construct(
+        \Magento\Framework\App\ResourceConnection $resource,
+        \Magento\Framework\Registry $registry = null,
+        int $threadsCount = null
+    ) {
+        $this->resource = $resource;
+        if (null === $registry) {
+            $registry = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                \Magento\Framework\Registry::class
+            );
+        }
+        $this->registry = $registry;
+        $this->threadsCount = (int)$threadsCount;
+    }
+
+    /**
+     * Execute user functions
+     *
+     * @param \Traversable $userFunctions
+     */
+    public function execute($userFunctions)
+    {
+        if ($this->threadsCount > 1 && $this->isCanBeParalleled() && !$this->isSetupMode() && PHP_SAPI == 'cli') {
+            $this->multiThreadsExecute($userFunctions);
+        } else {
+            $this->simpleThreadExecute($userFunctions);
+        }
+    }
+
+    /**
+     * Execute user functions in singleThreads mode
+     *
+     * @param \Traversable $userFunctions
+     */
+    private function simpleThreadExecute($userFunctions)
+    {
+        foreach ($userFunctions as $userFunction) {
+            call_user_func($userFunction);
+        }
+    }
+
+    /**
+     * Execute user functions in multiThreads mode
+     *
+     * @param \Traversable $userFunctions
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function multiThreadsExecute($userFunctions)
+    {
+        $this->resource->closeConnection(null);
+        $threadNumber = 0;
+        foreach ($userFunctions as $userFunction) {
+            $pid = pcntl_fork();
+            if ($pid == -1) {
+                throw new \RuntimeException('Unable to fork a new process');
+            } elseif ($pid) {
+                $this->executeParentProcess($threadNumber);
+            } else {
+                $this->startChildProcess($userFunction);
+            }
+        }
+        while (pcntl_waitpid(0, $status) != -1) {
+            //Waiting for the completion of child processes
+        }
+
+        if ($this->failInChildProcess) {
+            throw new \RuntimeException('Fail in child process');
+        }
+    }
+
+    /**
+     * Is process can be paralleled
+     *
+     * @return bool
+     */
+    private function isCanBeParalleled(): bool
+    {
+        return function_exists('pcntl_fork');
+    }
+
+    /**
+     * Is setup mode
+     *
+     * @return bool
+     */
+    private function isSetupMode(): bool
+    {
+        return $this->registry->registry('setup-mode-enabled') ?: false;
+    }
+
+    /**
+     * Start child process
+     *
+     * @param callable $userFunction
+     * @SuppressWarnings(PHPMD.ExitExpression)
+     */
+    private function startChildProcess(callable $userFunction)
+    {
+        $status = call_user_func($userFunction);
+        $status = is_integer($status) ? $status : 0;
+        exit($status);
+    }
+
+    /**
+     * Execute parent process
+     *
+     * @param int $threadNumber
+     */
+    private function executeParentProcess(int &$threadNumber)
+    {
+        $threadNumber++;
+        if ($threadNumber >= $this->threadsCount) {
+            pcntl_wait($status);
+            if (pcntl_wexitstatus($status) !== 0) {
+                $this->failInChildProcess = true;
+            }
+            $threadNumber--;
+        }
+    }
+}
diff --git a/app/code/Magento/Indexer/etc/cron_groups.xml b/app/code/Magento/Indexer/etc/cron_groups.xml
index 7afabee1949c0..076e73009ec21 100644
--- a/app/code/Magento/Indexer/etc/cron_groups.xml
+++ b/app/code/Magento/Indexer/etc/cron_groups.xml
@@ -11,8 +11,8 @@
         <schedule_ahead_for>4</schedule_ahead_for>
         <schedule_lifetime>2</schedule_lifetime>
         <history_cleanup_every>10</history_cleanup_every>
-        <history_success_lifetime>10080</history_success_lifetime>
-        <history_failure_lifetime>10080</history_failure_lifetime>
+        <history_success_lifetime>60</history_success_lifetime>
+        <history_failure_lifetime>4320</history_failure_lifetime>
         <use_separate_process>1</use_separate_process>
     </group>
 </config>
diff --git a/app/code/Magento/Indexer/etc/di.xml b/app/code/Magento/Indexer/etc/di.xml
index 610f08fac3a05..6abaaf625e108 100644
--- a/app/code/Magento/Indexer/etc/di.xml
+++ b/app/code/Magento/Indexer/etc/di.xml
@@ -42,7 +42,11 @@
         <plugin name="page-cache-indexer-reindex-clean-cache"
                 type="Magento\Indexer\Model\Processor\CleanCache" sortOrder="10"/>
     </type>
-
+    <type name="\Magento\Indexer\Model\ProcessManager">
+        <arguments>
+            <argument name="threadsCount" xsi:type="init_parameter">Magento\Indexer\Model\ProcessManager::THREADS_COUNT</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">
diff --git a/app/code/Magento/Integration/Controller/Token/Access.php b/app/code/Magento/Integration/Controller/Token/Access.php
index 88d5029a724c7..5b75643f51b50 100644
--- a/app/code/Magento/Integration/Controller/Token/Access.php
+++ b/app/code/Magento/Integration/Controller/Token/Access.php
@@ -6,11 +6,15 @@
  */
 namespace Magento\Integration\Controller\Token;
 
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
 use Magento\Integration\Model\Integration as IntegrationModel;
 use Magento\Integration\Api\IntegrationServiceInterface as IntegrationService;
 use Magento\Integration\Api\OauthServiceInterface as IntegrationOauthService;
+use Magento\Framework\App\Action\Action;
 
-class Access extends \Magento\Framework\App\Action\Action
+class Access extends Action implements CsrfAwareActionInterface
 {
     /**
      * @var \Magento\Framework\Oauth\OauthInterface
@@ -53,6 +57,23 @@ public function __construct(
         $this->helper = $helper;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      * Initiate AccessToken request operation
      *
diff --git a/app/code/Magento/Integration/Controller/Token/Request.php b/app/code/Magento/Integration/Controller/Token/Request.php
index 104a36e8ae8fe..04f368fc9f9fd 100644
--- a/app/code/Magento/Integration/Controller/Token/Request.php
+++ b/app/code/Magento/Integration/Controller/Token/Request.php
@@ -6,7 +6,12 @@
  */
 namespace Magento\Integration\Controller\Token;
 
-class Request extends \Magento\Framework\App\Action\Action
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+
+class Request extends Action implements CsrfAwareActionInterface
 {
     /**
      * @var  \Magento\Framework\Oauth\OauthInterface
@@ -33,6 +38,23 @@ public function __construct(
         $this->helper = $helper;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      *  Initiate RequestToken request operation
      *
diff --git a/app/code/Magento/Integration/etc/db_schema.xml b/app/code/Magento/Integration/etc/db_schema.xml
index 0e95ef54e1b99..9e81b867d36d5 100644
--- a/app/code/Magento/Integration/etc/db_schema.xml
+++ b/app/code/Magento/Integration/etc/db_schema.xml
@@ -88,6 +88,9 @@
             <column name="nonce"/>
             <column name="consumer_id"/>
         </constraint>
+        <index name="OAUTH_NONCE_TIMESTAMP" indexType="btree">
+            <column name="timestamp"/>
+        </index>
     </table>
     <table name="integration" resource="default" engine="innodb" comment="integration">
         <column xsi:type="int" name="integration_id" padding="10" unsigned="true" nullable="false" identity="true"
diff --git a/app/code/Magento/Integration/etc/db_schema_whitelist.json b/app/code/Magento/Integration/etc/db_schema_whitelist.json
index b7c3b992c0e27..6513778060288 100644
--- a/app/code/Magento/Integration/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Integration/etc/db_schema_whitelist.json
@@ -56,6 +56,9 @@
     "constraint": {
       "OAUTH_NONCE_CONSUMER_ID_OAUTH_CONSUMER_ENTITY_ID": true,
       "OAUTH_NONCE_NONCE_CONSUMER_ID": true
+    },
+    "index": {
+      "OAUTH_NONCE_TIMESTAMP": true
     }
   },
   "integration": {
diff --git a/app/code/Magento/Integration/view/adminhtml/web/js/integration.js b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
index 0bd7df8c0fa10..6921f645a2330 100644
--- a/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
+++ b/app/code/Magento/Integration/view/adminhtml/web/js/integration.js
@@ -200,7 +200,7 @@ define([
                     if (IdentityLogin.win.closed ||
                         IdentityLogin.win.location.href == IdentityLogin.successCallbackUrl //eslint-disable-line eqeqeq
                     ) {
-                        //Stop the the polling
+                        //Stop the polling
                         clearInterval(IdentityLogin.checker);
                         $('body').trigger('processStart');
                         //Check for window closed
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index 79db83e7a49b8..33c3706183368 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -216,7 +216,7 @@ public function getForm()
     }
 
     /**
-     * Return return template name for JS
+     * Return template name for JS
      *
      * @return string
      */
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
index 0dd2e5c4b387f..7f02e4ea13445 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
@@ -6,8 +6,32 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
-class MassDelete extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
+use Magento\Newsletter\Controller\Adminhtml\Subscriber;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Framework\App\ObjectManager;
+
+class MassDelete extends Subscriber
 {
+    /**
+     * @var SubscriberFactory
+     */
+    private $subscriberFactory;
+    
+    /**
+     * @param Context $context
+     * @param FileFactory $fileFactory
+     */
+    public function __construct(
+        Context $context,
+        FileFactory $fileFactory,
+        SubscriberFactory $subscriberFactory = null
+    ) {
+        $this->subscriberFactory = $subscriberFactory ?: ObjectManager::getInstance()->get(SubscriberFactory::class);
+        parent::__construct($context, $fileFactory);
+    }
+    
     /**
      * Delete one or more subscribers action
      *
@@ -21,9 +45,7 @@ public function execute()
         } else {
             try {
                 foreach ($subscribersIds as $subscriberId) {
-                    $subscriber = $this->_objectManager->create(
-                        \Magento\Newsletter\Model\Subscriber::class
-                    )->load(
+                    $subscriber = $this->subscriberFactory->create()->load(
                         $subscriberId
                     );
                     $subscriber->delete();
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
index f294d23f46ece..b61494f795905 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
@@ -6,8 +6,33 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
-class MassUnsubscribe extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
+use Magento\Newsletter\Controller\Adminhtml\Subscriber;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Framework\App\ObjectManager;
+
+class MassUnsubscribe extends Subscriber
 {
+    /**
+     * @var SubscriberFactory
+     */
+    private $subscriberFactory;
+    
+    /**
+     * @param Context $context
+     * @param FileFactory $fileFactory
+     * @param SubscriberFactory $subscriberFactory
+     */
+    public function __construct(
+        Context $context,
+        FileFactory $fileFactory,
+        SubscriberFactory $subscriberFactory = null
+    ) {
+        $this->subscriberFactory = $subscriberFactory ?: ObjectManager::getInstance()->get(SubscriberFactory::class);
+        parent::__construct($context, $fileFactory);
+    }
+    
     /**
      * Unsubscribe one or more subscribers action
      *
@@ -21,9 +46,7 @@ public function execute()
         } else {
             try {
                 foreach ($subscribersIds as $subscriberId) {
-                    $subscriber = $this->_objectManager->create(
-                        \Magento\Newsletter\Model\Subscriber::class
-                    )->load(
+                    $subscriber = $this->subscriberFactory->create()->load(
                         $subscriberId
                     );
                     $subscriber->unsubscribe();
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index dcb6341a7a8dd..76d55de5954b1 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -419,7 +419,6 @@ public function subscribe($email)
             self::XML_PATH_CONFIRMATION_FLAG,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) == 1 ? true : false;
-        $isOwnSubscribes = false;
 
         $isSubscribeOwnEmail = $this->_customerSession->isLoggedIn()
             && $this->_customerSession->getCustomerDataObject()->getEmail() == $email;
@@ -428,13 +427,7 @@ public function subscribe($email)
             || $this->getStatus() == self::STATUS_NOT_ACTIVE
         ) {
             if ($isConfirmNeed === true) {
-                // if user subscribes own login email - confirmation is not needed
-                $isOwnSubscribes = $isSubscribeOwnEmail;
-                if ($isOwnSubscribes == true) {
-                    $this->setStatus(self::STATUS_SUBSCRIBED);
-                } else {
-                    $this->setStatus(self::STATUS_NOT_ACTIVE);
-                }
+                $this->setStatus(self::STATUS_NOT_ACTIVE);
             } else {
                 $this->setStatus(self::STATUS_SUBSCRIBED);
             }
@@ -460,9 +453,7 @@ public function subscribe($email)
         try {
             /* Save model before sending out email */
             $this->save();
-            if ($isConfirmNeed === true
-                && $isOwnSubscribes === false
-            ) {
+            if ($isConfirmNeed === true) {
                 $this->sendConfirmationRequestEmail();
             } else {
                 $this->sendConfirmationSuccessEmail();
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
index 39beade9346d4..1318cb1f98f58 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Newsletter\Test\Unit\Model;
 
+use Magento\Newsletter\Model\Subscriber;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -116,7 +118,7 @@ public function testSubscribe()
         $email = 'subscriber_email@magento.com';
         $this->resource->expects($this->any())->method('loadByEmail')->willReturn(
             [
-                'subscriber_status' => 3,
+                'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
                 'subscriber_email' => $email,
                 'name' => 'subscriber_name'
             ]
@@ -133,7 +135,7 @@ public function testSubscribe()
         $this->sendEmailCheck();
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
 
-        $this->assertEquals(1, $this->subscriber->subscribe($email));
+        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->subscribe($email));
     }
 
     public function testSubscribeNotLoggedIn()
@@ -141,7 +143,7 @@ public function testSubscribeNotLoggedIn()
         $email = 'subscriber_email@magento.com';
         $this->resource->expects($this->any())->method('loadByEmail')->willReturn(
             [
-                'subscriber_status' => 3,
+                'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
                 'subscriber_email' => $email,
                 'name' => 'subscriber_name'
             ]
@@ -158,7 +160,7 @@ public function testSubscribeNotLoggedIn()
         $this->sendEmailCheck();
         $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
 
-        $this->assertEquals(2, $this->subscriber->subscribe($email));
+        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->subscribe($email));
     }
 
     public function testUpdateSubscription()
@@ -175,7 +177,7 @@ public function testUpdateSubscription()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 1
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -210,7 +212,7 @@ public function testUnsubscribeCustomerById()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 1
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -236,7 +238,7 @@ public function testSubscribeCustomerById()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 3
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -262,7 +264,7 @@ public function testSubscribeCustomerById1()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 3
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -276,7 +278,7 @@ public function testSubscribeCustomerById1()
         $this->scopeConfig->expects($this->atLeastOnce())->method('getValue')->with()->willReturn(true);
 
         $this->subscriber->subscribeCustomerById($customerId);
-        $this->assertEquals(\Magento\Newsletter\Model\Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->getStatus());
+        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->getStatus());
     }
 
     public function testSubscribeCustomerByIdAfterConfirmation()
@@ -293,7 +295,7 @@ public function testSubscribeCustomerByIdAfterConfirmation()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => 4
+                    'subscriber_status' => Subscriber::STATUS_UNCONFIRMED
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -305,7 +307,7 @@ public function testSubscribeCustomerByIdAfterConfirmation()
         $this->scopeConfig->expects($this->atLeastOnce())->method('getValue')->with()->willReturn(true);
 
         $this->subscriber->updateSubscription($customerId);
-        $this->assertEquals(\Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED, $this->subscriber->getStatus());
+        $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->subscriber->getStatus());
     }
 
     public function testUnsubscribe()
diff --git a/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php b/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php
deleted file mode 100644
index 4b51a9cf233a1..0000000000000
--- a/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\PageCache\Observer;
-
-use Magento\Framework\Event\ObserverInterface;
-
-class RegisterFormKeyFromCookie implements ObserverInterface
-{
-    /**
-     * @var \Magento\Framework\App\PageCache\FormKey
-     */
-    private $cookieFormKey;
-
-    /**
-     * @var \Magento\Framework\Escaper
-     */
-    private $escaper;
-
-    /**
-     * @var \Magento\Framework\Data\Form\FormKey
-     */
-    private $sessionFormKey;
-
-    /**
-     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
-     */
-    private $cookieMetadataFactory;
-
-    /**
-     * @var \Magento\Framework\Session\Config\ConfigInterface
-     */
-    private $sessionConfig;
-
-    /**
-     * @param \Magento\Framework\App\PageCache\FormKey $formKey
-     * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Framework\Data\Form\FormKey $sessionFormKey
-     * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
-     * @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
-     */
-    public function __construct(
-        \Magento\Framework\App\PageCache\FormKey $formKey,
-        \Magento\Framework\Escaper $escaper,
-        \Magento\Framework\Data\Form\FormKey $sessionFormKey,
-        \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
-        \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
-    ) {
-        $this->cookieFormKey = $formKey;
-        $this->escaper = $escaper;
-        $this->sessionFormKey = $sessionFormKey;
-        $this->cookieMetadataFactory = $cookieMetadataFactory;
-        $this->sessionConfig = $sessionConfig;
-    }
-
-    /**
-     * Register form key in session from cookie value
-     *
-     * @param \Magento\Framework\Event\Observer $observer
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function execute(\Magento\Framework\Event\Observer $observer)
-    {
-        if ($this->cookieFormKey->get()) {
-            $this->updateCookieFormKey($this->cookieFormKey->get());
-
-            $this->sessionFormKey->set(
-                $this->escaper->escapeHtml($this->cookieFormKey->get())
-            );
-        }
-    }
-
-    /**
-     * @param string $formKey
-     * @return void
-     */
-    private function updateCookieFormKey($formKey)
-    {
-        $cookieMetadata = $this->cookieMetadataFactory
-            ->createPublicCookieMetadata();
-        $cookieMetadata->setDomain($this->sessionConfig->getCookieDomain());
-        $cookieMetadata->setPath($this->sessionConfig->getCookiePath());
-        $lifetime = $this->sessionConfig->getCookieLifetime();
-        if ($lifetime !== 0) {
-            $cookieMetadata->setDuration($lifetime);
-        }
-
-        $this->cookieFormKey->set(
-            $formKey,
-            $cookieMetadata
-        );
-    }
-}
diff --git a/app/code/Magento/PageCache/Plugin/RegisterFormKeyFromCookie.php b/app/code/Magento/PageCache/Plugin/RegisterFormKeyFromCookie.php
new file mode 100644
index 0000000000000..6cdc500aaf33c
--- /dev/null
+++ b/app/code/Magento/PageCache/Plugin/RegisterFormKeyFromCookie.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Plugin;
+
+use Magento\Framework\App\PageCache\FormKey as CacheFormKey;
+use Magento\Framework\Escaper;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Session\Config\ConfigInterface;
+
+/**
+ * Allow for registration of a form key through cookies.
+ */
+class RegisterFormKeyFromCookie
+{
+    /**
+     * @var CacheFormKey
+     */
+    private $cookieFormKey;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $sessionConfig;
+
+    /**
+     * @param CacheFormKey $formKey
+     * @param Escaper $escaper
+     * @param FormKey $formKey
+     * @param CookieMetadataFactory $cookieMetadataFactory
+     * @param ConfigInterface $sessionConfig
+     */
+    public function __construct(
+        CacheFormKey $cacheFormKey,
+        Escaper $escaper,
+        FormKey $formKey,
+        CookieMetadataFactory $cookieMetadataFactory,
+        ConfigInterface $sessionConfig
+    ) {
+        $this->cookieFormKey = $cacheFormKey;
+        $this->escaper = $escaper;
+        $this->formKey = $formKey;
+        $this->cookieMetadataFactory = $cookieMetadataFactory;
+        $this->sessionConfig = $sessionConfig;
+    }
+
+    /**
+     * Set form key from the cookie.
+     *
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeDispatch(): void
+    {
+        if ($this->cookieFormKey->get()) {
+            $this->updateCookieFormKey($this->cookieFormKey->get());
+
+            $this->formKey->set(
+                $this->escaper->escapeHtml($this->cookieFormKey->get())
+            );
+        }
+    }
+
+    /**
+     * @param string $formKey
+     * @return void
+     */
+    private function updateCookieFormKey(string $formKey): void
+    {
+        $cookieMetadata = $this->cookieMetadataFactory
+            ->createPublicCookieMetadata();
+        $cookieMetadata->setDomain($this->sessionConfig->getCookieDomain());
+        $cookieMetadata->setPath($this->sessionConfig->getCookiePath());
+        $lifetime = $this->sessionConfig->getCookieLifetime();
+        if ($lifetime !== 0) {
+            $cookieMetadata->setDuration($lifetime);
+        }
+
+        $this->cookieFormKey->set(
+            $formKey,
+            $cookieMetadata
+        );
+    }
+}
diff --git a/app/code/Magento/PageCache/Test/Unit/Observer/RegisterFormKeyFromCookieTest.php b/app/code/Magento/PageCache/Test/Unit/Observer/RegisterFormKeyFromCookieTest.php
deleted file mode 100644
index 7bdea2e427c0b..0000000000000
--- a/app/code/Magento/PageCache/Test/Unit/Observer/RegisterFormKeyFromCookieTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\PageCache\Test\Unit\Observer;
-
-use Magento\Framework\App\PageCache\FormKey;
-use Magento\Framework\Escaper;
-use Magento\Framework\Session\Config\ConfigInterface;
-use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
-use Magento\PageCache\Observer\RegisterFormKeyFromCookie;
-
-class RegisterFormKeyFromCookieTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var RegisterFormKeyFromCookie */
-    protected $observer;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject|FormKey */
-    protected $cookieFormKey;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Data\Form\FormKey */
-    protected $sessionFormKey;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|CookieMetadataFactory
-     */
-    protected $cookieMetadataFactory;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ConfigInterface
-     */
-    protected $sessionConfig;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject|Escaper */
-    protected $escaper;
-
-    /**
-     * @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject|
-     */
-    protected $observerMock;
-
-    /**
-     * Set up all mocks and data for test
-     */
-    protected function setUp()
-    {
-        $this->cookieFormKey = $this->getMockBuilder(
-            \Magento\Framework\App\PageCache\FormKey::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->escaper = $this->getMockBuilder(
-            \Magento\Framework\Escaper::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->sessionFormKey = $this->getMockBuilder(
-            \Magento\Framework\Data\Form\FormKey::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->cookieMetadataFactory = $this->getMockBuilder(
-            \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->sessionConfig = $this->createMock(
-            \Magento\Framework\Session\Config\ConfigInterface::class
-        );
-
-        $this->observerMock = $this->createMock(\Magento\Framework\Event\Observer::class);
-
-        $this->observer = new RegisterFormKeyFromCookie(
-            $this->cookieFormKey,
-            $this->escaper,
-            $this->sessionFormKey,
-            $this->cookieMetadataFactory,
-            $this->sessionConfig
-        );
-    }
-
-    public function testExecuteNoCookie()
-    {
-        $this->cookieFormKey->expects(static::once())
-            ->method('get')
-            ->willReturn(null);
-        $this->cookieFormKey->expects(static::never())
-            ->method('set');
-        $this->sessionFormKey->expects(static::never())
-            ->method('set');
-
-        $this->observer->execute($this->observerMock);
-    }
-
-    public function testExecute()
-    {
-        $formKey = 'form_key';
-        $escapedFormKey = 'escaped_form_key';
-        $cookieDomain = 'example.com';
-        $cookiePath = '/';
-        $cookieLifetime = 3600;
-
-        $cookieMetadata = $this->getMockBuilder(
-            \Magento\Framework\Stdlib\Cookie\PublicCookieMetadata::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->cookieFormKey->expects(static::any())
-            ->method('get')
-            ->willReturn($formKey);
-        $this->cookieMetadataFactory->expects(static::once())
-            ->method('createPublicCookieMetadata')
-            ->willReturn(
-                $cookieMetadata
-            );
-
-        $this->sessionConfig->expects(static::once())
-            ->method('getCookieDomain')
-            ->willReturn(
-                $cookieDomain
-            );
-        $cookieMetadata->expects(static::once())
-            ->method('setDomain')
-            ->with(
-                $cookieDomain
-            );
-        $this->sessionConfig->expects(static::once())
-            ->method('getCookiePath')
-            ->willReturn(
-                $cookiePath
-            );
-        $cookieMetadata->expects(static::once())
-            ->method('setPath')
-            ->with(
-                $cookiePath
-            );
-        $this->sessionConfig->expects(static::once())
-            ->method('getCookieLifetime')
-            ->willReturn(
-                $cookieLifetime
-            );
-        $cookieMetadata->expects(static::once())
-            ->method('setDuration')
-            ->with(
-                $cookieLifetime
-            );
-
-        $this->cookieFormKey->expects(static::once())
-            ->method('set')
-            ->with(
-                $formKey,
-                $cookieMetadata
-            );
-
-        $this->escaper->expects(static::once())
-            ->method('escapeHtml')
-            ->with($formKey)
-            ->willReturn($escapedFormKey);
-
-        $this->sessionFormKey->expects(static::once())
-            ->method('set')
-            ->with($escapedFormKey);
-
-        $this->observer->execute($this->observerMock);
-    }
-}
diff --git a/app/code/Magento/PageCache/etc/di.xml b/app/code/Magento/PageCache/etc/di.xml
index 2a9abbb860805..adf9526fc1108 100644
--- a/app/code/Magento/PageCache/etc/di.xml
+++ b/app/code/Magento/PageCache/etc/di.xml
@@ -37,6 +37,9 @@
             <argument name="layoutCacheKey" xsi:type="object">Magento\Framework\View\Layout\LayoutCacheKeyInterface</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\FrontControllerInterface">
+        <plugin name="page_cache_from_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
+    </type>
     <preference for="Magento\PageCache\Model\VclGeneratorInterface" type="Magento\PageCache\Model\Varnish\VclGenerator"/>
     <preference for="Magento\PageCache\Model\VclTemplateLocatorInterface" type="Magento\PageCache\Model\Varnish\VclTemplateLocator"/>
 </config>
diff --git a/app/code/Magento/PageCache/etc/frontend/events.xml b/app/code/Magento/PageCache/etc/frontend/events.xml
deleted file mode 100644
index ce2c1c823e835..0000000000000
--- a/app/code/Magento/PageCache/etc/frontend/events.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <event name="controller_action_predispatch">
-        <observer name="register_form_key" instance="Magento\PageCache\Observer\RegisterFormKeyFromCookie" />
-    </event>
-</config>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 920c612021a1a..a726439331cb0 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -198,7 +198,6 @@
                     <attribute type="shared">1</attribute>
                 </field>
                 <field id="bml_wizard" translate="button_label" sortOrder="15" showInDefault="1" showInWebsite="1">
-                    <label></label>
                     <button_label>Get Publisher ID from PayPal</button_label>
                     <button_url><![CDATA[https:/financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard</frontend_model>
diff --git a/app/code/Magento/ProductVideo/i18n/en_US.csv b/app/code/Magento/ProductVideo/i18n/en_US.csv
index 3277843424bcf..2d226c6daefa3 100644
--- a/app/code/Magento/ProductVideo/i18n/en_US.csv
+++ b/app/code/Magento/ProductVideo/i18n/en_US.csv
@@ -40,4 +40,3 @@ Delete,Delete
 "Autostart base video","Autostart base video"
 "Show related video","Show related video"
 "Auto restart video","Auto restart video"
-"Images And Videos","Images And Videos"
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
index 0487d7e46eb26..2405eaa9d37a3 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -45,6 +45,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      */
     protected $_quoteConfig;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|null
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -56,6 +61,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
      * @param \Magento\Quote\Model\Quote\Config $quoteConfig
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     * @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -68,7 +74,8 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
         \Magento\Quote\Model\Quote\Config $quoteConfig,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         parent::__construct(
             $entityFactory,
@@ -82,6 +89,10 @@ public function __construct(
         $this->_itemOptionCollectionFactory = $itemOptionCollectionFactory;
         $this->_productCollectionFactory = $productCollectionFactory;
         $this->_quoteConfig = $quoteConfig;
+
+        // Backward compatibility constructor parameters
+        $this->storeManager = $storeManager ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
 
     /**
@@ -101,7 +112,10 @@ protected function _construct()
      */
     public function getStoreId()
     {
-        return (int)$this->_productCollectionFactory->create()->getStoreId();
+        // Fallback to current storeId if no quote is provided
+        // (see https://github.com/magento/magento2/commit/9d3be732a88884a66d667b443b3dc1655ddd0721)
+        return $this->_quote === null ?
+            (int) $this->storeManager->getStore()->getId() : (int) $this->_quote->getStoreId();
     }
 
     /**
diff --git a/app/code/Magento/ReleaseNotification/README.md b/app/code/Magento/ReleaseNotification/README.md
index e0d6e6de17c60..df3206a176f09 100644
--- a/app/code/Magento/ReleaseNotification/README.md
+++ b/app/code/Magento/ReleaseNotification/README.md
@@ -46,7 +46,7 @@ Each modal page can have the following optional content:
 
 The Sub Heading section is ideally used on the first modal page as a way to describe one to three highlighted features that will be presented in greater detail on the following modal pages. It is recommended to use the Main Content -> Text Body and Bullet Point lists as the paragraph and list content displayed on a highlighted feature's detail modal page.
 
-A clickable link to internal or external content in any text field will be created by using the following format and opened in a new browser tab. Providing the URL for the link followed by the the text to be displayed for that link in brackets will cause a clickable link to be created. The text between the brackets [text] will be the text that the clickable link shows.
+A clickable link to internal or external content in any text field will be created by using the following format and opened in a new browser tab. Providing the URL for the link followed by the text to be displayed for that link in brackets will cause a clickable link to be created. The text between the brackets [text] will be the text that the clickable link shows.
 
 ### Link Format Example:
 
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
index 891bfeefc9f52..05066fe5b125e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
@@ -70,7 +70,7 @@ public function execute()
 
     /**
      * Return component referrer url
-     * TODO: Technical dept referrer url should be implement as a part of Action configuration in in appropriate way
+     * TODO: Technical dept referrer url should be implement as a part of Action configuration in appropriate way
      *
      * @return null|string
      */
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index d3b8edbed2eea..7372d9715c725 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -1013,8 +1013,24 @@ public function addStatusToHistory($status, $comment = '', $isCustomerNotified =
      * @param string $comment
      * @param bool|string $status
      * @return OrderStatusHistoryInterface
+     * @deprecated
+     * @see addCommentToStatusHistory
      */
     public function addStatusHistoryComment($comment, $status = false)
+    {
+        return $this->addCommentToStatusHistory($comment, $status, false);
+    }
+    
+    /**
+     * Add a comment to order status history
+     * Different or default status may be specified
+     *
+     * @param string $comment
+     * @param bool|string $status
+     * @param bool $isVisibleOnFront
+     * @return OrderStatusHistoryInterface
+     */
+    public function addCommentToStatusHistory($comment, $status = false, $isVisibleOnFront = false)
     {
         if (false === $status) {
             $status = $this->getStatus();
@@ -1029,6 +1045,8 @@ public function addStatusHistoryComment($comment, $status = false)
             $comment
         )->setEntityName(
             $this->entityType
+        )->setIsVisibleOnFront(
+            $isVisibleOnFront
         );
         $this->addStatusHistory($history);
         return $history;
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
index 7dcb89fdc1628..df0f56dbf7866 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
@@ -68,4 +68,10 @@
         <selectOption selector="{{AdminDataGridHeaderSection.filterFieldSelect('status')}}" userInput="{{status}}" stepKey="fillOrderStatusFilter"/>
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
     </actionGroup>
+
+    <actionGroup name="AdminOrdersGridClearFiltersActionGroup">
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToGridOrdersPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.enabledFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
index aa744787b0fef..49aae467b7e09 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
@@ -17,6 +17,7 @@
         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
         <element name="idFilter" type="input" selector=".admin__data-grid-filters input[name='increment_id']"/>
         <element name="billToNameFilter" type="input" selector=".admin__data-grid-filters input[name='billing_name']"/>
+        <element name="enabledFilters" type="block" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
         <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
         <element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
index 2ff3d7756fe36..4cb72972b4ce2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
@@ -23,6 +23,7 @@
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
             <actionGroup ref="SetTaxClassForShipping" stepKey="setShippingTaxClass"/>
         </before>
         <after>
@@ -30,6 +31,7 @@
             <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteSalesRule">
                 <argument name="ruleName" value="{{ApiSalesRule.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
             <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createCategory" stepKey="deleteProduct1"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCategory1"/>
@@ -42,19 +44,15 @@
         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ApiSalesRule.name}}" stepKey="fillRuleName"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsite"/>
         <actionGroup ref="selectNotLoggedInCustomerGroup" stepKey="chooseNotLoggedInCustomerGroup"/>
-        <!--<selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>-->
 
         <!-- Open the Actions Tab in the Rules Edit page -->
         <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
         <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.applyDiscountToShippingLabel}}" stepKey="waitForElementToBeVisible"/>
         <click selector="{{AdminCartPriceRulesFormSection.applyDiscountToShippingLabel}}" stepKey="enableApplyDiscountToShiping"/>
-        <seeCheckboxIsChecked selector="{{AdminCartPriceRulesFormSection.applyDiscountToShipping}}" stepKey="DiscountIsAppliedToShiping"/>
+        <seeCheckboxIsChecked selector="{{AdminCartPriceRulesFormSection.applyDiscountToShipping}}" stepKey="discountIsAppliedToShiping"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Fixed amount discount" stepKey="selectActionType"/>
         <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="10" stepKey="fillDiscountAmount"/>
 
-        <!--<scrollTo selector="{{AdminCartPriceRulesFormSection.applyDiscountToShippingLabel}}" stepKey="scrollToShippingLabel"/>-->
-        <!--<click selector="{{AdminCartPriceRulesFormSection.applyDiscountToShippingLabel}}" stepKey="enableApplyDiscountToShiping"/>-->
-        <!--<seeCheckboxIsChecked selector="{{AdminCartPriceRulesFormSection.applyDiscountToShipping}}" stepKey="DiscountIsAppliedToShiping"/>-->
         <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
         <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
         <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
@@ -132,6 +130,6 @@
         <assertEquals expected='-$15.00' expectedType="string" actual="($grabRefundDiscountValue)" message="notExpectedDiscountOnRefundPage" stepKey="assertDiscountValue1"/>
         <grabTextFrom selector="{{AdminInvoiceTotalSection.grandTotal}}" stepKey="grabRefundGrandTotal"/>
         <assertEquals expected="($grabInvoiceGrandTotal)" actual="($grabRefundGrandTotal)" message="RefundGrandTotalMatchesWithInvoiceGrandTotal" stepKey="compareRefundGrandTotalAndInvoiceGrandTotal"/>
-        </test>
+    </test>
 </tests>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
index 8990ea8d3f75b..62bd9e27c832d 100644
--- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -47,7 +47,7 @@ define([
                             var buttons = controlButtonArea.childElements();
                             for (var i = 0; i < buttons.length; i++) {
                                 if (buttons[i].innerHTML.include(button.label)) {
-                                    return ;
+                                    return;
                                 }
                             }
                             button.insertIn(controlButtonArea, 'top');
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
index 20c2c1869fedb..1fca65932b0b0 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
@@ -31,6 +31,6 @@
     </td>
     <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item->getOrderItem()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php
index d826ad3425f54..b18f2cfc22613 100644
--- a/app/code/Magento/Store/App/Response/Redirect.php
+++ b/app/code/Magento/Store/App/Response/Redirect.php
@@ -77,21 +77,21 @@ public function __construct(
 
     /**
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function _getUrl()
     {
         $refererUrl = $this->_request->getServer('HTTP_REFERER');
-        $url = (string)$this->_request->getParam(self::PARAM_NAME_REFERER_URL);
-        if ($url) {
-            $refererUrl = $url;
-        }
-        $url = $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_BASE64_URL);
-        if ($url) {
-            $refererUrl = $this->_urlCoder->decode($url);
-        }
-        $url = $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED);
-        if ($url) {
-            $refererUrl = $this->_urlCoder->decode($url);
+        $encodedUrl = $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED)
+            ?: $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_BASE64_URL);
+
+        if ($encodedUrl) {
+            $refererUrl = $this->_urlCoder->decode($encodedUrl);
+        } else {
+            $url = (string)$this->_request->getParam(self::PARAM_NAME_REFERER_URL);
+            if ($url) {
+                $refererUrl = $url;
+            }
         }
 
         if (!$this->_isUrlInternal($refererUrl)) {
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
new file mode 100644
index 0000000000000..0252d7898beee
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\StoreGraphQl\Model\Resolver\Store;
+
+use Magento\Store\Api\Data\StoreConfigInterface;
+use Magento\Store\Api\StoreConfigManagerInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\StoreResolverInterface;
+
+/**
+ * StoreConfig field data provider, used for GraphQL request processing.
+ */
+class StoreConfigDataProvider
+{
+    /**
+     * @var StoreConfigManagerInterface
+     */
+    private $storeConfigManager;
+
+    /**
+     * @var StoreResolverInterface
+     */
+    private $storeResolver;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @param StoreConfigManagerInterface $storeConfigManager
+     * @param StoreResolverInterface $storeResolver
+     * @param StoreRepositoryInterface $storeRepository
+     */
+    public function __construct(
+        StoreConfigManagerInterface $storeConfigManager,
+        StoreResolverInterface $storeResolver,
+        StoreRepositoryInterface $storeRepository
+    ) {
+        $this->storeConfigManager = $storeConfigManager;
+        $this->storeResolver = $storeResolver;
+        $this->storeRepository = $storeRepository;
+    }
+
+    /**
+     * Get store config for current store
+     *
+     * @return array
+     */
+    public function getStoreConfig() : array
+    {
+        $storeId = $this->storeResolver->getCurrentStoreId();
+        $store = $this->storeRepository->getById($storeId);
+        $storeConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
+
+        return $this->hidrateStoreConfig($storeConfig);
+    }
+
+    /**
+     * Transform StoreConfig object to in array format
+     *
+     * @param StoreConfigInterface $storeConfig
+     * @return array
+     */
+    private function hidrateStoreConfig($storeConfig): array
+    {
+        /** @var StoreConfigInterface $storeConfig */
+        $storeConfigData = [
+            'id' => $storeConfig->getId(),
+            'code' => $storeConfig->getCode(),
+            'website_id' => $storeConfig->getWebsiteId(),
+            'locale' => $storeConfig->getLocale(),
+            'base_currency_code' => $storeConfig->getBaseCurrencyCode(),
+            'default_display_currency_code' => $storeConfig->getDefaultDisplayCurrencyCode(),
+            'timezone' => $storeConfig->getTimezone(),
+            'weight_unit' => $storeConfig->getWeightUnit(),
+            'base_url' => $storeConfig->getBaseUrl(),
+            'base_link_url' => $storeConfig->getBaseLinkUrl(),
+            'base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
+            'base_media_url' => $storeConfig->getBaseMediaUrl(),
+            'secure_base_url' => $storeConfig->getSecureBaseUrl(),
+            'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
+            'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
+            'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl()
+        ];
+
+        return $storeConfigData;
+    }
+}
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php b/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php
new file mode 100644
index 0000000000000..8e5bf0120b8b8
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\StoreGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider;
+
+/**
+ * StoreConfig page field resolver, used for GraphQL request processing.
+ */
+class StoreConfigResolver implements ResolverInterface
+{
+    /**
+     * @var StoreConfigDataProvider
+     */
+    private $storeConfigDataProvider;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @param StoreConfigDataProvider $storeConfigsDataProvider
+     * @param ValueFactory $valueFactory
+     */
+    public function __construct(
+        StoreConfigDataProvider $storeConfigsDataProvider,
+        ValueFactory $valueFactory
+    ) {
+        $this->valueFactory = $valueFactory;
+        $this->storeConfigDataProvider = $storeConfigsDataProvider;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) : Value {
+
+        $storeConfigData = $this->storeConfigDataProvider->getStoreConfig();
+
+        $result = function () use ($storeConfigData) {
+            return !empty($storeConfigData) ? $storeConfigData : [];
+        };
+
+        return $this->valueFactory->create($result);
+    }
+}
diff --git a/app/code/Magento/StoreGraphQl/composer.json b/app/code/Magento/StoreGraphQl/composer.json
index 91f79b39c023a..d03d759babd22 100644
--- a/app/code/Magento/StoreGraphQl/composer.json
+++ b/app/code/Magento/StoreGraphQl/composer.json
@@ -4,7 +4,8 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.1.3||~7.2.0",
-        "magento/framework": "*"
+        "magento/framework": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*",
diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
index 6eea6da8fd6fa..af79d0e3e28b7 100644
--- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -1,5 +1,8 @@
 # Copyright © Magento, Inc. All rights reserved.
 # See COPYING.txt for license details.
+type Query {
+    storeConfig : StoreConfig @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\StoreConfigResolver") @doc(description: "The store config query")
+}
 
 type Website @doc(description: "The type contains information about a website") {
     id : Int @doc(description: "The ID number assigned to the website")
@@ -9,3 +12,22 @@ type Website @doc(description: "The type contains information about a website")
     default_group_id : String @doc(description: "The default group id that the website has")
     is_default : Boolean @doc(description: "Specifies if this is the default website")
 }
+
+type StoreConfig @doc(description: "The type contains information about a store config") {
+    id : Int @doc(description: "The ID number assigned to the store")
+    code : String @doc(description: "A code assigned to the store to identify it")
+    website_id : Int @doc(description: "The ID number assigned to the website store belongs")
+    locale : String @doc(description: "Store locale")
+    base_currency_code : String @doc(description: "Base currency code")
+    default_display_currency_code : String @doc(description: "Default display currency code")
+    timezone : String @doc(description: "Timezone of the store")
+    weight_unit : String @doc(description: "The unit of weight")
+    base_url : String @doc(description: "Base URL for the store")
+    base_link_url : String @doc(description: "Base link URL for the store")
+    base_static_url : String @doc(description: "Base static URL for the store")
+    base_media_url : String @doc(description: "Base media URL for the store")
+    secure_base_url : String @doc(description: "Secure base URL for the store")
+    secure_base_link_url : String @doc(description: "Secure base link URL for the store")
+    secure_base_static_url : String @doc(description: "Secure base static URL for the store")
+    secure_base_media_url : String @doc(description: "Secure base media URL for the store")
+}
diff --git a/app/code/Magento/Tax/Block/Sales/Order/Tax.php b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
index 71eb629111344..4d48abbcb0982 100644
--- a/app/code/Magento/Tax/Block/Sales/Order/Tax.php
+++ b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
@@ -264,12 +264,6 @@ protected function _initShipping()
      */
     protected function _initDiscount()
     {
-        //        $store  = $this->getStore();
-        //        $parent = $this->getParentBlock();
-        //        if ($this->_config->displaySales) {
-        //
-        //        } elseif ($this->_config->displaySales) {
-        //        }
     }
 
     /**
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml
new file mode 100644
index 0000000000000..d7c88c1d282e2
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- Default Tax Destination Calculation -->
+    <entity name="CountryUS" type="country">
+        <data key="value">US</data>
+    </entity>
+    <entity name="AllPostCode" type="postcode">
+        <data key="value">*</data>
+    </entity>
+    <!-- Shopping Cart Display Settings -->
+    <entity name="IncludeTaxInOrderTotalCart" type="grandtotalCart">
+        <data key="value">1</data>
+    </entity>
+    <entity name="DisplayFullTaxSummaryCart" type="full_summaryCart">
+        <data key="value">1</data>
+    </entity>
+    <entity name="DisplayZeroTaxSubtotalCart" type="zero_taxCart">
+        <data key="value">1</data>
+    </entity>
+    <entity name="Tax_Config_CA" type="tax_config_state">
+    <!-- Default Tax Destination Calculation -->
+        <requiredEntity type="country">CountryUS</requiredEntity>
+        <requiredEntity type="region">Region_CA</requiredEntity>
+        <requiredEntity type="postcode">AllPostCode</requiredEntity>
+    <!-- Shopping Cart Display Settings -->
+        <requiredEntity type="grandtotalCart">IncludeTaxInOrderTotalCart</requiredEntity>
+        <requiredEntity type="full_summaryCart">DisplayFullTaxSummaryCart</requiredEntity>
+        <requiredEntity type="zero_taxCart">DisplayZeroTaxSubtotalCart</requiredEntity>
+    </entity>
+
+    <entity name="Tax_Config_NY" type="tax_config_state">
+    <!-- Default Tax Destination Calculation -->
+        <requiredEntity type="country">CountryUS</requiredEntity>
+        <requiredEntity type="region">Region_NY</requiredEntity>
+        <requiredEntity type="postcode">AllPostCode</requiredEntity>
+    <!-- Shopping Cart Display Settings -->
+        <requiredEntity type="grandtotalCart">IncludeTaxInOrderTotalCart</requiredEntity>
+        <requiredEntity type="full_summaryCart">DisplayFullTaxSummaryCart</requiredEntity>
+        <requiredEntity type="zero_taxCart">DisplayZeroTaxSubtotalCart</requiredEntity>
+    </entity>
+    <!-- Set default settings -->
+    <entity name="DefaultTaxConfig" type="tax_config_default">
+        <requiredEntity type="taxTotalFlagZero">DefaultTotalFlagZero</requiredEntity>
+        <requiredEntity type="taxPostCodeEmpty">EmptyField</requiredEntity>
+    </entity>
+    <entity name="DefaultTotalFlagZero" type="taxTotalFlagZero">
+        <data key="value">0</data>
+    </entity>
+    <entity name="EmptyField" type="taxPostCodeEmpty">
+        <data key="value"/>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml
new file mode 100644
index 0000000000000..c27225a339831
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRegionData.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Region_NY" type="region">
+        <data key="value">43</data>
+    </entity>
+    <entity name="Region_CA" type="region">
+        <data key="value">12</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
new file mode 100644
index 0000000000000..16c891745426d
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SimpleTaxRule" type="taxRule">
+        <data key="code" unique="suffix">TaxRule</data>
+        <data key="position">0</data>
+        <data key="priority">0</data>
+        <array key="customer_tax_class_ids">
+            <item>3</item>
+        </array>
+        <array key="product_tax_class_ids">
+            <item>2</item>
+        </array>
+        <array key="tax_rate_ids">
+            <item>1</item>
+            <item>2</item>
+        </array>
+        <data key="calculate_subtotal">true</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
new file mode 100644
index 0000000000000..137c2e48c111e
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateTaxConfigDefaultsTaxDestination" dataType="tax_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
+        <object key="groups" dataType="tax_config_state">
+            <object key="defaults" dataType="tax_config_state">
+                 <object key="fields" dataType="tax_config_state">
+                    <object key="country" dataType="country">
+                    <field key="value">string</field>
+                    </object>
+                    <object key="region" dataType="region">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="postcode" dataType="postcode">
+                        <field key="value">string</field>
+                    </object>
+                 </object>
+            </object>
+            <object key="cart_display" dataType="tax_config_state">
+                <object key="fields" dataType="tax_config_state">
+                  <object key="grandtotal" dataType="grandtotalCart">
+                      <field key="value">string</field>
+                  </object>
+                    <object key="full_summary" dataType="full_summaryCart">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="zero_tax" dataType="zero_taxCart">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+    <operation name="TaxConfigDefaultsTaxDestination" dataType="tax_config_default" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
+        <object key="groups" dataType="tax_config_default">
+            <object key="calculation" dataType="tax_config_default">
+              <object key="fields" dataType="tax_config_default">
+                <object key="algorithm" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="based_on" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="price_includes_tax" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="shipping_includes_tax" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="apply_after_discount" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="discount_tax" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="apply_tax_on" dataType="tax_config_default">
+                  <object key="inherit" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                  </object>
+                </object>
+                <object key="cross_border_trade_enabled" dataType="taxTotalFlagZero">
+                    <field key="value">integer</field>
+                </object>
+              </object>
+            </object>
+            <object key="defaults" dataType="tax_config_default">
+                 <object key="fields" dataType="tax_config_default">
+                    <object key="country" dataType="tax_config_default">
+                      <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                      </object>
+                    </object>
+                    <object key="region" dataType="tax_config_default">
+                      <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                      </object>
+                    </object>
+                    <object key="postcode" dataType="taxPostCodeEmpty">
+                        <field key="value">string</field>
+                    </object>
+                 </object>
+            </object>
+            <object key="cart_display" dataType="tax_config_default">
+                <object key="fields" dataType="tax_config_default">
+                  <object key="price" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="subtotal" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="shipping" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="gift_wrapping" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                  </object>
+                  <object key="printed_card" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                  </object>
+                  <object key="grandtotal" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                    <object key="full_summary" dataType="tax_config_default">
+                      <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                      </object>
+                    </object>
+                    <object key="zero_tax" dataType="tax_config_default">
+                      <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                      </object>
+                    </object>
+                </object>
+            </object>
+            <object key="sales_display" dataType="tax_config_default">
+                <object key="fields" dataType="tax_config_default">
+                  <object key="price" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="subtotal" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="shipping" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="gift_wrapping" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                  </object>
+                  <object key="printed_card" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                  </object>
+                  <object key="grandtotal" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                      <field key="value">integer</field>
+                    </object>
+                  </object>
+                  <object key="full_summary" dataType="tax_config_default">
+                      <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                      </object>
+                  </object>
+                  <object key="zero_tax" dataType="tax_config_default">
+                    <object key="inherit" dataType="taxTotalFlagZero">
+                        <field key="value">integer</field>
+                    </object>
+                  </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml
new file mode 100644
index 0000000000000..f9886303fd3a3
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rule-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateTaxRule" dataType="taxRule" type="create" auth="adminOauth" url="/V1/taxRules" method="POST">
+        <contentType>application/json</contentType>
+        <object key="rule" dataType="taxRule">
+            <field key="id">integer</field>
+            <field key="code" required="true">string</field>
+            <field key="priority">integer</field>
+            <field key="position">integer</field>
+            <array key="customer_tax_class_ids">
+                <value>integer</value>
+            </array>
+            <array key="product_tax_class_ids">
+                <value>integer</value>
+            </array>
+            <array key="tax_rate_ids">
+                <value>integer</value>
+            </array>
+            <field key="calculate_subtotal">boolean</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+    <operation name="DeleteTaxRule" dataType="taxRule" type="delete" auth="adminOauth" url="/V1/taxRules/{id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
index ad68179119834..c54c525d8d7ed 100644
--- a/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
@@ -11,14 +11,29 @@
     <section name="AdminConfigureTaxSection">
         <!-- on page /admin/admin/system_config/edit/section/tax/ -->
         <element name="taxClasses" type="block" selector="#tax_classes-head" timeout="30"/>
-        <element name="calculationSettings" type="block" selector="#tax_calculation-head:not(.open)" timeout="30"/>
-        
+
+        <element name="taxCalculationSettings" type="block" selector="#tax_calculation-head" timeout="30"/>
+        <element name="taxCalculationSettingsOpened" type="block" selector="#tax_calculation-head.open" timeout="30"/>
+        <element name="taxCalculationAlgorithm" type="select" selector="#tax_calculation_algorithm"/>
+        <element name="taxCalculationAlgorithmDisabled" type="select" selector="#tax_calculation_algorithm[disabled='disabled']"/>
+        <element name="taxCalculationAlgorithmInherit" type="checkbox" selector="#tax_calculation_algorithm_inherit"/>
+        <element name="taxCalculationBased" type="select" selector="#tax_calculation_based_on"/>
+        <element name="taxCalculationBasedDisabled" type="select" selector="#tax_calculation_based_on[disabled='disabled']"/>
+        <element name="taxCalculationBasedInherit" type="checkbox" selector="#tax_calculation_based_on_inherit"/>
+        <element name="taxCalculationPrices" type="select" selector="#tax_calculation_price_includes_tax"/>
+        <element name="taxCalculationPricesDisabled" type="select" selector="#tax_calculation_price_includes_tax[disabled='disabled']"/>
+        <element name="taxCalculationPricesInherit" type="checkbox" selector="#tax_calculation_price_includes_tax_inherit"/>
+
         <element name="defaultDestination" type="block" selector="#tax_defaults-head" timeout="30"/>
         <element name="systemValueDefaultState" type="checkbox" selector="#row_tax_defaults_region input[type='checkbox']"/>
         <element name="dropdownDefaultState" type="select" selector="#row_tax_defaults_region select"/>
-        <element name="defaultPostCode" type="input" selector="#tax_defaults_postcode"/>
+        <element name="defaultPostCode" type="checkbox" selector="#tax_defaults_postcode"/>
         
-        <element name="priceDisplaySettings" type="block" selector="#tax_display-head:not(.open)" timeout="30"/>
+        <element name="taxPriceDisplaySettings" type="block" selector="#tax_display-head" timeout="30"/>
+        <element name="taxPriceDisplaySettingsOpened" type="block" selector="#tax_display-head.open" timeout="30"/>
+        <element name="taxDisplayProductPrices" type="select" selector="#tax_display_type"/>
+        <element name="taxDisplayProductPricesDisabled" type="select" selector="#tax_display_type[disabled='disabled']"/>
+        <element name="taxDisplayProductPricesInherit" type="checkbox" selector="#tax_display_type_inherit"/>
 
         <element name="shoppingCartDisplay" type="block" selector="#tax_cart_display-head" timeout="30"/>
         <element name="systemValueIncludeTaxTotalCart" type="checkbox" selector="#row_tax_cart_display_grandtotal input[type='checkbox']"/>
@@ -35,7 +50,5 @@
         <element name="dropdownDisplayTaxSummarySales" type="checkbox" selector="#row_tax_sales_display_full_summary select"/>
         <element name="systemValueDisplayZeroTaxSales" type="checkbox" selector="#row_tax_sales_display_zero_tax input[type='checkbox']"/>
         <element name="dropdownDisplayZeroTaxSales" type="checkbox" selector="#row_tax_sales_display_zero_tax select"/>
-
-        <element name="priceDisplaySettings" type="block" selector="#tax_weee-head" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml
new file mode 100644
index 0000000000000..b47e8b85e5231
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CheckoutCartSummarySection">
+        <element name="taxAmount" type="text" selector="[data-th='Tax']>span"/>
+        <element name="taxSummary" type="text" selector=".totals-tax-summary"/>
+        <element name="rate" type="text" selector=" tr.totals-tax-details.shown th.mark"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
new file mode 100644
index 0000000000000..fdd6d18dae9c4
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest">
+        <annotations>
+            <features value="Tax information in shopping cart for Customer with default addresses (physical quote)"/>
+            <title value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (physical quote)"/>
+            <description value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (physical quote)"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-41932"/>
+            <group value="checkout"/>
+            <group value="tax"/>
+        </annotations>
+        <before>
+            <!-- Preconditions  -->
+            <!--  Tax Rule is created based on default tax rates (Stores>Tax Rule) US-CA-*-Rate 1 = 8.2500 US-NY-*-Rate 1 = 8.3750 -->
+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
+            <!--  Fixed Product Tax attribute is created and added to default attribute set -->
+            <createData entity="productFPTAttribute" stepKey="createProductFPTAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addFPTToAttributeSet">
+                <requiredEntity createDataKey="createProductFPTAttribute"/>
+            </createData>
+            <!--  Tax configuration (Store>Configuration; Sales>Tax) With FPT Enable -->
+            <createData entity="Tax_Config_NY" stepKey="taxConfigurationNYWithFPTEnable"/>
+            <!--  Store>Configuration; Sales>Tax FPT Enable -->
+            <createData entity="WeeeConfigEnable" stepKey="enableFPT"/>
+            <!--  Simple product is created  Price = 10;  FPT United States/California/10,United States/New York/20 -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <field key="price">10.00</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Customer is created with default addresses: -->
+            <createData entity="Simple_US_Customer_CA" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductAddFPTValueActionGroup" stepKey="addFPTValue1">
+                <argument name="FPTAttributeCode" value="$$createProductFPTAttribute.attribute_code$$"/>
+                <argument name="stateForFPT" value="California"/>
+                <argument name="valueForFPT" value="10"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductAddFPTValueActionGroup" stepKey="addFPTValue2">
+                <argument name="FPTAttributeCode" value="$$createProductFPTAttribute.attribute_code$$"/>
+                <argument name="stateForFPT" value="New York"/>
+                <argument name="valueForFPT" value="20"/>
+            </actionGroup>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
+            <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
+            <createData entity="WeeeConfigDisable" stepKey="disableFPT"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--  Test Steps  -->
+        <!--  Step 1: Go to Storefront as logged in Customer  -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <!--  Step 2: Add simple product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddSimpleProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!--  Step 3: Go to Shopping Cart -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <!--  Step 4: Open Estimate Shipping and Tax section -->
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <see selector="{{CheckoutCartSummarySection.country}}" userInput="$$createCustomer.country_id$$" stepKey="checkCustomerCountry" />
+        <see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="$$createCustomer.state$$" stepKey="checkCustomerRegion" />
+        <see selector="{{CheckoutCartSummarySection.postcode}}" userInput="$$createCustomer.postcode$$" stepKey="checkCustomerPostcode" />
+        <see selector="{{CheckoutCartSummarySection.amountFPT}}" userInput="$10" stepKey="checkFPTAmountCA" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.83" stepKey="checkTaxAmountCA" />
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary"/>
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-CA-*-Rate 1 (8.25%)" stepKey="checkRateCA" />
+        <!--  Step 5: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Switzerland" stepKey="selectSwitzerlandCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Aargau" stepKey="selectAargauRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="1234" stepKey="inputPostCode"/>
+        <!--  Step 6: Select shipping rate again(it need for get new totals request - performance reason) -->
+        <click selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectflatRateShippingMethodShippingMethod"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxAmount}}" stepKey="scrollToTaxSummary2" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.00" stepKey="checkTaxAmount" />
+        <dontSeeElement selector="{{CheckoutCartSummarySection.amountFPT}}" stepKey="checkFPTIsNotDisplayed" />
+        <!--  Step 7: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUnitedStatesCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="New York" stepKey="selectNewYorkRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="12345" stepKey="inputPostCode2"/>
+        <!--  Step 8: Select shipping rate again(it need for get new totals request - performance reason) -->
+        <click selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectflatRateShippingMethodShippingMethod2"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary3" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary3"/>
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.84" stepKey="checkTaxAmountNY" />
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-NY-*-Rate 1 (8.375%)" stepKey="checkRateNY" />
+        <see selector="{{CheckoutCartSummarySection.amountFPT}}" userInput="$20" stepKey="checkFPTAmountNY" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
new file mode 100644
index 0000000000000..c27af9a6f63f5
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest">
+        <annotations>
+            <features value="Tax information in shopping cart for Customer with default addresses (virtual quote)"/>
+            <title value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (virtual quote)"/>
+            <description value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (virtual quote)"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-41933"/>
+            <group value="checkout"/>
+            <group value="tax"/>
+        </annotations>
+        <before>
+            <!-- Preconditions  -->
+            <!--  Tax Rule is created based on default tax rates (Stores>Tax Rule) US-CA-*-Rate 1 = 8.2500 US-NY-*-Rate 1 = 8.3750 -->
+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
+            <!--  Fixed Product Tax attribute is created and added to default attribute set -->
+            <createData entity="productFPTAttribute" stepKey="createProductFPTAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addFPTToAttributeSet">
+                <requiredEntity createDataKey="createProductFPTAttribute"/>
+            </createData>
+            <!--  Tax configuration (Store>Configuration; Sales>Tax) -->
+            <createData entity="Tax_Config_CA" stepKey="taxConfigurationCA"/>
+            <!--  Virtual product is created: -->
+            <createData entity="VirtualProduct" stepKey="createVirtualProduct">
+                <field key="price">40.00</field>
+            </createData>
+            <!-- Customer is created with default addresses: -->
+            <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
+            <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
+            <deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+        <!--  Test Steps  -->
+        <!--  Step 1: Go to Storefront as logged in Customer  -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <!--  Step 2: Add virtual product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.name$$)}}" stepKey="amOnStorefrontVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddVirtualProductToCart">
+            <argument name="product" value="$$createVirtualProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!--  Step 3: Go to Shopping Cart -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <!--  Step 4: Open Estimate Shipping and Tax section -->
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <see selector="{{CheckoutCartSummarySection.country}}" userInput="$$createCustomer.country_id$$" stepKey="checkCustomerCountry" />
+        <see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="$$createCustomer.state$$" stepKey="checkCustomerRegion" />
+        <see selector="{{CheckoutCartSummarySection.postcode}}" userInput="$$createCustomer.postcode$$" stepKey="checkCustomerPostcode" />
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="expandTaxSummary"/>
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-NY-*-Rate 1 (8.375%)" stepKey="checkRateNY" />
+        <!--  Step 5: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Switzerland" stepKey="selectSwitzerlandCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Aargau" stepKey="selectAargauRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="1234" stepKey="inputPostCode"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxAmount}}" stepKey="scrollToTaxSummary2" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.00" stepKey="checkTaxAmount" />
+        <!--  Step 6: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUnitedStatesCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="90230" stepKey="inputPostCode2"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary3" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary2"/>
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$3.30" stepKey="checkTaxAmount2" />
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-CA-*-Rate 1 (8.25%)" stepKey="checkRateCA" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
new file mode 100644
index 0000000000000..891e8f4e7968b
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest">
+        <annotations>
+            <features value="Tax information in shopping cart for Guest (physical quote)"/>
+            <title value="Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
+            <description value="Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-41930"/>
+            <!--Skip because of issue MAGETWO-90966 on 4 step-->
+            <group value="skip"/>
+            <group value="checkout"/>
+            <group value="tax"/>
+        </annotations>
+        <before>
+            <!-- Preconditions  -->
+            <!--  Tax Rule is created based on default tax rates (Stores>Tax Rule) US-CA-*-Rate 1 = 8.2500 US-NY-*-Rate 1 = 8.3750 -->
+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
+            <!--  Fixed Product Tax attribute is created and added to default attribute set -->
+            <createData entity="productFPTAttribute" stepKey="createProductFPTAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addFPTToAttributeSet">
+                <requiredEntity createDataKey="createProductFPTAttribute"/>
+            </createData>
+            <!--  Tax configuration (Store>Configuration; Sales>Tax) -->
+            <createData entity="Tax_Config_CA" stepKey="taxConfigurationForCA"/>
+            <!--  Store>Configuration; Sales>Tax FPT Enable -->
+            <createData entity="WeeeConfigEnable" stepKey="enableFPT"/>
+            <!--  Simple product is created  Price = 10;  FPT United States/California/10,United States/New York/20 -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <field key="price">10.00</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+             </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
+                <argument name="product" value="$$createSimpleProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductAddFPTValueActionGroup" stepKey="addFPTValue1">
+                <argument name="FPTAttributeCode" value="$$createProductFPTAttribute.attribute_code$$"/>
+                <argument name="stateForFPT" value="California"/>
+                <argument name="valueForFPT" value="10"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductAddFPTValueActionGroup" stepKey="addFPTValue2">
+                <argument name="FPTAttributeCode" value="$$createProductFPTAttribute.attribute_code$$"/>
+                <argument name="stateForFPT" value="New York"/>
+                <argument name="valueForFPT" value="20"/>
+            </actionGroup>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
+            <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
+            <createData entity="WeeeConfigDisable" stepKey="disableFPT"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--  Test Steps  -->
+        <!--  Step 1: Go to Storefront as Guest -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <!--  Step 2: Add simple product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddSimpleProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!--  Step 3: Go to Shopping Cart -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <!--  Step 4: Open Estimate Shipping and Tax section -->
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <see selector="{{CheckoutCartSummarySection.amountFPT}}" userInput="$10" stepKey="checkFPTAmountCA" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.83" stepKey="checkTaxAmountCA" />
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary"/>
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-CA-*-Rate 1 (8.25%)" stepKey="checkRateCA" />
+        <!--  Step 5: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Switzerland" stepKey="selectSwitzerlandCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Aargau" stepKey="selectAargauRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="1234" stepKey="inputPostCode"/>
+        <!--  Step 6: Select shipping rate again(it need for get new totals request - performance reason) -->
+        <click selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectflatRateShippingMethodShippingMethod"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxAmount}}" stepKey="scrollToTaxSummary2" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.00" stepKey="checkTaxAmount" />
+        <dontSeeElement selector="{{CheckoutCartSummarySection.amountFPT}}" stepKey="checkFPTIsNotDisplayed" />
+        <!--  Step 7: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUnitedStatesCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="New York" stepKey="selectNewYorkRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="12345" stepKey="inputPostCode2"/>
+        <!--  Step 8: Select shipping rate again(it need for get new totals request - performance reason) -->
+        <click selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectflatRateShippingMethodShippingMethod2"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary3" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary2"/>
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.84" stepKey="checkTaxAmountNY" />
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-NY-*-Rate 1 (8.375%)" stepKey="checkRateNY" />
+        <see selector="{{CheckoutCartSummarySection.amountFPT}}" userInput="$20" stepKey="checkFPTAmountNY" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml
new file mode 100644
index 0000000000000..9f33c1a8b155a
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest">
+        <annotations>
+            <features value="Tax information in shopping cart for Guest (virtual quote)"/>
+            <title value="Tax information are updating/recalculating on fly in shopping cart for Guest (virtual quote)"/>
+            <description value="Tax information are updating/recalculating on fly in shopping cart for Guest (virtual quote)"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-41931"/>
+            <!--Skip because of issue MAGETWO-90966 on 4 step-->
+            <group value="skip"/>
+            <group value="checkout"/>
+            <group value="tax"/>
+         </annotations>
+         <before>
+             <!-- Preconditions  -->
+            <!--  Tax Rule is created based on default tax rates (Stores>Tax Rule) US-CA-*-Rate 1 = 8.2500 US-NY-*-Rate 1 = 8.3750 -->
+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
+            <!--  Fixed Product Tax attribute is created and added to default attribute set -->
+            <createData entity="productFPTAttribute" stepKey="createProductFPTAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addFPTToAttributeSet">
+                <requiredEntity createDataKey="createProductFPTAttribute"/>
+            </createData>
+            <!--  Tax configuration (Store>Configuration; Sales>Tax) -->
+            <createData entity="Tax_Config_CA" stepKey="taxConfigurationCA"/>
+            <!--  Virtual product is created: Price = 10 -->
+            <createData entity="VirtualProduct" stepKey="createVirtualProduct">
+                <field key="price">40.00</field>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
+            <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
+            <deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
+        </after>
+        <!--  Test Steps  -->
+        <!--  Step 1: Go to Storefront as Guest -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <!--  Step 2: Add virtual product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.name$$)}}" stepKey="amOnStorefrontVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddVirtualProductToCart">
+            <argument name="product" value="$$createVirtualProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!--  Step 3: Go to Shopping Cart -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <!--  Step 4: Open Estimate Shipping and Tax section -->
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$3.30" stepKey="checkTaxAmountCA" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary"/>
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-CA-*-Rate 1 (8.25%)" stepKey="checkRateCA" />
+        <!--  Step 5: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="Switzerland" stepKey="selectSwitzerlandCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Aargau" stepKey="selectAargauRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="1234" stepKey="inputPostCode"/>
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$0.00" stepKey="checkTaxAmount" />
+        <!--  Step 6: Change Data -->
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUnitedStatesCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="New York" stepKey="selectNewYorkRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="12345" stepKey="inputPostCode2"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary2" />
+        <click selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="taxSummary2"/>
+        <see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$3.35" stepKey="checkTaxAmountNY" />
+        <see selector="{{CheckoutCartSummarySection.rate}}" userInput="US-NY-*-Rate 1 (8.375%)" stepKey="checkRateNY" />
+    </test>
+</tests>
diff --git a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
index 8ec871a182ab4..c8cba30c9cd25 100644
--- a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
+++ b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
@@ -237,7 +237,7 @@ protected function _importRate(array $rateData, array $regionsCache, array $stor
         $countryCode = $rateData[1];
         $country = $this->_countryFactory->create()->loadByCode($countryCode, 'iso2_code');
         if (!$country->getId()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('One of the countries has invalid code.'));
+            throw new \Magento\Framework\Exception\LocalizedException(__('Country code is invalid: %1', $countryCode));
         }
         $regionsCache = $this->_addCountryRegionsToCache($countryCode, $regionsCache);
 
diff --git a/app/code/Magento/TaxImportExport/i18n/en_US.csv b/app/code/Magento/TaxImportExport/i18n/en_US.csv
index cadecc39a391c..40db8846b54cb 100644
--- a/app/code/Magento/TaxImportExport/i18n/en_US.csv
+++ b/app/code/Magento/TaxImportExport/i18n/en_US.csv
@@ -12,7 +12,7 @@ Rate,Rate
 "Invalid file upload attempt","Invalid file upload attempt"
 "Invalid file upload attempt.","Invalid file upload attempt."
 "Invalid file format.","Invalid file format."
-"One of the countries has invalid code.","One of the countries has invalid code."
+"Country code is invalid: %1","Country code is invalid: %1"
 "Import Tax Rates","Import Tax Rates"
 "Export Tax Rates","Export Tax Rates"
 CSV,CSV
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
index 5d8203244256e..f147b7085945f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
@@ -7,7 +7,7 @@
 <small class="bugs">
     <span><?= /* @escapeNotVerified */ __('Help Us Keep Magento Healthy') ?></span>
     <a href="http://www.magentocommerce.com/bug-tracking"
-       target="_blank">
+       target="_blank" title="<?= /* @escapeNotVerified */ __('Report All Bugs') ?>">
         <?= /* @escapeNotVerified */ __('Report All Bugs') ?>
     </a>
 </small>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
index 8c3663337cbbe..17f8d7c70f574 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
@@ -18,6 +18,7 @@
     <a class="logo" href="<?= $block->getUrl('') ?>" title="<?= /* @escapeNotVerified */ $storeName ?>">
 <?php endif ?>
         <img src="<?= /* @escapeNotVerified */ $block->getLogoSrc() ?>"
+             title="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
              alt="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
              <?= $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
              <?= $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js
index 31bcb419fb178..e215f078c4b02 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/autosave/editor_plugin_src.js
@@ -20,7 +20,7 @@
  * 1. localStorage - A new feature of HTML 5, localStorage can store megabytes of data per domain
  * on the client computer. Data stored in the localStorage area has no expiration date, so we must
  * manage expiring the data ourselves.  localStorage is fully supported by IE8, and it is supposed
- * to be working in Firefox 3 and Safari 3.2, but in reality is is flaky in those browsers.  As
+ * to be working in Firefox 3 and Safari 3.2, but in reality is flaky in those browsers.  As
  * HTML 5 gets wider support, the AutoSave plugin will use it automatically. In Windows Vista/7,
  * localStorage is stored in the following folder:
  * C:\Users\[username]\AppData\Local\Microsoft\Internet Explorer\DOMStore\[tempFolder]
@@ -297,7 +297,7 @@
 		},
 
 		/**
-		 * This method will store the current contents in the the storage engine.
+		 * This method will store the current contents in the storage engine.
 		 *
 		 * @method storeDraft
 		 */
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/paste/editor_plugin_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/paste/editor_plugin_src.js
index cec4abf98727a..db89eccc4e7ef 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/paste/editor_plugin_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/paste/editor_plugin_src.js
@@ -207,7 +207,7 @@
 					sel.setRng(oldRng);
 					sel.setContent('');
 
-					// For some odd reason we need to detach the the mceInsertContent call from the paste event
+					// For some odd reason we need to detach the mceInsertContent call from the paste event
 					// It's like IE has a reference to the parent element that you paste in and the selection gets messed up
 					// when it tries to restore the selection
 					setTimeout(function() {
diff --git a/app/code/Magento/Translation/etc/di.xml b/app/code/Magento/Translation/etc/di.xml
index c10619fbf74ae..6d3ca03953cf9 100644
--- a/app/code/Magento/Translation/etc/di.xml
+++ b/app/code/Magento/Translation/etc/di.xml
@@ -67,6 +67,7 @@
                 <item name="translate_wrapping" xsi:type="string"><![CDATA[~translate\=("')([^\'].*?)\'\"~]]></item>
                 <item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?:\$|jQuery)\.mage\.__\((?s)[^'"]*?(['"])(.+?)(?<!\\)\1(?s).*?\)~]]></item>
                 <item name="mage_translation_static" xsi:type="string"><![CDATA[~\$t\((?s)[^'"]*?(["'])(.+?)\1(?s).*?\)~]]></item>
+                <item name="translate_args" xsi:type="string"><![CDATA[~translate args\=("|'|"')([^\'].*?)('"|'|")~]]></item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/region.js b/app/code/Magento/Ui/view/base/web/js/form/element/region.js
index fec69bf8558b5..45d38b339b50b 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/region.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/region.js
@@ -49,6 +49,10 @@ define([
                 if (option && !option['is_region_required']) {
                     this.error(false);
                     this.validation = _.omit(this.validation, 'required-entry');
+                    registry.get(this.customName, function (input) {
+                        input.validation['required-entry'] = false;
+                        input.required(false);
+                    });
                 } else {
                     this.validation['required-entry'] = true;
                 }
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js b/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js
index b228494b422c3..1684f0b220175 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js
@@ -46,7 +46,7 @@ define([
     }
 
     /**
-     * Creates observable propery using 'track' method.
+     * Creates observable property using 'track' method.
      *
      * @param {Object} obj - Object to whom property belongs.
      * @param {String} key - Key of the property.
diff --git a/app/code/Magento/Ui/view/base/web/templates/block-loader.html b/app/code/Magento/Ui/view/base/web/templates/block-loader.html
index 3d8b730a9e8c5..cb28b09e4da83 100644
--- a/app/code/Magento/Ui/view/base/web/templates/block-loader.html
+++ b/app/code/Magento/Ui/view/base/web/templates/block-loader.html
@@ -6,6 +6,6 @@
 -->
 <div data-role="loader" class="loading-mask" style="position: absolute;">
     <div class="loader">
-        <img src="<%= loaderImageHref %>" alt="Loading..." style="position: absolute;">
+        <img src="<%= loaderImageHref %>" alt="Loading..." title="Loading..." style="position: absolute;">
     </div>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html b/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
index e153beab8748b..873b0ca744a88 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
@@ -30,7 +30,7 @@
                 <legend class="admin__legend">
                     <span text="$parent.label"/>
                 </legend><br />
-                
+
                 <each args="getRegion('body')" render=""/>
             </fieldset>
         </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html b/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
index 79478d2417110..ce06201adb8ba 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
@@ -16,14 +16,14 @@
     <div class="admin__field-control"
          css="'_with-tooltip': $data.tooltip">
         <div class="admin__field admin__field-option" outereach="options">
-            <input 
+            <input
                 ko-checked="$parent.value"
                 ko-disabled="$parent.disabled"
                 css="
                     'admin__control-radio': !$parent.multiple,
                     'admin__control-checkbox': $parent.multiple"
                 attr="
-                    id: ++ko.uid, 
+                    id: ++ko.uid,
                     value: value,
                     type: $parent.multiple ? 'checkbox' : 'radio'"/>
 
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/field.html b/app/code/Magento/Ui/view/base/web/templates/form/field.html
index 6143900d5dd7b..888bc911d747f 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/field.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/field.html
@@ -35,7 +35,7 @@
         <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
             <span translate="notice"/>
         </div>
-        
+
         <div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfo"></div>
 
         <render args="$data.service.template" if="$data.hasService()"/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html b/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
index a11e56a68dab2..81c7acaf4aa33 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
@@ -13,7 +13,7 @@
                 </button>
             </with>
         </if>
-        
+
         <if args="$data.isEditor">
             <label class="admin__field-label admin__field-label-vertical" attr="for: uid" translate="'All in Column'"/>
             <render/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html b/app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html
index 4b3109e522f0b..c82456b2a357c 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html
@@ -11,8 +11,8 @@
             <span class="data-grid-row-changed" css="_changed: $parent.hasChanges">
                 <span class="data-grid-row-changed-tooltip" translate="'Record contains unsaved changes.'"/>
             </span>
-        </td>        
-        
+        </td>
+
         <!-- ko ifnot: $parent.isActionsColumn($data) -->
             <td if="$col.isEditor" template="$parent.fieldTmpl"/>
             <td ifnot="$col.isEditor" css="$col.getFieldClass()" template="$col.getBody()"/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html b/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
index 0bd5ea06dbf86..8d79bfe6a1b4c 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
@@ -7,7 +7,7 @@
 <div style="display: none;" css="stickyClass" afterRender="setStickyNode">
     <span class="data-grid-cap-left" afterRender="setLeftCap"/>
     <span class="data-grid-cap-right" afterRender="setRightCap"/>
-    
+
     <div afterRender="setStickyToolbarNode">
         <div class="admin__data-grid-header">
             <div class="admin__data-grid-header-row">
diff --git a/app/code/Magento/Ui/view/base/web/templates/group/group.html b/app/code/Magento/Ui/view/base/web/templates/group/group.html
index 13abdb15d965c..e30ac7a377542 100644
--- a/app/code/Magento/Ui/view/base/web/templates/group/group.html
+++ b/app/code/Magento/Ui/view/base/web/templates/group/group.html
@@ -19,7 +19,7 @@
                 <render args="elementTmpl" if="element.input_type == 'checkbox' || element.input_type == 'radio'"/>
             </if>
         </each>
-        
+
         <each args="getRegion('insideGroup')" render=""/>
 
         <each args="elems" if="validateWholeGroup">
diff --git a/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml b/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml
new file mode 100644
index 0000000000000..c41eb7c02a557
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!--Navigate to create product page from product grid page-->
+    <actionGroup name="AdminProductAddFPTValueActionGroup">
+        <arguments>
+            <argument name="FPTAttributeCode"/>
+            <argument name="countryForFPT" defaultValue="US" type="string"/>
+            <argument name="stateForFPT" type="string"/>
+            <argument name="valueForFPT" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductAddFPTValueSection.addFPT(FPTAttributeCode)}}" stepKey="clickAddFPTButton1"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <selectOption selector="{{AdminProductAddFPTValueSection.selectCountryForFPT(FPTAttributeCode)}}" userInput="{{countryForFPT}}" stepKey="selectcountryForFPT"/>
+        <selectOption selector="{{AdminProductAddFPTValueSection.selectStateForFPT(FPTAttributeCode)}}" userInput="{{stateForFPT}}" stepKey="selectstateForFPT"/>
+        <fillField selector="{{AdminProductAddFPTValueSection.setTaxValueForFPT(FPTAttributeCode)}}" userInput="{{valueForFPT}}" stepKey="setTaxvalueForFPT"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml b/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml
new file mode 100644
index 0000000000000..e981dae483f32
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Data/FixedProductAttributeData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="productFPTAttribute" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</data>
+        <data key="is_unique">true</data>
+        <data key="frontend_input">weee</data>
+        <data key="is_used_in_grid">true</data>
+        <data key="is_visible_in_grid">true</data>
+        <data key="is_filterable_in_grid">true</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml b/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml
new file mode 100644
index 0000000000000..120dd10eee359
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Data/WeeeConfigData.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- Fixed Product Taxes Enable-->
+    <entity name="WeeeConfigEnable" type="weee_config">
+        <requiredEntity type="enableFPT">EnableFPT</requiredEntity>
+    </entity>
+    <entity name="EnableFPT" type="enableFPT">
+        <data key="value">1</data>
+    </entity>
+    <!-- Fixed Product Taxes Disable-->
+    <entity name="WeeeConfigDisable" type="weee_config_default">
+        <requiredEntity type="disableFPT">DisableFPT</requiredEntity>
+    </entity>
+    <entity name="DisableFPT" type="disableFPT">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml b/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml
new file mode 100644
index 0000000000000..2e2b71c30ef47
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Metadata/weee_config-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="WeeeConfigEnable" dataType="weee_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
+        <object key="groups" dataType="weee_config">
+            <object key="weee" dataType="weee_config">
+                <object key="fields" dataType="weee_config">
+                    <object key="enable" dataType="enableFPT">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+    <operation name="WeeeConfigDefault" dataType="weee_config_default" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
+        <object key="groups" dataType="weee_config_default">
+            <object key="weee" dataType="weee_config_default">
+                 <object key="fields" dataType="weee_config_default">
+                    <object key="enable" dataType="weee_config_default">
+                      <object key="inherit" dataType="disableFPT">
+                        <field key="value">integer</field>
+                      </object>
+                    </object>
+                 </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml b/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml
new file mode 100644
index 0000000000000..fa3663ee719e1
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Page/AdminProductEditPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminProductEditPage" url="catalog/product/edit/id/{{product_id}}/" area="admin" module="Magento_Catalog">
+        <section name="AdminProductAddFPTValueSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml b/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml
new file mode 100644
index 0000000000000..40a9a97f31425
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Section/AdminProductAddFPTValueSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminProductAddFPTValueSection">
+        <element name="addFPT" type="button" selector="[data-index='{{FPTAttributeCode}}'] [data-action='add_new_row']" parameterized="true"/>
+        <element name="selectCountryForFPT" type="select" selector="(//select[contains(@name, 'product[{{FPTAttributeCode}}]') and contains(@name, '[country]')])[last()]" parameterized="true"/>
+        <element name="selectStateForFPT" type="select" selector="(//select[contains(@name, 'product[{{FPTAttributeCode}}]') and contains(@name, '[state]')])[last()]" parameterized="true"/>
+        <element name="setTaxValueForFPT" type="text" selector="(//input[contains(@name, 'product[{{FPTAttributeCode}}]') and contains(@name, '[value]')])[last()]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml
new file mode 100644
index 0000000000000..9b6541b93541d
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CheckoutCartSummarySection">
+        <element name="amountFPT" type="text" selector=".totals td[data-th='FPT'] .price"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
index 02a897d44b3c6..5595d189b15eb 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
@@ -3,18 +3,59 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * Wishlist block customer item cart column
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
+use Magento\Catalog\Model\Product\Image\UrlBuilder;
+use Magento\Framework\View\ConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
+
 /**
+ * Wishlist block customer item cart column
+ *
  * @api
  * @since 100.0.2
  */
 class Image extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
+    /** @var ItemResolverInterface */
+    private $itemResolver;
+
+    /**
+     * @param \Magento\Catalog\Block\Product\Context $context
+     * @param \Magento\Framework\App\Http\Context $httpContext
+     * @param array $data
+     * @param ConfigInterface|null $config
+     * @param UrlBuilder|null $urlBuilder
+     * @param ItemResolverInterface|null $itemResolver
+     */
+    public function __construct(
+        \Magento\Catalog\Block\Product\Context $context,
+        \Magento\Framework\App\Http\Context $httpContext,
+        array $data = [],
+        ConfigInterface $config = null,
+        UrlBuilder $urlBuilder = null,
+        ItemResolverInterface $itemResolver = null
+    ) {
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
+        parent::__construct(
+            $context,
+            $httpContext,
+            $data,
+            $config,
+            $urlBuilder
+        );
+    }
+
+    /**
+     * Identify the product from which thumbnail should be taken.
+     *
+     * @return \Magento\Catalog\Model\Product
+     */
+    public function getProductForThumbnail(\Magento\Wishlist\Model\Item $item) : \Magento\Catalog\Model\Product
+    {
+        return $this->itemResolver->getFinalProduct($item);
+    }
 }
diff --git a/app/code/Magento/Wishlist/Controller/Index/Remove.php b/app/code/Magento/Wishlist/Controller/Index/Remove.php
index ec45201e390f1..84c59b5be3d1e 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Remove.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Remove.php
@@ -10,6 +10,8 @@
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
+use Magento\Wishlist\Model\Item;
+use Magento\Wishlist\Model\Product\AttributeValueProvider;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -26,18 +28,27 @@ class Remove extends \Magento\Wishlist\Controller\AbstractIndex
      */
     protected $formKeyValidator;
 
+    /**
+     * @var AttributeValueProvider
+     */
+    private $attributeValueProvider;
+
     /**
      * @param Action\Context $context
      * @param WishlistProviderInterface $wishlistProvider
      * @param Validator $formKeyValidator
+     * @param AttributeValueProvider|null $attributeValueProvider
      */
     public function __construct(
         Action\Context $context,
         WishlistProviderInterface $wishlistProvider,
-        Validator $formKeyValidator
+        Validator $formKeyValidator,
+        AttributeValueProvider $attributeValueProvider = null
     ) {
         $this->wishlistProvider = $wishlistProvider;
         $this->formKeyValidator = $formKeyValidator;
+        $this->attributeValueProvider = $attributeValueProvider
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AttributeValueProvider::class);
         parent::__construct($context);
     }
 
@@ -56,7 +67,8 @@ public function execute()
         }
 
         $id = (int)$this->getRequest()->getParam('item');
-        $item = $this->_objectManager->create(\Magento\Wishlist\Model\Item::class)->load($id);
+        /** @var Item $item */
+        $item = $this->_objectManager->create(Item::class)->load($id);
         if (!$item->getId()) {
             throw new NotFoundException(__('Page not found.'));
         }
@@ -67,6 +79,14 @@ public function execute()
         try {
             $item->delete();
             $wishlist->save();
+            $productName = $this->attributeValueProvider
+                ->getRawAttributeValue($item->getProductId(), 'name');
+            $this->messageManager->addComplexSuccessMessage(
+                'removeWishlistItemSuccessMessage',
+                [
+                    'product_name' => $productName,
+                ]
+            );
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addError(
                 __('We can\'t delete the item from Wish List right now because of an error: %1.', $e->getMessage())
@@ -76,13 +96,8 @@ public function execute()
         }
 
         $this->_objectManager->get(\Magento\Wishlist\Helper\Data::class)->calculate();
-        $request = $this->getRequest();
-        $refererUrl = (string)$request->getServer('HTTP_REFERER');
-        $url = (string)$request->getParam(\Magento\Framework\App\Response\RedirectInterface::PARAM_NAME_REFERER_URL);
-        if ($url) {
-            $refererUrl = $url;
-        }
-        if ($request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED) && $refererUrl) {
+        $refererUrl = $this->_redirect->getRefererUrl();
+        if ($refererUrl) {
             $redirectUrl = $refererUrl;
         } else {
             $redirectUrl = $this->_redirect->getRedirectUrl($this->_url->getUrl('*/*'));
diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
index eeae07861e22d..ae54289d4b1c9 100644
--- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php
+++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
 use Magento\Customer\CustomerData\SectionSourceInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Wishlist section
@@ -38,22 +39,32 @@ class Wishlist implements SectionSourceInterface
      */
     protected $block;
 
+    /**
+     * @var \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface
+     */
+    private $itemResolver;
+
     /**
      * @param \Magento\Wishlist\Helper\Data $wishlistHelper
      * @param \Magento\Wishlist\Block\Customer\Sidebar $block
      * @param \Magento\Catalog\Helper\ImageFactory $imageHelperFactory
      * @param \Magento\Framework\App\ViewInterface $view
+     * @param \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface|null $itemResolver
      */
     public function __construct(
         \Magento\Wishlist\Helper\Data $wishlistHelper,
         \Magento\Wishlist\Block\Customer\Sidebar $block,
         \Magento\Catalog\Helper\ImageFactory $imageHelperFactory,
-        \Magento\Framework\App\ViewInterface $view
+        \Magento\Framework\App\ViewInterface $view,
+        \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface $itemResolver = null
     ) {
         $this->wishlistHelper = $wishlistHelper;
         $this->imageHelperFactory = $imageHelperFactory;
         $this->block = $block;
         $this->view = $view;
+        $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(
+            \Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface::class
+        );
     }
 
     /**
@@ -122,7 +133,7 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
     {
         $product = $wishlistItem->getProduct();
         return [
-            'image' => $this->getImageData($product),
+            'image' => $this->getImageData($this->itemResolver->getFinalProduct($wishlistItem)),
             'product_sku' => $product->getSku(),
             'product_id' => $product->getId(),
             'product_url' => $this->wishlistHelper->getProductUrl($wishlistItem),
@@ -135,8 +146,8 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
             ),
             'product_is_saleable_and_visible' => $product->isSaleable() && $product->isVisibleInSiteVisibility(),
             'product_has_required_options' => $product->getTypeInstance()->hasRequiredOptions($product),
-            'add_to_cart_params' => $this->wishlistHelper->getAddToCartParams($wishlistItem, true),
-            'delete_item_params' => $this->wishlistHelper->getRemoveParams($wishlistItem, true),
+            'add_to_cart_params' => $this->wishlistHelper->getAddToCartParams($wishlistItem),
+            'delete_item_params' => $this->wishlistHelper->getRemoveParams($wishlistItem),
         ];
     }
 
@@ -149,14 +160,6 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
      */
     protected function getImageData($product)
     {
-        /*Set variant product if it is configurable product.
-        It will show variant product image in sidebar instead of configurable product image.*/
-        $simpleOption = $product->getCustomOption('simple_product');
-        if ($simpleOption !== null) {
-            $optionProduct = $simpleOption->getProduct();
-            $product = $optionProduct;
-        }
-
         /** @var \Magento\Catalog\Helper\Image $helper */
         $helper = $this->imageHelperFactory->create()
             ->init($product, 'wishlist_sidebar_block');
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index 968a7f1db8c39..f4c1aa9662bda 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -284,9 +284,12 @@ public function getRemoveParams($item, $addReferer = false)
     {
         $url = $this->_getUrl('wishlist/index/remove');
         $params = ['item' => $item->getWishlistItemId()];
+        $params[ActionInterface::PARAM_NAME_URL_ENCODED] = '';
+
         if ($addReferer) {
             $params = $this->addRefererToParams($params);
         }
+
         return $this->_postDataHelper->getPostData($url, $params);
     }
 
@@ -395,9 +398,12 @@ public function getAddToCartUrl($item)
     public function getAddToCartParams($item, $addReferer = false)
     {
         $params = $this->_getCartUrlParameters($item);
+        $params[ActionInterface::PARAM_NAME_URL_ENCODED] = '';
+
         if ($addReferer) {
             $params = $this->addRefererToParams($params);
         }
+
         return $this->_postDataHelper->getPostData(
             $this->_getUrlStore($item)->getUrl('wishlist/index/cart'),
             $params
diff --git a/app/code/Magento/Wishlist/Model/Product/AttributeValueProvider.php b/app/code/Magento/Wishlist/Model/Product/AttributeValueProvider.php
new file mode 100644
index 0000000000000..e17cd30184504
--- /dev/null
+++ b/app/code/Magento/Wishlist/Model/Product/AttributeValueProvider.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+
+/**
+ * Provides existing attribute value for a product entity.
+ */
+class AttributeValueProvider
+{
+    /**
+     * @var ProductCollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @param ProductCollectionFactory $productCollectionFactory
+     */
+    public function __construct(
+        ProductCollectionFactory $productCollectionFactory
+    ) {
+        $this->productCollectionFactory = $productCollectionFactory;
+    }
+
+    /**
+     * Provides existing raw attribute value by the attribute code of the product entity.
+     *
+     * @param int $productId
+     * @param string $attributeCode
+     * @param int|null $storeId
+     * @return null|string
+     */
+    public function getRawAttributeValue(int $productId, string $attributeCode, int $storeId = null):? string
+    {
+        $collection = $this->productCollectionFactory->create();
+        $collection->addIdFilter($productId)
+            ->addStoreFilter($storeId)
+            ->addAttributeToSelect($attributeCode);
+
+        if ($collection->isEnabledFlat()) {
+            $data = $collection->getConnection()->fetchRow($collection->getSelect());
+            $attributeValue = $data[$attributeCode] ?? null;
+        } else {
+            $attributeValue = $collection->getFirstItem()->getData($attributeCode);
+        }
+
+        return $attributeValue;
+    }
+}
diff --git a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
index dd816bb665782..edd1af41964a2 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
@@ -53,4 +53,24 @@
         <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductAddToCartByName(productVar.name)}}" stepKey="AssertWishlistSidebarAddToCart" />
         <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductImageByName(productVar.name)}}" stepKey="AssertWishlistSidebarProductImage" />
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+
+    <!--Remove a product from the wishlist using the sidebar -->
+    <actionGroup name="StorefrontCustomerRemoveProductFromWishlistUsingSidebar">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <click selector="{{StorefrontCustomerWishlistSidebarSection.ProductRemoveByName(product.name)}}" stepKey="RemoveProductFromWishlistUsingSidebarClickRemoveItemFromWishlist"/>
+        <waitForElement selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="RemoveProductFromWishlistUsingSidebarWaitForSuccessMessage"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="{{product.name}} has been removed from your Wish List." stepKey="RemoveProductFromWishlistUsingSidebarSeeProductNameRemovedFromWishlist"/>
+    </actionGroup>
+
+    <!--Add a product to the cart from the wishlist using the sidebar -->
+    <actionGroup name="StorefrontCustomerAddProductToCartFromWishlistUsingSidebar">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <click selector="{{StorefrontCustomerWishlistSidebarSection.ProductAddToCartByName(product.name)}}" stepKey="AddProductToCartFromWishlistUsingSidebarClickAddToCartFromWishlist"/>
+        <waitForElement selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="AddProductToCartFromWishlistUsingSidebarWaitForSuccessMessage"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="AddProductToCartFromWishlistUsingSidebarSeeProductNameAddedToCartFromWishlist"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
index bd9fadb630c95..8115e591aa9f1 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
@@ -14,5 +14,6 @@
         <element name="ProductImageByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
         <element name="ProductInfoByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//div[@class='product-item-info']" parameterized="true"/>
         <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'action tocart primary')]" parameterized="true"/>
+        <element name="ProductImageByImageName" type="text" selector="//main//li//a//img[contains(@src, '{{var1}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
index d3e89d419310c..dfff8b91e895b 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
@@ -13,5 +13,7 @@
         <element name="ProductPriceByName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//span[@class='price']" parameterized="true"/>
         <element name="ProductImageByName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//img[@class='product-image-photo']" parameterized="true"/>
         <element name="ProductAddToCartByName" type="button" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//button[contains(@class, 'action tocart primary')]" parameterized="true"/>
+        <element name="ProductImageByImageName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a//img[contains(@src, '{{var1}}')]" parameterized="true"/>
+        <element name="ProductRemoveByName" type="button" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//a[contains(@class, 'action delete')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
new file mode 100644
index 0000000000000..981ee51954fb4
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="ConfigurableProductChildImageShouldBeShownOnWishListTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <stories value="MAGETWO-8709"/>
+            <group value="wishlist"/>
+            <title value="When user add Configurable child product to WIshlist then child product image should be shown in Wishlist"/>
+            <description value="When user add Configurable child product to WIshlist then child product image should be shown in Wishlist"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93097"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set checkout/cart/configurable_product_image 0" stepKey="setProductImageSettingUnderCofigurationSalesCheckout"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(_defaultProduct.name)}}" stepKey="selectProductToAddImage"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
+        <actionGroup ref="addProductImage" stepKey="addImageForParentProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex1"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad1"/>
+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(colorProductAttribute1.name)}}" stepKey="selectProductToAddImage1"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad1"/>
+        <actionGroup ref="addProductImage" stepKey="addImageForChildProduct">
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+
+         <!--Sign in as customer -->
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <fillField userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
+        <fillField userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="waitForButton"/>
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <see userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeFirstName"/>
+        <see userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeLastName"/>
+        <see userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeEmail"/>
+        <waitForPageLoad stepKey="waitForLogin"/>
+        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnConfigurableProductPage"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="seeProductName"/>
+        <selectOption userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="waitForAddToCartVisible"/>
+        <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addFirstProductToWishlist"/>
+        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addProductToWishlistWaitForSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByImageName(TestImageNew.filename)}}" stepKey="AssertWishlistProductImage" />
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductImageByImageName(TestImageNew.filename)}}" stepKey="AssertWishlistSidebarProductImage" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
new file mode 100644
index 0000000000000..b20ba3a153fc5
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontAddProductsToCartFromWishlistUsingSidebarTest">
+        <annotations>
+            <title value="Add products from the wishlist to the cart using the sidebar."/>
+            <description value="Products added to the cart from wishlist and a customer remains on the same page."/>
+            <group value="wishlist"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="categoryFirst"/>
+            <createData entity="SimpleSubCategory" stepKey="categorySecond"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
+                <requiredEntity createDataKey="categoryFirst"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="simpleProduct2">
+                <requiredEntity createDataKey="categorySecond"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="categoryFirst" stepKey="deleteCategoryFirst"/>
+            <deleteData createDataKey="categorySecond" stepKey="deleteCategorySecond"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+        </after>
+        <!-- Sign in as customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$customer$$"/>
+        </actionGroup>
+        <!-- Add product from first category to the wishlist -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryFirst.name$$)}}" stepKey="navigateToCategoryFirstPage"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" stepKey="addSimpleProduct1ToWishlist">
+            <argument name="productVar" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <!--Add product to the cart from the Wishlist using the sidebar from the second category page-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categorySecond.name$$)}}" stepKey="navigateToCategorySecondPage"/>
+        <actionGroup ref="StorefrontSwitchCategoryViewToListMode" stepKey="switchCategoryViewToListMode"/>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSimpleProduct1InWishlistSidebar">
+            <argument name="productVar" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerAddProductToCartFromWishlistUsingSidebar" stepKey="addProduct1ToCartFromWishlistUsingSidebar">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <!--Check that a customer on the same page as before-->
+        <!--hardcoded URL because this method does not support replacement-->
+        <seeCurrentUrlMatches regex="~\/$$categorySecond.name$$\.html\?(\S+)?\w+=list(&amp;\S+)?$~i" stepKey="seeCurrentCategoryUrlMatches"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
index 3ddb9d87073f3..cbed63db36d49 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
@@ -14,6 +14,8 @@
             <title value="Customer should be able to delete a persistent wishlist"/>
             <description value="Customer should be able to delete a persistent wishlist"/>
             <group value="wishlist"/>
+            <!-- MQE-1145 -->
+            <group value="skip"/>
         </annotations>
         <before>
             <createData stepKey="category" entity="SimpleSubCategory"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
new file mode 100644
index 0000000000000..f6deb803967ba
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontRemoveProductsFromWishlistUsingSidebarTest">
+        <annotations>
+            <title value="Remove products from the wishlist using the sidebar."/>
+            <description value="Products removed from wishlist and a customer remains on the same page."/>
+            <group value="wishlist"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="categoryFirst"/>
+            <createData entity="SimpleSubCategory" stepKey="categorySecond"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
+                <requiredEntity createDataKey="categoryFirst"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="simpleProduct2">
+                <requiredEntity createDataKey="categorySecond"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="categoryFirst" stepKey="deleteCategoryFirst"/>
+            <deleteData createDataKey="categorySecond" stepKey="deleteCategorySecond"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+        </after>
+        <!-- Sign in as customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$customer$$"/>
+        </actionGroup>
+        <!-- Add product from first category to the wishlist -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryFirst.name$$)}}" stepKey="navigateToCategoryFirstPage"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" stepKey="addSimpleProduct1ToWishlist">
+            <argument name="productVar" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <!--Remove product from the Wishlist using the sidebar from the second category page-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categorySecond.name$$)}}" stepKey="navigateToCategorySecondPage"/>
+        <actionGroup ref="StorefrontSwitchCategoryViewToListMode" stepKey="switchCategoryViewToListMode"/>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSimpleProduct1InWishlistSidebar">
+            <argument name="productVar" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerRemoveProductFromWishlistUsingSidebar" stepKey="removeProduct1FromWishlistUsingSidebar">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <!--Check that a customer on the same page as before-->
+        <!--hardcoded URL because this method does not support replacement-->
+        <seeCurrentUrlMatches regex="~\/$$categorySecond.name$$\.html\?(\S+)?\w+=list(&amp;\S+)?$~i" stepKey="seeCurrentCategoryUrlMatches"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
index 6260a1292bee9..bb4ae44fcc31d 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
@@ -315,13 +315,11 @@ public function testExecuteCanNotSaveWishlist()
             ->with(\Magento\Wishlist\Model\Item::class)
             ->willReturn($item);
 
-        $this->request
-            ->expects($this->once())
-            ->method('getServer')
-            ->with('HTTP_REFERER')
+        $this->redirect
+            ->method('getRefererUrl')
+            ->with()
             ->willReturn($referer);
         $this->request
-            ->expects($this->exactly(3))
             ->method('getParam')
             ->willReturnMap(
                 [
@@ -401,12 +399,6 @@ public function testExecuteCanNotSaveWishlistAndWithRedirect()
             ->willReturn($item);
 
         $this->request
-            ->expects($this->once())
-            ->method('getServer')
-            ->with('HTTP_REFERER')
-            ->willReturn($referer);
-        $this->request
-            ->expects($this->exactly(3))
             ->method('getParam')
             ->willReturnMap(
                 [
diff --git a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
index d2e81b0236ce8..4954712e5ff3b 100644
--- a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
@@ -8,7 +8,7 @@
 use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Type\AbstractType;
-use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 use Magento\Framework\App\ViewInterface;
 use Magento\Framework\Pricing\Render;
 use Magento\Wishlist\Block\Customer\Sidebar;
@@ -24,19 +24,22 @@
 class WishlistTest extends \PHPUnit\Framework\TestCase
 {
     /** @var Wishlist */
-    protected $model;
+    private $model;
 
     /** @var Data|\PHPUnit_Framework_MockObject_MockObject */
-    protected $wishlistHelperMock;
+    private $wishlistHelperMock;
 
     /** @var Sidebar|\PHPUnit_Framework_MockObject_MockObject */
-    protected $sidebarMock;
+    private $sidebarMock;
 
     /** @var Image|\PHPUnit_Framework_MockObject_MockObject */
-    protected $catalogImageHelperMock;
+    private $catalogImageHelperMock;
 
     /** @var ViewInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $viewMock;
+    private $viewMock;
+
+    /** @var \Magento\Catalog\Block\Product\ImageBuilder|\PHPUnit_Framework_MockObject_MockObject */
+    private $itemResolver;
 
     protected function setUp()
     {
@@ -60,11 +63,16 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->catalogImageHelperMock);
 
+        $this->itemResolver = $this->createMock(
+            ItemResolverInterface::class
+        );
+
         $this->model = new Wishlist(
             $this->wishlistHelperMock,
             $this->sidebarMock,
             $imageHelperFactory,
-            $this->viewMock
+            $this->viewMock,
+            $this->itemResolver
         );
     }
 
@@ -162,6 +170,10 @@ public function testGetSectionData()
             ->method('getProduct')
             ->willReturn($productMock);
 
+        $this->itemResolver->expects($this->once())
+            ->method('getFinalProduct')
+            ->willReturn($productMock);
+
         $this->catalogImageHelperMock->expects($this->once())
             ->method('init')
             ->with($productMock, 'wishlist_sidebar_block', [])
@@ -237,11 +249,11 @@ public function testGetSectionData()
 
         $this->wishlistHelperMock->expects($this->once())
             ->method('getAddToCartParams')
-            ->with($itemMock, true)
+            ->with($itemMock)
             ->willReturn($itemAddParams);
         $this->wishlistHelperMock->expects($this->once())
             ->method('getRemoveParams')
-            ->with($itemMock, true)
+            ->with($itemMock)
             ->willReturn($itemRemoveParams);
 
         $this->assertEquals($result, $this->model->getSectionData());
@@ -359,6 +371,10 @@ public function testGetSectionDataWithTwoItems()
             ->method('getProduct')
             ->willReturn($productMock);
 
+        $this->itemResolver->expects($this->exactly(2))
+            ->method('getFinalProduct')
+            ->willReturn($productMock);
+
         $this->catalogImageHelperMock->expects($this->exactly(2))
             ->method('init')
             ->with($productMock, 'wishlist_sidebar_block', [])
@@ -435,11 +451,11 @@ public function testGetSectionDataWithTwoItems()
 
         $this->wishlistHelperMock->expects($this->exactly(2))
             ->method('getAddToCartParams')
-            ->with($itemMock, true)
+            ->with($itemMock)
             ->willReturn($itemAddParams);
         $this->wishlistHelperMock->expects($this->exactly(2))
             ->method('getRemoveParams')
-            ->with($itemMock, true)
+            ->with($itemMock)
             ->willReturn($itemRemoveParams);
 
         $this->assertEquals($result, $this->model->getSectionData());
diff --git a/app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php b/app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php
index 154db1c4a1474..1769306172aab 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php
@@ -248,6 +248,7 @@ public function testGetAddToCartParams()
         $expected = [
             'item' => $wishlistItemId,
             'qty' => $wishlistItemQty,
+            ActionInterface::PARAM_NAME_URL_ENCODED => '',
         ];
         $this->postDataHelper->expects($this->once())
             ->method('getPostData')
@@ -333,7 +334,7 @@ public function testGetRemoveParams()
 
         $this->postDataHelper->expects($this->once())
             ->method('getPostData')
-            ->with($url, ['item' => $wishlistItemId])
+            ->with($url, ['item' => $wishlistItemId, ActionInterface::PARAM_NAME_URL_ENCODED => ''])
             ->willReturn($url);
 
         $this->assertEquals($url, $this->model->getRemoveParams($this->wishlistItem));
diff --git a/app/code/Magento/Wishlist/etc/frontend/di.xml b/app/code/Magento/Wishlist/etc/frontend/di.xml
index 00642b132bfdf..f28e85fff0a15 100644
--- a/app/code/Magento/Wishlist/etc/frontend/di.xml
+++ b/app/code/Magento/Wishlist/etc/frontend/di.xml
@@ -44,6 +44,12 @@
                         <item name="template" xsi:type="string">Magento_Wishlist::messages/addProductSuccessMessage.phtml</item>
                     </item>
                 </item>
+                <item name="removeWishlistItemSuccessMessage" xsi:type="array">
+                    <item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
+                    <item name="data" xsi:type="array">
+                        <item name="template" xsi:type="string">Magento_Wishlist::messages/removeWishlistItemSuccessMessage.phtml</item>
+                    </item>
+                </item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
index 1008f5f377df5..2eb4664991e99 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
@@ -13,5 +13,5 @@ $item = $block->getItem();
 $product = $item->getProduct();
 ?>
 <a class="product-item-photo" tabindex="-1" href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?= $block->escapeHtmlAttr($product->getName()) ?>">
-    <?= $block->getImage($product, 'wishlist_thumbnail')->toHtml() ?>
+    <?= $block->getImage($block->getProductForThumbnail($item), 'wishlist_thumbnail')->toHtml() ?>
 </a>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml b/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml
new file mode 100644
index 0000000000000..1196b8fec4a21
--- /dev/null
+++ b/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+
+<?= $block->escapeHtml(__('%1 has been removed from your Wish List.', $block->getData('product_name'))); ?>
+
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less
index 6937855492263..16db9092db368 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less
@@ -14,7 +14,7 @@
     display: inline-block;
     vertical-align: top;
     width: 100%;
-    background-color: #fff;
+    background-color: @color-white;
     border: 1px solid #ada89e;
     border-radius: 2px;
 
@@ -72,7 +72,7 @@
     top: 100%;
     margin: 1px -1px 0 -1px;
     border: 1px solid #cac2b5;
-    background: #fff;
+    background: @color-white;
     box-shadow: 0 2px 4px rgba(0, 0, 0, .2);
     z-index: 990;
 
@@ -121,7 +121,7 @@
         }
 
         .mage-suggest-selected > a {
-            color: #000;
+            color: @color-black;
             background: #F1FFEB;
         }
     }
@@ -229,7 +229,7 @@
 
         > input.ui-autocomplete-loading,
         > input.mage-suggest-state-loading {
-            background: #fff url("@{baseDir}mui/images/ajax-loader-small.gif") no-repeat 190px 50%;
+            background: @color-white url("@{baseDir}mui/images/ajax-loader-small.gif") no-repeat 190px 50%;
         }
     }
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less
index eefbc11201d9c..2074106e719db 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module-old.less
@@ -53,7 +53,7 @@
     }
 
     .attribute-change-checkbox {
-        background: #fff;
+        background: @color-white;
         display: block;
         margin-top: 5px;
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less
index 865ece970465d..73e1bcf4a7d58 100644
--- a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less
@@ -16,7 +16,7 @@
     );
 
     .action.toggle {
-        background: #fff;
+        background: @color-white;
         border-radius: 0 1px 1px 0;
         border: 1px solid #ada89e;
         height: 33px;
@@ -58,7 +58,7 @@
         .action.toggle {
             padding: 0 3px;
             border: 1px solid #b7b2a7;
-            background: #fff;
+            background: @color-white;
             border-radius: 0 1px 1px 0;
             border-left: none;
             height: 50px;
@@ -121,7 +121,7 @@
             width: auto;
 
             .addafter {
-                background: #fff;
+                background: @color-white;
                 border-width: 1px 0 1px 1px;
                 direction: ltr;
                 height: 33px;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
index 0eba6b0d361f8..3a7b6d30c914d 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
@@ -299,7 +299,7 @@
 .invitee_information .data-table tbody tr th,
 .inviter_information .data-table tbody tr td,
 .inviter_information .data-table tbody tr th {
-    background-color: #fff;
+    background-color: @color-white;
     border: 0;
     color: #666;
     padding: 9px 10px 10px;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
index 17910d7c8e5b4..11e0fcc7c8b84 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
@@ -78,7 +78,7 @@
 
         &.ui-state-active {
             z-index: 2;
-            background: #FFF;
+            background: @color-white;
             padding: 1px (@spacing-m - 1px);
             border: 2px solid #eb5202;
             margin: -1px;
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index b66fed0c0a09a..8d314e06899b3 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -487,8 +487,8 @@
     }
 
     .notification-entry-dialog .action-close:hover {
-        color: #000;
-        border-bottom-color: #000;
+        color: @color-black;
+        border-bottom-color: @color-black;
         filter: none;
     }
 
@@ -525,7 +525,7 @@
         right: 0;
         top: 100%;
         border: 1px solid #cac2b5;
-        background: #fff;
+        background: @color-white;
         box-shadow: 0 1px 1px rgba(0, 0, 0, .2);
         z-index: 990;
     }
@@ -786,7 +786,7 @@
         border-radius: 1px;
         padding: 4px;
         color: #303030;
-        background-color: #fff;
+        background-color: @color-white;
         font-weight: 500;
         font-size: 14px;
         height: 33px;
@@ -860,7 +860,7 @@
     input[type="radio"],
     input[type="checkbox"] {
         .lib-css(appearance, none, 1);
-        background: #fff;
+        background: @color-white;
         border-radius: 2px;
         border: 1px solid #adadad;
         cursor: pointer;
@@ -945,7 +945,7 @@
     }
 
     select[disabled] option[selected] {
-        color: #fff;
+        color: @color-white;
         background: #aaa;
     }
 
@@ -1157,7 +1157,7 @@
 
     .fieldset-wrapper,
     .fieldset {
-        background: #fff;
+        background: @color-white;
         border: 0;
         margin: 0;
         padding: 5px 0 38px;
@@ -1574,7 +1574,7 @@
 
     .multiselect-alt .item {
         position: relative;
-        border-top: 1px solid #fff;
+        border-top: 1px solid @color-white;
         cursor: pointer;
     }
 
@@ -1651,7 +1651,7 @@
 
             ~ .addafter strong {
                 display: inline-block;
-                background: #fff;
+                background: @color-white;
                 line-height: 24px;
                 margin: 0 3px 0 0;
                 padding-left: 4px;
@@ -2041,7 +2041,7 @@
         &:before {
             position: absolute;
             content: "";
-            background-color: #fff;
+            background-color: @color-white;
             right: 0;
             top: 0;
             bottom: 0;
@@ -2298,7 +2298,7 @@
     //  --------------------------------------
 
     .preview-window {
-        background: #fff;
+        background: @color-white;
     }
 
     .preview-window .toolbar {
@@ -2458,7 +2458,7 @@
     }
 
     .attribute-popup .page-actions.fixed .page-actions-inner {
-        background: #fff;
+        background: @color-white;
         padding: 0;
         min-width: 100%;
         max-width: 100%;
@@ -2757,7 +2757,7 @@
             border: 1px solid #c9c2b8;
             border-width: 0 0 1px;
             padding: 6px 10px 7px;
-            background: #fff;
+            background: @color-white;
             .style2();
 
             span {
@@ -2769,7 +2769,7 @@
         td {
             border: none;
             padding: 6px 10px 7px;
-            background: #fff;
+            background: @color-white;
         }
 
         tr:last-child td {
@@ -2858,7 +2858,7 @@
 
     .table-fieldset-alt tbody tr:nth-child(odd) td,
     .table-fieldset-alt tbody tr:nth-child(odd):hover td {
-        background: #fff;
+        background: @color-white;
     }
 
     //
@@ -2918,7 +2918,7 @@
     }
 
     .order-details-existing-customer {
-        background: #fff;
+        background: @color-white;
         padding-left: 0;
         position: relative;
         width: 77.9%;
@@ -3035,7 +3035,7 @@
     }
 
     .gift-options-tooltip {
-        background: #fff;
+        background: @color-white;
         border-radius: 5px;
         padding: 10px;
         box-shadow: 0 0 3px rgba(0, 0, 0, .3);
@@ -3194,7 +3194,7 @@
             left: 0;
             margin: 0 8px;
             padding: 10px;
-            background: #fff;
+            background: @color-white;
         }
     }
 
@@ -3386,7 +3386,7 @@
 
     .rma-popup,
     .cms-popup {
-        background: #fff;
+        background: @color-white;
         box-shadow: 0 3px 6px rgba(0, 0, 0, .4);
         cursor: default;
         position: fixed;
@@ -3410,7 +3410,7 @@
     }
 
     .rma-popup .content {
-        background: #fff;
+        background: @color-white;
         border-bottom: 1px solid #ccc;
         max-height: 400px;
         overflow: auto;
@@ -3467,7 +3467,7 @@
     .grid .rma-popup .form-list tr,
     .grid tr.even .rma-popup .form-list tr,
     .grid tr.on-mouse .rma-popup .form-list tr {
-        background: #fff !important;
+        background: @color-white !important;
     }
 
     //
@@ -3798,7 +3798,7 @@
     }
 
     .rule-param .label {
-        color: #000;
+        color: @color-black;
         float: none;
         text-align: left;
         padding: 0;
@@ -3885,7 +3885,7 @@
     .defaultSkin {
         table.mceLayout {
             td {
-                background: #fff;
+                background: @color-white;
             }
         }
 
@@ -5229,7 +5229,7 @@
 @media print {
     * {
         background: transparent !important;
-        color: #000 !important;
+        color: @color-black !important;
         box-shadow: none !important;
         text-shadow: none !important;
         filter: none !important;
diff --git a/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less b/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
index c0aa5510c6e07..7565ee88714f6 100644
--- a/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
+++ b/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
@@ -360,7 +360,7 @@ td.col-type {
             position: relative;
             border-bottom-right-radius: 0;
             box-shadow: none;
-            background: #fff;
+            background: @color-white;
 
             &:after {
                 position: absolute;
@@ -369,7 +369,7 @@ td.col-type {
                 right: 0;
                 height: 2px;
                 margin-top: -1px;
-                background: #fff;
+                background: @color-white;
                 content: '';
                 z-index: 2;
             }
diff --git a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
index 52f1beafa32e1..daed96db717c7 100644
--- a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
@@ -36,9 +36,9 @@
             @_icon-font-content: @icon-search,
             @_icon-font-size: 35px,
             @_icon-font-line-height: 33px,
-            @_icon-font-color: @minicart-icons-color,
-            @_icon-font-color-hover: @minicart-icons-color-hover,
-            @_icon-font-color-active: @minicart-icons-color-hover,
+            @_icon-font-color: @header-icons-color,
+            @_icon-font-color-hover: @header-icons-color-hover,
+            @_icon-font-color-active: @header-icons-color-hover,
             @_icon-font-text-hide: true
             );
             display: inline-block;
diff --git a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
index 23acf9ee8b08d..f785dd74d900e 100644
--- a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
@@ -37,9 +37,9 @@
             @_icon-font-size: 22px,
             @_icon-font-line-height: 28px,
             @_icon-font-margin: 0 @indent__s 0 0,
-            @_icon-font-color: @minicart-icons-color,
-            @_icon-font-color-hover: @minicart-icons-color-hover,
-            @_icon-font-color-active: @minicart-icons-color-hover,
+            @_icon-font-color: @header-icons-color,
+            @_icon-font-color-hover: @header-icons-color-hover,
+            @_icon-font-color-active: @header-icons-color-hover,
             @_icon-font-text-hide: true
             );
             display: inline-block;
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index 832082aa6557a..c6a240fd55ea2 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -93,6 +93,21 @@
                 }
             }
         }
+        .fieldset.create.account {
+            .lib-form-hasrequired(bottom);
+            &:after {
+                margin-top: 35px;
+            }
+        }
+    }
+
+    .form.password.forget {
+        .fieldset {
+            .lib-form-hasrequired(bottom);
+            &:after {
+                margin-top: 35px;
+            }
+        }
     }
 
     //  Full name fieldset
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index 83157281561c2..2c177571b9f5a 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -261,6 +261,7 @@
     .copyright {
         .lib-css(background-color, @copyright__background-color);
         .lib-css(color, @color-white);
+        box-sizing: border-box;
         display: block;
         padding: @indent__s;
         text-align: center;
@@ -417,6 +418,12 @@
             }
         }
     }
+    .page-footer,
+    .copyright {
+        bottom: 0;
+        position: absolute;
+        width: 100%;
+    }
 }
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
index 41d565789c25b..55d43272caad9 100644
--- a/app/design/frontend/Magento/luma/etc/view.xml
+++ b/app/design/frontend/Magento/luma/etc/view.xml
@@ -232,6 +232,7 @@
             <var name="height"></var> <!-- Height of magnifier block -->
             <var name="eventType">hover</var> <!-- Action that atcivates zoom (hover/click) -->
             <var name="enabled">false</var> <!-- Turn on/off magnifier (true/false) -->
+            <var name="mode">outside</var> <!-- Zoom type (outside/inside) -->
         </var>
 
         <var name="breakpoints">
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 1f5507deb0519..6a4a6d16b5568 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -204,6 +204,8 @@
     <preference for="Magento\Framework\MessageQueue\ExchangeFactoryInterface" type="Magento\Framework\MessageQueue\ExchangeFactory" />
     <preference for="Magento\Framework\MessageQueue\Bulk\ExchangeFactoryInterface" type="Magento\Framework\MessageQueue\Bulk\ExchangeFactory" />
     <preference for="Magento\Framework\MessageQueue\QueueFactoryInterface" type="Magento\Framework\MessageQueue\QueueFactory" />
+    <preference for="Magento\Framework\App\Request\ValidatorInterface"
+                type="Magento\Framework\App\Request\CsrfValidator" />
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Acl\Data\Cache">
         <arguments>
diff --git a/composer.json b/composer.json
index f8182c96f78a0..760ec0da13f42 100644
--- a/composer.json
+++ b/composer.json
@@ -278,7 +278,8 @@
         },
         "psr-0": {
             "": [
-                "app/code/"
+                "app/code/",
+                "generated/code/"
             ]
         },
         "files": [
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
index aee77ae6d589f..e2e32c119af21 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
@@ -63,7 +63,7 @@ public function call($serviceInfo, $arguments = [], $storeCode = null, $integrat
     }
 
     /**
-     * Get proper SOAP client instance that is initialized with with WSDL corresponding to requested service interface.
+     * Get proper SOAP client instance that is initialized with WSDL corresponding to requested service interface.
      *
      * @param string $serviceInfo PHP service interface name, should include version if present
      * @param string|null $storeCode
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
index 4f68090657a10..c7697a99875be 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -8,6 +8,7 @@
 namespace Magento\GraphQl\Catalog;
 
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Framework\DataObject;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -283,16 +284,13 @@ public function testCategoryProducts()
      */
     public function testAnchorCategory()
     {
-        /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection */
-        $categoryCollection = $this->objectManager->create(
-            \Magento\Catalog\Model\ResourceModel\Category\Collection::class
-        );
+        /** @var CategoryCollection $categoryCollection */
+        $categoryCollection = $this->objectManager->create(CategoryCollection::class);
         $categoryCollection->addFieldToFilter('name', 'Category 1');
+        /** @var CategoryInterface $category */
         $category = $categoryCollection->getFirstItem();
-        /** @var \Magento\Framework\EntityManager\MetadataPool $entityManagerMetadataPool */
-        $entityManagerMetadataPool = $this->objectManager->create(\Magento\Framework\EntityManager\MetadataPool::class);
-        $categoryLinkField = $entityManagerMetadataPool->getMetadata(CategoryInterface::class)->getLinkField();
-        $categoryId = $category->getData($categoryLinkField);
+        $categoryId = $category->getId();
+
         $this->assertNotEmpty($categoryId, "Preconditions failed: category is not available.");
 
         $query = <<<QUERY
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
new file mode 100644
index 0000000000000..4657a1e763ae1
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Store;
+
+use Magento\Store\Api\Data\StoreConfigInterface;
+use Magento\Store\Api\StoreConfigManagerInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\StoreResolverInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test the GraphQL endpoint's StoreConfigs query
+ */
+class StoreConfigResolverTest extends GraphQlAbstract
+{
+
+    /** @var  ObjectManager */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/store.php
+     */
+    public function testGetStoreConfig()
+    {
+        /** @var  StoreConfigManagerInterface $storeConfigsManager */
+        $storeConfigsManager = $this->objectManager->get(StoreConfigManagerInterface::class);
+        /** @var StoreResolverInterface $storeResolver */
+        $storeResolver = $this->objectManager->get(StoreResolverInterface::class);
+        /** @var StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
+        $storeId = $storeResolver->getCurrentStoreId();
+        $store = $storeRepository->getById($storeId);
+        /** @var StoreConfigInterface $storeConfig */
+        $storeConfig = current($storeConfigsManager->getStoreConfigs([$store->getCode()]));
+        $query
+            = <<<QUERY
+{
+  storeConfig{
+    id,
+    code,
+    website_id,
+    locale,
+    base_currency_code,
+    default_display_currency_code,
+    timezone,
+    weight_unit,
+    base_url,
+    base_link_url,
+    base_static_url,
+    base_media_url,
+    secure_base_url,
+    secure_base_link_url,
+    secure_base_static_url,
+    secure_base_media_url
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('storeConfig', $response);
+        $this->assertEquals($storeConfig->getId(), $response['storeConfig']['id']);
+        $this->assertEquals($storeConfig->getCode(), $response['storeConfig']['code']);
+        $this->assertEquals($storeConfig->getLocale(), $response['storeConfig']['locale']);
+        $this->assertEquals($storeConfig->getBaseCurrencyCode(), $response['storeConfig']['base_currency_code']);
+        $this->assertEquals(
+            $storeConfig->getDefaultDisplayCurrencyCode(),
+            $response['storeConfig']['default_display_currency_code']
+        );
+        $this->assertEquals($storeConfig->getTimezone(), $response['storeConfig']['timezone']);
+        $this->assertEquals($storeConfig->getWeightUnit(), $response['storeConfig']['weight_unit']);
+        $this->assertEquals($storeConfig->getBaseUrl(), $response['storeConfig']['base_url']);
+        $this->assertEquals($storeConfig->getBaseLinkUrl(), $response['storeConfig']['base_link_url']);
+        $this->assertEquals($storeConfig->getBaseStaticUrl(), $response['storeConfig']['base_static_url']);
+        $this->assertEquals($storeConfig->getBaseMediaUrl(), $response['storeConfig']['base_media_url']);
+        $this->assertEquals($storeConfig->getSecureBaseUrl(), $response['storeConfig']['secure_base_url']);
+        $this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $response['storeConfig']['secure_base_link_url']);
+        $this->assertEquals(
+            $storeConfig->getSecureBaseStaticUrl(),
+            $response['storeConfig']['secure_base_static_url']
+        );
+        $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $response['storeConfig']['secure_base_media_url']);
+    }
+}
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
index 83f86b264737c..0a8db19afe971 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
@@ -64,7 +64,7 @@ public function __construct(CurlTransport $transport, Customer $customer)
     protected function authorize(Customer $customer)
     {
         $url = $_ENV['app_frontend_url'] . 'customer/account/login/';
-        $this->transport->write($url);
+        $this->transport->write($url, [], CurlInterface::GET);
         $this->read();
         $url = $_ENV['app_frontend_url'] . 'customer/account/loginPost/';
         $data = [
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
index acf15c0e28252..70582077ed29d 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
@@ -64,28 +64,5 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
         </variation>
-        <variation name="CreateOrderBackendTestBraintreeVariation3" summary="Checkout with Braintree Credit Card from Admin (Basic Fraud Protection)" ticketId="MAGETWO-46470">
-            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
-            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
-            <data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
-            <data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
-            <data name="customer/dataset" xsi:type="string">default</data>
-            <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
-            <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
-            <data name="saveAddress" xsi:type="string">No</data>
-            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
-            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
-            <data name="prices" xsi:type="array">
-                <item name="grandTotal" xsi:type="string">145.98</item>
-            </data>
-            <data name="payment/method" xsi:type="string">braintree</data>
-            <data name="paymentForm" xsi:type="string">braintree</data>
-            <data name="creditCard/dataset" xsi:type="string">visa_braintree_fraud_rejected</data>
-            <data name="configData" xsi:type="string">braintree</data>
-            <data name="status" xsi:type="string">Processing</data>
-            <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
-        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
index 3d3920f28a733..648361b0a31c8 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
@@ -18,7 +18,7 @@
 class Links extends Block
 {
     /**
-     * Selector title for for links
+     * Selector title for links
      *
      * @var string
      */
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php
index 068f748da4a8b..21ed8a24345f4 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php
@@ -23,7 +23,7 @@ class AssertVersionOnGrid extends AbstractConstraint
     /*#@-*/
 
     /**
-     * Assert that that version of extension is correct.
+     * Assert that version of extension is correct.
      *
      * @param Grid $grid
      * @param Extension $extension
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
index abda2231c935f..0aa6d39497a43 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
@@ -18,7 +18,7 @@
 class AssertWidgetCmsPageLink extends AbstractConstraint
 {
     /**
-     * Assert that created widget displayed on frontent on Home page and on Advanced Search and
+     * Assert that created widget displayed on frontend on Home page and on Advanced Search and
      * after click on widget link on frontend system redirects you to cms page.
      *
      * @param CmsIndex $cmsIndex
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
index 67eeb0cdc238b..e6c25fdc52ed5 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
@@ -16,7 +16,7 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Check that that widget with type Recently Viewed Products is present on category page
+ * Check that widget with type Recently Viewed Products is present on category page
  */
 class AssertWidgetRecentlyViewedProducts extends AbstractConstraint
 {
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
index 9920f90193f69..1bf6d471fc40a 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
@@ -9,9 +9,11 @@
  */
 namespace Magento\TestFramework\TestCase;
 
+use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use Magento\Theme\Controller\Result\MessagePlugin;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @SuppressWarnings(PHPMD.NumberOfChildren)
@@ -96,7 +98,16 @@ protected function assertPostConditions()
      */
     public function dispatch($uri)
     {
-        $this->getRequest()->setRequestUri($uri);
+        /** @var HttpRequest $request */
+        $request = $this->getRequest();
+        $request->setRequestUri($uri);
+        if ($request->isPost()
+            && !array_key_exists('form_key', $request->getPost())
+        ) {
+            /** @var FormKey $formKey */
+            $formKey = $this->_objectManager->get(FormKey::class);
+            $request->setPostValue('form_key', $formKey->getFormKey());
+        }
         $this->_getBootstrap()->runApp();
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php
index f625ee3288d5d..ef5877612a3b9 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php
@@ -15,7 +15,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->setIsObjectNew(true)
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Backend/App/Request/BackendValidatorTest.php b/dev/tests/integration/testsuite/Magento/Backend/App/Request/BackendValidatorTest.php
new file mode 100644
index 0000000000000..21ffddf851ac4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/App/Request/BackendValidatorTest.php
@@ -0,0 +1,433 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Backend\App\Request;
+
+use Magento\Backend\App\AbstractAction;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\Auth;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Phrase;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\Response;
+use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Bootstrap as TestBootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\Response\Http as HttpResponse;
+use Zend\Stdlib\Parameters;
+use Magento\Backend\Model\UrlInterface as BackendUrl;
+use Magento\Framework\App\Response\HttpFactory as HttpResponseFactory;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BackendValidatorTest extends TestCase
+{
+    private const AWARE_VALIDATION_PARAM = 'test_param';
+
+    private const AWARE_LOCATION_VALUE = 'test1';
+
+    private const CSRF_AWARE_MESSAGE = 'csrf_aware';
+
+    /**
+     * @var ActionInterface
+     */
+    private $mockUnawareAction;
+
+    /**
+     * @var AbstractAction
+     */
+    private $mockAwareAction;
+
+    /**
+     * @var BackendValidator
+     */
+    private $validator;
+
+    /**
+     * @var Request
+     */
+    private $request;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var BackendUrl
+     */
+    private $url;
+
+    /**
+     * @var Auth
+     */
+    private $auth;
+
+    /**
+     * @var CsrfAwareActionInterface
+     */
+    private $mockCsrfAwareAction;
+
+    /**
+     * @var HttpResponseFactory
+     */
+    private $httpResponseFactory;
+
+    /**
+     * @return ActionInterface
+     */
+    private function createUnawareAction(): ActionInterface
+    {
+        return new class implements ActionInterface {
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                throw new NotFoundException(new Phrase('Not implemented'));
+            }
+        };
+    }
+
+    /**
+     * @return AbstractAction
+     */
+    private function createAwareAction(): AbstractAction
+    {
+        $l = self::AWARE_LOCATION_VALUE;
+        $p = self::AWARE_VALIDATION_PARAM;
+
+        return new class($l, $p) extends AbstractAction{
+
+            /**
+             * @var string
+             */
+            private $locationValue;
+
+            /**
+             * @var string
+             */
+            private $param;
+
+            /**
+             * @param string $locationValue
+             * @param string $param
+             */
+            public function __construct(
+                string $locationValue,
+                string $param
+            ) {
+                parent::__construct(
+                    Bootstrap::getObjectManager()->get(Context::class)
+                );
+                $this->locationValue= $locationValue;
+                $this->param = $param;
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                throw new NotFoundException(new Phrase('Not implemented'));
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function _processUrlKeys()
+            {
+                if ($this->_request->getParam($this->param)) {
+                    return true;
+                } else {
+                    /** @var Response $response */
+                    $response = $this->_response;
+                    $response->setHeader('Location', $this->locationValue);
+
+                    return false;
+                }
+            }
+        };
+    }
+
+    /**
+     * @return CsrfAwareActionInterface
+     */
+    private function createCsrfAwareAction(): CsrfAwareActionInterface
+    {
+        $r = Bootstrap::getObjectManager()
+            ->get(ResponseInterface::class);
+        $m = self::CSRF_AWARE_MESSAGE;
+
+        return new class ($r, $m) implements CsrfAwareActionInterface {
+
+            /**
+             * @var ResponseInterface
+             */
+            private $response;
+
+            /**
+             * @var string
+             */
+            private $message;
+
+            /**
+             * @param ResponseInterface $response
+             * @param string $message
+             */
+            public function __construct(
+                ResponseInterface $response,
+                string $message
+            ) {
+                $this->response = $response;
+                $this->message = $message;
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                return $this->response;
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function createCsrfValidationException(
+                RequestInterface $request
+            ): ?InvalidRequestException {
+                return new InvalidRequestException(
+                    $this->response,
+                    [new Phrase($this->message)]
+                );
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function validateForCsrf(RequestInterface $request): ?bool
+            {
+                return false;
+            }
+
+        };
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->request = $objectManager->get(RequestInterface::class);
+        $this->validator = $objectManager->get(BackendValidator::class);
+        $this->mockUnawareAction = $this->createUnawareAction();
+        $this->mockAwareAction = $this->createAwareAction();
+        $this->formKey = $objectManager->get(FormKey::class);
+        $this->url = $objectManager->get(BackendUrl::class);
+        $this->auth = $objectManager->get(Auth::class);
+        $this->mockCsrfAwareAction = $this->createCsrfAwareAction();
+        $this->httpResponseFactory = $objectManager->get(
+            HttpResponseFactory::class
+        );
+    }
+
+    /**
+     * @magentoConfigFixture admin/security/use_form_key 1
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateWithValidKey()
+    {
+        $this->request->setMethod(HttpRequest::METHOD_GET);
+        $this->auth->login(
+            TestBootstrap::ADMIN_NAME,
+            TestBootstrap::ADMIN_PASSWORD
+        );
+        $this->request->setParams([
+            BackendUrl::SECRET_KEY_PARAM_NAME => $this->url->getSecretKey(),
+        ]);
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\App\Request\InvalidRequestException
+     *
+     * @magentoConfigFixture admin/security/use_form_key 1
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateWithInvalidKey()
+    {
+        $invalidKey = $this->url->getSecretKey() .'Invalid';
+        $this->request->setParams([
+            BackendUrl::SECRET_KEY_PARAM_NAME => $invalidKey,
+        ]);
+        $this->request->setMethod(HttpRequest::METHOD_GET);
+        $this->auth->login(
+            TestBootstrap::ADMIN_NAME,
+            TestBootstrap::ADMIN_PASSWORD
+        );
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\App\Request\InvalidRequestException
+     *
+     * @magentoConfigFixture admin/security/use_form_key 0
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateWithInvalidFormKey()
+    {
+        $this->request->setPost(
+            new Parameters(['form_key' => $this->formKey->getFormKey() .'1'])
+        );
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @magentoConfigFixture admin/security/use_form_key 0
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateInvalidWithAwareAction()
+    {
+        $this->request->setParams([self::AWARE_VALIDATION_PARAM => '']);
+
+        /** @var InvalidRequestException|null $caught */
+        $caught = null;
+        try {
+            $this->validator->validate(
+                $this->request,
+                $this->mockAwareAction
+            );
+        } catch (InvalidRequestException $exception) {
+            $caught = $exception;
+        }
+
+        $this->assertNotNull($caught);
+        /** @var Response $response */
+        $response = $caught->getReplaceResult();
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals(
+            self::AWARE_LOCATION_VALUE,
+            $response->getHeader('Location')->getFieldValue()
+        );
+        $this->assertNull($caught->getMessages());
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateValidWithAwareAction()
+    {
+        $this->request->setParams(
+            [self::AWARE_VALIDATION_PARAM => '1']
+        );
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockAwareAction
+        );
+    }
+
+    /**
+     * @magentoConfigFixture admin/security/use_form_key 1
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateWithCsrfAwareAction()
+    {
+        //Setting up request that would be valid for default validation.
+        $this->request->setMethod(HttpRequest::METHOD_GET);
+        $this->auth->login(
+            TestBootstrap::ADMIN_NAME,
+            TestBootstrap::ADMIN_PASSWORD
+        );
+        $this->request->setParams([
+            BackendUrl::SECRET_KEY_PARAM_NAME => $this->url->getSecretKey(),
+        ]);
+
+        /** @var InvalidRequestException|null $caught */
+        $caught = null;
+        try {
+            $this->validator->validate(
+                $this->request,
+                $this->mockCsrfAwareAction
+            );
+        } catch (InvalidRequestException $exception) {
+            $caught = $exception;
+        }
+
+        //Checking that custom validation was called and invalidated
+        //valid request.
+        $this->assertNotNull($caught);
+        $this->assertCount(1, $caught->getMessages());
+        $this->assertEquals(
+            self::CSRF_AWARE_MESSAGE,
+            $caught->getMessages()[0]->getText()
+        );
+    }
+
+    public function testInvalidAjaxRequest()
+    {
+        //Setting up AJAX request with invalid secret key.
+        $this->request->setMethod(HttpRequest::METHOD_GET);
+        $this->auth->login(
+            TestBootstrap::ADMIN_NAME,
+            TestBootstrap::ADMIN_PASSWORD
+        );
+        $this->request->setParams([
+            BackendUrl::SECRET_KEY_PARAM_NAME => 'invalid',
+            'isAjax' => '1'
+        ]);
+
+        /** @var InvalidRequestException|null $caught */
+        $caught = null;
+        try {
+            $this->validator->validate(
+                $this->request,
+                $this->mockUnawareAction
+            );
+        } catch (InvalidRequestException $exception) {
+            $caught = $exception;
+        }
+
+        $this->assertNotNull($caught);
+        $this->assertInstanceOf(
+            ResultInterface::class,
+            $caught->getReplaceResult()
+        );
+        /** @var ResultInterface $result */
+        $result = $caught->getReplaceResult();
+        /** @var HttpResponse $response */
+        $response = $this->httpResponseFactory->create();
+        $result->renderResult($response);
+        $this->assertEmpty($response->getBody());
+        $this->assertEquals(401, $response->getHttpResponseCode());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php
index 52abd7d6ff8eb..662b69c89bc6d 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php
@@ -28,7 +28,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData([
         'use_config_manage_stock' => 1,
         'qty' => 100,
@@ -59,7 +59,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData([
         'use_config_manage_stock' => 1,
         'qty' => 50,
@@ -85,7 +85,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData([
         'use_config_manage_stock' => 1,
         'qty' => 140,
@@ -116,7 +116,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData([
         'use_config_manage_stock' => 1,
         'qty' => 20,
@@ -147,7 +147,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData([
         'use_config_manage_stock' => 1,
         'qty' => 15,
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/OutputTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/OutputTest.php
index bcb29fa002f01..5a4dadedb1c9e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/OutputTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/OutputTest.php
@@ -64,6 +64,24 @@ public function testCategoryAttribute()
         );
     }
 
+    /**
+     * @dataProvider isDirectiveDataProvider
+     */
+    public function testIsDirective($html, $expectedResult)
+    {
+        $this->assertEquals($expectedResult, $this->_helper->isDirectivesExists($html));
+    }
+
+    public function isDirectiveDataProvider()
+    {
+        return [
+            ['{{', false],
+            ['Test string', false],
+            ['{store url="customer/account/login"}', false],
+            ['{{store url="customer/account/login"}}', true],
+        ];
+    }
+
     /**
      * Helper method for testProcess()
      *
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync.php
index 9c55370156235..96a537f123d92 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync.php
@@ -126,7 +126,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(AttributeStatus::STATUS_ENABLED)
     ->setWebsiteIds([$website->getId()])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
 
 $product = $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
index 2873ae7ccf399..d3825675b7244 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
@@ -48,7 +48,7 @@
     \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
 )->setWebsiteIds(
     [1]
-)->setCateroryIds(
+)->setCategoryIds(
     []
 )->setStockData(
     ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_mixed_products.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_mixed_products.php
index 9f2045db66108..7d05f30337cc2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_mixed_products.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_mixed_products.php
@@ -186,7 +186,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('5.99')
     ->save();
@@ -211,7 +211,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('15.99')
     ->save();
@@ -231,7 +231,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('25.99')
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php
index fa6e826eec70e..dcdbed7562fdb 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php
@@ -25,7 +25,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('5.99')
     ->save();
@@ -50,7 +50,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('15.99')
     ->save();
@@ -70,7 +70,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('25.99')
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_few_out_of_stock.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_few_out_of_stock.php
index 4235fcf11f9f8..13b9870f24f66 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_few_out_of_stock.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products_with_few_out_of_stock.php
@@ -53,7 +53,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setCategoryIds([300])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 0, 'is_qty_decimal' => 0, 'is_in_stock' => 0])
     ->setSpecialPrice('5.99')
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php
index 091e64dbe6a4f..48c47c9988d59 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php
@@ -87,7 +87,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('5.99')
     ->save();
@@ -112,7 +112,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('15.99')
     ->save();
@@ -132,7 +132,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('25.99')
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
index 330d9511dcdb9..5a6b1720f5a35 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
@@ -34,7 +34,7 @@
     \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
 )->setWebsiteIds(
     [1]
-)->setCateroryIds(
+)->setCategoryIds(
     []
 )->setStockData(
     ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php
index 76d17527d567a..911c7aa30641e 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php
@@ -67,7 +67,7 @@ public function testReindexWithProductNotVisibleIndividually()
         $this->assertEquals(
             7.5,
             $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $product->getId()),
-            "Catalog price rule doesn't apply to to product with visibility value \"Not Visibility Individually\""
+            "Catalog price rule doesn't apply to product with visibility value \"Not Visibility Individually\""
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
new file mode 100644
index 0000000000000..e533dbfa0c879
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Plugin\Model\Quote;
+
+use Magento\Checkout\Model\Cart;
+use Magento\Checkout\Model\Session;
+use Magento\Quote\Model\BillingAddressManagement;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test for \Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses
+ */
+class ResetQuoteAddressesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     *
+     * @return void
+     */
+    public function testAfterRemoveItem(): void
+    {
+        /** @var Quote $quote */
+        $quote = Bootstrap::getObjectManager()->create(Quote::class);
+        $quote->load('test_order_with_virtual_product', 'reserved_order_id');
+        /** @var QuoteAddress $quoteShippingAddress */
+        $quoteBillingAddress = Bootstrap::getObjectManager()->create(QuoteAddress::class);
+        $quoteBillingAddress->setRegion('CA')
+            ->setPostcode('90210')
+            ->setFirstname('a_unique_firstname')
+            ->setLastname('lastname')
+            ->setStreet('street')
+            ->setCity('Beverly Hills')
+            ->setEmail('admin@example.com')
+            ->setTelephone('1111111111')
+            ->setCountryId('US')
+            ->setAddressType('billing');
+
+        /** @var BillingAddressManagement $billingAddressManagement */
+        $billingAddressManagement = Bootstrap::getObjectManager()->create(BillingAddressManagement::class);
+        $billingAddressManagement->assign($quote->getId(), $quoteBillingAddress);
+        /** @var Session $checkoutSession */
+        $checkoutSession = Bootstrap::getObjectManager()->create(Session::class);
+        $checkoutSession->setQuoteId($quote->getId());
+        /** @var Cart $cart */
+        $cart = Bootstrap::getObjectManager()->create(Cart::class);
+
+        $activeQuote = $cart->getQuote();
+        $cart->removeItem($activeQuote->getAllVisibleItems()[0]->getId());
+        $cart->save();
+
+        /** @var Quote $quote */
+        $quote = Bootstrap::getObjectManager()->create(Quote::class);
+        $quote->load('test_order_with_virtual_product', 'reserved_order_id');
+        $quoteBillingAddressUpdated = $quote->getBillingAddress();
+        $customer = $quote->getCustomer();
+
+        $this->assertEquals($quoteBillingAddressUpdated->getEmail(), $customer->getEmail());
+        $this->assertEmpty($quoteBillingAddressUpdated->getCountryId());
+        $this->assertEmpty($quoteBillingAddressUpdated->getRegionId());
+        $this->assertEmpty($quoteBillingAddressUpdated->getRegion());
+        $this->assertEmpty($quoteBillingAddressUpdated->getPostcode());
+        $this->assertEmpty($quoteBillingAddressUpdated->getCity());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index eca5cf79c0664..1cbdbd128bbf4 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -219,6 +219,7 @@ public function testConfirmActionAlreadyActive()
     public function testNoFormKeyCreatePostAction()
     {
         $this->fillRequestWithAccountData('test1@email.com');
+        $this->getRequest()->setPostValue('form_key', null);
         $this->dispatch('customer/account/createPost');
 
         $this->assertNull($this->getCustomerByEmail('test1@email.com'));
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
index 3ed330ed98d6b..336b438661705 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -262,7 +262,7 @@ public function testGetCustomerAttributeMetadata()
             $this->assertEquals(
                 $attributeMetadata,
                 $attributeMetadata1,
-                'Attribute metadata from the the same service became different after getAttributeCode was called'
+                'Attribute metadata from the same service became different after getAttributeCode was called'
             );
             // Verify the consistency of attribute metadata from two services
             // after getAttributeCode was called
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Request/CsrfValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Request/CsrfValidatorTest.php
new file mode 100644
index 0000000000000..9246be52f41bf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Request/CsrfValidatorTest.php
@@ -0,0 +1,269 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Phrase;
+use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Zend\Stdlib\Parameters;
+use Magento\Framework\App\Response\Http as HttpResponse;
+use Magento\Framework\App\Response\HttpFactory as HttpResponseFactory;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CsrfValidatorTest extends TestCase
+{
+    private const AWARE_URL = 'test/1';
+
+    private const AWARE_VALIDATION_PARAM = 'test_param';
+
+    private const AWARE_MESSAGE = 'custom validation failed';
+
+    /**
+     * @var ActionInterface
+     */
+    private $mockUnawareAction;
+
+    /**
+     * @var ActionInterface
+     */
+    private $mockAwareAction;
+
+    /**
+     * @var CsrfValidator
+     */
+    private $validator;
+
+    /**
+     * @var HttpRequest
+     */
+    private $request;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var HttpResponseFactory
+     */
+    private $httpResponseFactory;
+
+    /**
+     * @return ActionInterface
+     */
+    private function createUnawareAction(): ActionInterface
+    {
+        return new class implements ActionInterface {
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                throw new NotFoundException(new Phrase('Not implemented'));
+            }
+        };
+    }
+
+    /**
+     * @return ActionInterface
+     */
+    private function createAwareAction(): ActionInterface
+    {
+        $u = self::AWARE_URL;
+        $m = self::AWARE_MESSAGE;
+        $p = self::AWARE_VALIDATION_PARAM;
+
+        return new class($u, $m, $p) implements CsrfAwareActionInterface {
+            /**
+             * @var string
+             */
+            private $url;
+
+            /**
+             * @var string
+             */
+            private $message;
+
+            /**
+             * @var string
+             */
+            private $param;
+
+            /**
+             * @param string $url
+             * @param string $message
+             * @param string $param
+             */
+            public function __construct(
+                string $url,
+                string $message,
+                string $param
+            ) {
+                $this->url = $url;
+                $this->message = $message;
+                $this->param = $param;
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                throw new NotFoundException(new Phrase('Not implemented'));
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function createCsrfValidationException(
+                RequestInterface $request
+            ): ?InvalidRequestException {
+                /** @var RedirectFactory $redirectFactory */
+                $redirectFactory = Bootstrap::getObjectManager()
+                    ->get(RedirectFactory::class);
+                $redirect = $redirectFactory->create();
+                $redirect->setUrl($this->url);
+
+                return new InvalidRequestException(
+                    $redirect,
+                    [new Phrase($this->message)]
+                );
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function validateForCsrf(RequestInterface $request): ?bool
+            {
+                return (bool)$request->getParam($this->param);
+            }
+        };
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->request = $objectManager->get(HttpRequest::class);
+        $this->validator = $objectManager->get(CsrfValidator::class);
+        $this->mockUnawareAction = $this->createUnawareAction();
+        $this->mockAwareAction = $this->createAwareAction();
+        $this->formKey = $objectManager->get(FormKey::class);
+        $this->httpResponseFactory = $objectManager->get(
+            HttpResponseFactory::class
+        );
+    }
+
+    /**
+     * @magentoAppArea global
+     */
+    public function testValidateInWrongArea()
+    {
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testValidateWithValidKey()
+    {
+        $this->request->setPost(
+            new Parameters(['form_key' => $this->formKey->getFormKey()])
+        );
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\App\Request\InvalidRequestException
+     * @magentoAppArea adminhtml
+     */
+    public function testValidateWithInvalidKey()
+    {
+        $this->request->setPost(
+            new Parameters(['form_key' => $this->formKey->getFormKey() .'1'])
+        );
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockUnawareAction
+        );
+    }
+
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testValidateInvalidWithAwareAction()
+    {
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+
+        /** @var InvalidRequestException|null $caught */
+        $caught = null;
+        try {
+            $this->validator->validate(
+                $this->request,
+                $this->mockAwareAction
+            );
+        } catch (InvalidRequestException $exception) {
+            $caught = $exception;
+        }
+
+        $this->assertNotNull($caught);
+        $this->assertInstanceOf(Redirect::class, $caught->getReplaceResult());
+        /** @var HttpResponse $response */
+        $response = $this->httpResponseFactory->create();
+        $caught->getReplaceResult()->renderResult($response);
+        $this->assertContains(
+            self::AWARE_URL,
+            $response->getHeaders()->toString()
+        );
+        $this->assertCount(1, $caught->getMessages());
+        $this->assertEquals(
+            self::AWARE_MESSAGE,
+            $caught->getMessages()[0]->getText()
+        );
+    }
+
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testValidateValidWithAwareAction()
+    {
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+        $this->request->setPost(
+            new Parameters([self::AWARE_VALIDATION_PARAM => '1'])
+        );
+
+        $this->validator->validate(
+            $this->request,
+            $this->mockAwareAction
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php
index f3b30797b93ed..c286f6c57d87f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php
@@ -6,4 +6,4 @@
 
 use \Magento\Framework\Component\ComponentRegistrar;
 
-ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontent/Test/theme', __DIR__);
+ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Test/theme', __DIR__);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt
index 8f2df480aabc5..f9cd49de77d67 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt
@@ -1,2 +1,2 @@
 module Magento_Module *
-theme frontent/Test/theme One*
+theme frontend/Test/theme One*
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
index d098e9bed4ffe..8583dcf3e4cd2 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
@@ -196,7 +196,7 @@ enumValues(includeDeprecated: true) {
                 'Missing type in the response'
             );
         }
-        //Checks to make sure that the the given description exists in the expectedOutput array
+        //Checks to make sure that the given description exists in the expectedOutput array
         $this->assertTrue(
             array_key_exists(
                 array_search(
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
index 18501ecfbbfbf..8e50fe1888104 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
@@ -9,17 +9,17 @@
     <block class="Magento\Framework\View\Element\Text" name="block1">
         <block class="Magento\Framework\View\Element\Text" name="block2" group="group1">
             <arguments>
-                <argument xsi:type="string" name="text">blok2</argument>
+                <argument xsi:type="string" name="text">block2</argument>
             </arguments>
         </block>
         <block class="Magento\Framework\View\Element\Text" name="block3" group="group1" >
             <arguments>
-                <argument xsi:type="string" name="text">blok3</argument>
+                <argument xsi:type="string" name="text">block3</argument>
             </arguments>
         </block>
         <block class="Magento\Framework\View\Element\Text" name="block4">
             <arguments>
-                <argument xsi:type="string" name="text">blok4</argument>
+                <argument xsi:type="string" name="text">block4</argument>
             </arguments>
         </block>
         </block>
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php b/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php
index b1a239ccd2246..102d1d1268afd 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php
@@ -23,7 +23,7 @@
     \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
 )->setWebsiteIds(
     [1]
-)->setCateroryIds(
+)->setCategoryIds(
     []
 )->setStockData(
     ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Plugin/RegisterFormKeyFromCookieTest.php b/dev/tests/integration/testsuite/Magento/PageCache/Plugin/RegisterFormKeyFromCookieTest.php
new file mode 100644
index 0000000000000..eb23b0b185a00
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/PageCache/Plugin/RegisterFormKeyFromCookieTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Plugin;
+
+use Magento\Framework\App\FrontController;
+use Magento\Framework\App\RequestInterface;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class RegisterFormKeyFromCookieTest extends TestCase
+{
+    /**
+     * @var HttpRequest
+     */
+    private $request;
+
+    /**
+     * @var FrontController
+     */
+    private $frontController;
+
+    /**
+     * @var FormKeyValidator
+     */
+    private $formKeyValidator;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->request = $objectManager->get(RequestInterface::class);
+        $this->frontController = $objectManager->get(
+            FrontController::class
+        );
+        $this->formKeyValidator = $objectManager->get(FormKeyValidator::class);
+    }
+
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testTakenFromCookie()
+    {
+        if (!Bootstrap::canTestHeaders()) {
+            $this->markTestSkipped(
+                'Can\'t test dispatch process without sending headers'
+            );
+        }
+        $_SERVER['HTTP_HOST'] = 'localhost';
+        $formKey = 'customFormKey';
+        $_COOKIE['form_key'] = $formKey;
+        $this->request->setMethod(HttpRequest::METHOD_POST);
+        $this->request->setParam('form_key', $formKey);
+        $this->request->setRequestUri('core/index/index');
+        $this->frontController->dispatch($this->request);
+        $this->assertTrue($this->formKeyValidator->validate($this->request));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index 671ab6e4b5619..2552d383bbcc3 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -767,7 +767,6 @@
                             <attribute type="shared">1</attribute>
                         </field>
                         <field id="bml_wizard" translate="button_label" sortOrder="15" showInDefault="1" showInWebsite="1">
-                            <label></label>
                             <button_label>Get Publisher ID from PayPal</button_label>
                             <button_url><![CDATA[https:/financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
                             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard</frontend_model>
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/products_with_layered_navigation_swatch.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/products_with_layered_navigation_swatch.php
index e2df7206b27d9..215c32c4b521d 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/_files/products_with_layered_navigation_swatch.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/products_with_layered_navigation_swatch.php
@@ -123,7 +123,7 @@ function ($values, $index) use ($optionsPerAttribute) {
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('5.99')
     ->save();
@@ -148,7 +148,7 @@ function ($values, $index) use ($optionsPerAttribute) {
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('15.99')
     ->save();
@@ -168,7 +168,7 @@ function ($values, $index) use ($optionsPerAttribute) {
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setSpecialPrice('25.99')
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
index e0bd6f3523612..dd5d12c5b9be3 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
@@ -2192,7 +2192,7 @@ protected function setupMultiRuleQuote()
     }
 
     /**
-     * Create the base results for the the multi rules test
+     * Create the base results for the multi rules test
      *
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
diff --git a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
index ed7613f3dd106..6c2c291e6c295 100644
--- a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
@@ -57,7 +57,7 @@ public function testImportFromCsvFileWithCorrectData()
     /**
      * @magentoDbIsolation enabled
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage One of the countries has invalid code.
+     * @expectedExceptionMessage Country code is invalid: ZZ
      */
     public function testImportFromCsvFileThrowsExceptionWhenCountryCodeIsInvalid()
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
index a1fe346aae3b6..3f33d0b2c69d5 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
@@ -46,7 +46,7 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         if ($tokens[$prevPtr]['line'] === $tokens[$stackPtr]['line']) {
-            $error = 'Each propery must be on a line by itself';
+            $error = 'Each property must be on a line by itself';
             $phpcsFile->addError($error, $stackPtr, 'SameLine');
         }
     }
diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
index f41c235a6c0f8..e3cfdf532438c 100644
--- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
@@ -64,7 +64,7 @@ protected function validateNamespace(File $sourceFile, $stackPtr)
                     'Cannot use "%s" in namespace as it is reserved since PHP %s',
                     $stackPtr,
                     'Namespace',
-                    [$namespacePart, $this->reservedWords[$namespacePart]]
+                    [$namespacePart, $this->reservedWords[strtolower($namespacePart)]]
                 );
             }
             $stackPtr++;
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php b/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php
index 1b4e70be3644f..68762a8a6c046 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/Config/Converter/Dom.php
@@ -12,6 +12,7 @@ class Dom implements \Magento\Framework\Config\ConverterInterface
      *
      * @param \DOMDocument $source
      * @return array
+     * @throws \Exception
      */
     public function convert($source)
     {
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php
index 105f27cb330fc..3cc1087228174 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/Config/SchemaLocator.php
@@ -27,6 +27,8 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function getSchema()
     {
@@ -35,6 +37,8 @@ public function getSchema()
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function getPerFileSchema()
     {
diff --git a/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php b/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
index c5b75d4ccd3b9..8a4ad39d78570 100644
--- a/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
+++ b/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
@@ -43,6 +43,7 @@ public function __construct(ProviderInterface $resourceProvider, AclResourceFact
      *
      * @param Acl $acl
      * @return void
+     * @throws \Zend_Acl_Exception
      */
     public function populateAcl(Acl $acl)
     {
@@ -57,6 +58,7 @@ public function populateAcl(Acl $acl)
      * @param AclResource $parent
      * @return void
      * @throws \InvalidArgumentException
+     * @throws \Zend_Acl_Exception
      */
     protected function _addResourceTree(Acl $acl, array $resources, AclResource $parent = null)
     {
diff --git a/lib/internal/Magento/Framework/Api/Uploader.php b/lib/internal/Magento/Framework/Api/Uploader.php
index d3ae11100b9dc..5cea3a34569a9 100644
--- a/lib/internal/Magento/Framework/Api/Uploader.php
+++ b/lib/internal/Magento/Framework/Api/Uploader.php
@@ -19,7 +19,7 @@ public function __construct()
     }
 
     /**
-     * Explicitly set the the file attributes instead of setting it via constructor
+     * Explicitly set the file attributes instead of setting it via constructor
      *
      * @param array $fileAttributes
      * @return void
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
index 4468954d189da..904c41ab9ec33 100644
--- a/lib/internal/Magento/Framework/App/Bootstrap.php
+++ b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Autoload\Populator;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Filesystem\DriverPool;
+use Psr\Log\LoggerInterface;
 
 /**
  * A bootstrap of Magento application
@@ -258,6 +259,7 @@ public function run(AppInterface $application)
                 \Magento\Framework\Profiler::stop('magento');
             } catch (\Exception $e) {
                 \Magento\Framework\Profiler::stop('magento');
+                $this->objectManager->get(LoggerInterface::class)->error($e->getMessage());
                 if (!$application->catchException($this, $e)) {
                     throw $e;
                 }
@@ -423,7 +425,7 @@ protected function terminate(\Exception $e)
                 if (!$this->objectManager) {
                     throw new \DomainException();
                 }
-                $this->objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+                $this->objectManager->get(LoggerInterface::class)->critical($e);
             } catch (\Exception $e) {
                 $message .= "Could not write error message to log. Please use developer mode to see the message.\n";
             }
diff --git a/lib/internal/Magento/Framework/App/CsrfAwareActionInterface.php b/lib/internal/Magento/Framework/App/CsrfAwareActionInterface.php
new file mode 100644
index 0000000000000..8413b945a1141
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/CsrfAwareActionInterface.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+use Magento\Framework\App\Request\InvalidRequestException;
+
+/**
+ * Action that's aware of CSRF protection.
+ */
+interface CsrfAwareActionInterface extends ActionInterface
+{
+    /**
+     * Create exception in case CSRF validation failed.
+     * Return null if default exception will suffice.
+     *
+     * @param RequestInterface $request
+     *
+     * @return InvalidRequestException|null
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException;
+
+    /**
+     * Perform custom request validation.
+     * Return null if default validation is needed.
+     *
+     * @param RequestInterface $request
+     *
+     * @return bool|null
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool;
+}
diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php
index 02b390289c9a9..03d6ad7ab3f02 100644
--- a/lib/internal/Magento/Framework/App/FrontController.php
+++ b/lib/internal/Magento/Framework/App/FrontController.php
@@ -7,6 +7,16 @@
  */
 namespace Magento\Framework\App;
 
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\App\Request\ValidatorInterface as RequestValidator;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Message\ManagerInterface as MessageManager;
+use Magento\Framework\App\Action\AbstractAction;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class FrontController implements FrontControllerInterface
 {
     /**
@@ -15,27 +25,45 @@ class FrontController implements FrontControllerInterface
     protected $_routerList;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface
+     * @var ResponseInterface
      */
     protected $response;
 
+    /**
+     * @var RequestValidator
+     */
+    private $requestValidator;
+
+    /**
+     * @var MessageManager
+     */
+    private $messages;
+
     /**
      * @param RouterListInterface $routerList
-     * @param \Magento\Framework\App\ResponseInterface $response
+     * @param ResponseInterface $response
+     * @param RequestValidator|null $requestValidator
+     * @param MessageManager|null $messageManager
      */
     public function __construct(
         RouterListInterface $routerList,
-        \Magento\Framework\App\ResponseInterface $response
+        ResponseInterface $response,
+        ?RequestValidator $requestValidator = null,
+        ?MessageManager $messageManager = null
     ) {
         $this->_routerList = $routerList;
         $this->response = $response;
+        $this->requestValidator = $requestValidator
+            ?? ObjectManager::getInstance()->get(RequestValidator::class);
+        $this->messages = $messageManager
+            ?? ObjectManager::getInstance()->get(MessageManager::class);
     }
 
     /**
      * Perform action and generate response
      *
      * @param RequestInterface $request
-     * @return ResponseInterface|\Magento\Framework\Controller\ResultInterface
+     * @return ResponseInterface|ResultInterface
      * @throws \LogicException
      */
     public function dispatch(RequestInterface $request)
@@ -49,13 +77,10 @@ public function dispatch(RequestInterface $request)
                 try {
                     $actionInstance = $router->match($request);
                     if ($actionInstance) {
-                        $request->setDispatched(true);
-                        $this->response->setNoCacheHeaders();
-                        if ($actionInstance instanceof \Magento\Framework\App\Action\AbstractAction) {
-                            $result = $actionInstance->dispatch($request);
-                        } else {
-                            $result = $actionInstance->execute();
-                        }
+                        $result = $this->processRequest(
+                            $request,
+                            $actionInstance
+                        );
                         break;
                     }
                 } catch (\Magento\Framework\Exception\NotFoundException $e) {
@@ -72,4 +97,42 @@ public function dispatch(RequestInterface $request)
         }
         return $result;
     }
+
+    /**
+     * @param RequestInterface $request
+     * @param ActionInterface $actionInstance
+     * @throws NotFoundException
+     *
+     * @return ResponseInterface|ResultInterface
+     */
+    private function processRequest(
+        RequestInterface $request,
+        ActionInterface $actionInstance
+    ) {
+        $request->setDispatched(true);
+        $this->response->setNoCacheHeaders();
+        //Validating request.
+        try {
+            $this->requestValidator->validate(
+                $request,
+                $actionInstance
+            );
+
+            if ($actionInstance instanceof AbstractAction) {
+                $result = $actionInstance->dispatch($request);
+            } else {
+                $result = $actionInstance->execute();
+            }
+        } catch (InvalidRequestException $exception) {
+            //Validation failed - processing validation results.
+            $result = $exception->getReplaceResult();
+            if ($messages = $exception->getMessages()) {
+                foreach ($messages as $message) {
+                    $this->messages->addErrorMessage($message);
+                }
+            }
+        }
+
+        return $result;
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/Request/CsrfValidator.php b/lib/internal/Magento/Framework/App/Request/CsrfValidator.php
new file mode 100644
index 0000000000000..c930fc920907c
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Request/CsrfValidator.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\State as AppState;
+use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Validate request for being CSRF protected.
+ */
+class CsrfValidator implements ValidatorInterface
+{
+    /**
+     * @var FormKeyValidator
+     */
+    private $formKeyValidator;
+
+    /**
+     * @var RedirectFactory
+     */
+    private $redirectFactory;
+
+    /**
+     * @var AppState
+     */
+    private $appState;
+
+    /**
+     * @param FormKeyValidator $formKeyValidator
+     * @param RedirectFactory $redirectFactory
+     * @param AppState $appState
+     */
+    public function __construct(
+        FormKeyValidator $formKeyValidator,
+        RedirectFactory $redirectFactory,
+        AppState $appState
+    ) {
+        $this->formKeyValidator = $formKeyValidator;
+        $this->redirectFactory = $redirectFactory;
+        $this->appState = $appState;
+    }
+
+    /**
+     * @param HttpRequest $request
+     * @param ActionInterface  $action
+     *
+     * @return bool
+     */
+    private function validateRequest(
+        HttpRequest $request,
+        ActionInterface $action
+    ): bool {
+        $valid = null;
+        if ($action instanceof CsrfAwareActionInterface) {
+            $valid = $action->validateForCsrf($request);
+        }
+        if ($valid === null) {
+            $valid = !$request->isPost()
+                || $request->isAjax()
+                || $this->formKeyValidator->validate($request);
+        }
+
+        return $valid;
+    }
+
+    /**
+     * @param HttpRequest $request
+     * @param ActionInterface $action
+     *
+     * @return InvalidRequestException
+     */
+    private function createException(
+        HttpRequest $request,
+        ActionInterface $action
+    ): InvalidRequestException {
+        $exception = null;
+        if ($action instanceof CsrfAwareActionInterface) {
+            $exception = $action->createCsrfValidationException($request);
+        }
+        if (!$exception) {
+            $response = $this->redirectFactory->create()
+                ->setRefererOrBaseUrl()
+                ->setHttpResponseCode(302);
+            $messages = [
+                new Phrase('Invalid Form Key. Please refresh the page.'),
+            ];
+            $exception = new InvalidRequestException($response, $messages);
+        }
+
+        return $exception;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(
+        RequestInterface $request,
+        ActionInterface $action
+    ): void {
+        try {
+            $areaCode = $this->appState->getAreaCode();
+        } catch (LocalizedException $exception) {
+            $areaCode = null;
+        }
+        if ($request instanceof HttpRequest
+            && in_array(
+                $areaCode,
+                [Area::AREA_FRONTEND, Area::AREA_ADMINHTML],
+                true
+            )
+        ) {
+            $valid = $this->validateRequest($request, $action);
+            if (!$valid) {
+                throw $this->createException($request, $action);
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
new file mode 100644
index 0000000000000..3d408b0050686
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Phrase;
+
+/**
+ * Received request is invalid.
+ */
+class InvalidRequestException extends RuntimeException
+{
+    /**
+     * @var ResponseInterface|ResultInterface
+     */
+    private $replaceResult;
+
+    /**
+     * @var Phrase[]|null
+     */
+    private $messages;
+
+    /**
+     * @param ResponseInterface|ResultInterface $replaceResult Use this result
+     * instead of calling action instance.
+     * @param Phrase[]|null $messages Messages to show to client
+     * as error messages.
+     */
+    public function __construct($replaceResult, ?array $messages = null)
+    {
+        parent::__construct(new Phrase('Invalid request received'));
+
+        $this->replaceResult = $replaceResult;
+        $this->messages = $messages;
+    }
+
+    /**
+     * @return ResponseInterface|ResultInterface
+     */
+    public function getReplaceResult()
+    {
+        return $this->replaceResult;
+    }
+
+    /**
+     * @return Phrase[]|null
+     */
+    public function getMessages(): ?array
+    {
+        return $this->messages;
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Request/ValidatorInterface.php b/lib/internal/Magento/Framework/App/Request/ValidatorInterface.php
new file mode 100644
index 0000000000000..f4b1503ac5cb6
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Request/ValidatorInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\App\Request;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Validate interface before giving passing it to an ActionInterface.
+ */
+interface ValidatorInterface
+{
+    /**
+     * Validate request and throw the exception if it's invalid.
+     *
+     * @param RequestInterface $request
+     * @param ActionInterface $action
+     * @throws InvalidRequestException If request was invalid.
+     *
+     * @return void
+     */
+    public function validate(
+        RequestInterface $request,
+        ActionInterface $action
+    ): void;
+}
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
index 5b9ae925bff27..148053fa44e08 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection.php
@@ -104,9 +104,21 @@ public function getConnection($resourceName = self::DEFAULT_CONNECTION)
      */
     public function closeConnection($resourceName = self::DEFAULT_CONNECTION)
     {
-        $processConnectionName = $this->getProcessConnectionName($this->config->getConnectionName($resourceName));
-        if (isset($this->connections[$processConnectionName])) {
-            $this->connections[$processConnectionName] = null;
+        if ($resourceName === null) {
+            foreach ($this->connections as $processConnection) {
+                if ($processConnection !== null) {
+                    $processConnection->closeConnection();
+                }
+            }
+            $this->connections = [];
+        } else {
+            $processConnectionName = $this->getProcessConnectionName($this->config->getConnectionName($resourceName));
+            if (isset($this->connections[$processConnectionName])) {
+                if ($this->connections[$processConnectionName] !== null) {
+                    $this->connections[$processConnectionName]->closeConnection();
+                }
+                $this->connections[$processConnectionName] = null;
+            }
         }
     }
 
diff --git a/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php b/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php
index b46612df59296..58606bb38914d 100644
--- a/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php
+++ b/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php
@@ -66,7 +66,7 @@ public function execute(array $messages, InputInterface $input, OutputInterface
     }
 
     /**
-     * Creates Question object from from given array of messages.
+     * Creates Question object from given array of messages.
      *
      * @param string[] $messages array of messages
      * @return Question
diff --git a/lib/internal/Magento/Framework/DB/TemporaryTableService.php b/lib/internal/Magento/Framework/DB/TemporaryTableService.php
index 479cd0c6fddb9..03c1a9b9aa7f6 100644
--- a/lib/internal/Magento/Framework/DB/TemporaryTableService.php
+++ b/lib/internal/Magento/Framework/DB/TemporaryTableService.php
@@ -10,7 +10,7 @@
 
 /**
  * Class TemporaryTableService creates a temporary table in mysql from a Magento\Framework\DB\Select.
- * Use this class to create an index with that that you want to query later for quick data access
+ * Use this class to create an index with that you want to query later for quick data access
  *
  * @api
  * @since 100.2.0
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config.php b/lib/internal/Magento/Framework/DataObject/Copy/Config.php
index 2ad80321eb1fe..fa3ab6e2f7ce6 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy/Config.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config.php
@@ -44,6 +44,6 @@ public function getFieldset($name, $root = 'global')
         if (empty($fieldsets)) {
             return null;
         }
-        return isset($fieldsets[$name]) ? $fieldsets[$name] : null;
+        return $fieldsets[$name] ?? null;
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/README.md b/lib/internal/Magento/Framework/GraphQlSchemaStitching/README.md
index da47fff7f96d4..b87cd2d7e4e7c 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/README.md
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/README.md
@@ -1 +1 @@
-The GraphQlSchemaStitching library contains functionality for processing GraphQl SDL schema, to be used by Graphql library to build objects fro the data generated.
+The GraphQlSchemaStitching library contains functionality for processing GraphQl SDL schema, to be used by Graphql library to build objects from the data generated.
diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php
index 216026be8d72e..827e524a62464 100644
--- a/lib/internal/Magento/Framework/System/Ftp.php
+++ b/lib/internal/Magento/Framework/System/Ftp.php
@@ -107,6 +107,12 @@ public function validateConnectionString($string)
         if ($data['scheme'] != 'ftp') {
             throw new \Exception("Support for scheme unsupported: '{$data['scheme']}'");
         }
+        
+        // Decode user & password strings from URL
+        foreach (array_intersect(array_keys($data), ['user','pass']) as $key) {
+            $data[$key] = urldecode($data[$key]);
+        }
+        
         return $data;
     }
 
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Structure.php b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
index 280d62e9c5a7e..1a181952ed990 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Structure.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
@@ -251,6 +251,6 @@ public function populateWithArray(array $data)
      */
     private function getArrayValueByKey($key, array $array)
     {
-        return isset($array[$key]) ? $array[$key] : [];
+        return $array[$key] ?? [];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
index 94d24124469cd..eda2e2e4b6dc7 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
@@ -122,7 +122,7 @@ public function postprocessing($content)
         return preg_replace_callback(
             '#' . $patternTag . '(.+?)' . $patternTag . '#',
             function ($match) {
-                return isset($this->data[$match[1]]) ? $this->data[$match[1]] : '';
+                return $this->data[$match[1]] ?? '';
             },
             $content
         );
diff --git a/lib/web/MutationObserver.js b/lib/web/MutationObserver.js
index 53424fbfa8d0c..4044aa465e745 100644
--- a/lib/web/MutationObserver.js
+++ b/lib/web/MutationObserver.js
@@ -324,7 +324,7 @@
     if (lastRecord === newRecord)
       return lastRecord;
 
-    // Check if the the record we are adding represents the same record. If
+    // Check if the record we are adding represents the same record. If
     // so, we keep the one with the oldValue in it.
     if (recordWithOldValue && recordRepresentsCurrentMutation(lastRecord))
       return recordWithOldValue;
diff --git a/lib/web/css/docs/source/_buttons.less b/lib/web/css/docs/source/_buttons.less
index a071eed85ef9e..b4b41905b961a 100644
--- a/lib/web/css/docs/source/_buttons.less
+++ b/lib/web/css/docs/source/_buttons.less
@@ -48,10 +48,10 @@ button {
     &.example-button-3 {
         .lib-button-s();
         border-radius: 0;
-        color: #000;
+        color: @color-black;
         &:hover,
         &.active {
-            color: #000;
+            color: @color-black;
         }
     }
 }
@@ -524,10 +524,10 @@ button {
     }
     &.example-button-6 {
         .lib-button-s();
-        color: #fff;
+        color: @color-white;
         &:hover,
         &.active {
-            color: #fff;
+            color: @color-white;
         }
     }
 }
@@ -721,13 +721,13 @@ button {
         @_button-padding: @button__padding,
         @_button-gradient-color-start: #1979c3,
         @_button-gradient-color-end: #006bb4,
-        @_button-color: #fff,
+        @_button-color: @color-white,
         @_button-gradient-color-start-hover: #006bb4,
         @_button-gradient-color-end-hover: #1979c3,
-        @_button-color-hover: #fff,
+        @_button-color-hover: @color-white,
         @_button-gradient-color-start-active: #006bb4,
         @_button-gradient-color-end-active: #006bb4,
-        @_button-color-active: #fff,
+        @_button-color-active: @color-white,
         @_button-gradient: true,
         @_button-gradient-direction: vertical,
         @_button-border: @button-primary__border,
diff --git a/lib/web/css/docs/source/_messages.less b/lib/web/css/docs/source/_messages.less
index 45d4538d14aff..91b3f280880ca 100644
--- a/lib/web/css/docs/source/_messages.less
+++ b/lib/web/css/docs/source/_messages.less
@@ -176,7 +176,7 @@
 //  ```
 //
 
-@message-custom__color: #000;
+@message-custom__color: @color-black;
 @message-custom__background: #fc0;
 @message-custom__border-color: orange;
 
@@ -185,7 +185,7 @@
 @message-custom-link__color-active: darken(@message-custom-link__color, 30%);
 
 @message-custom-icon: @icon-settings;
-@message-custom-icon__color-lateral: #000;
+@message-custom-icon__color-lateral: @color-black;
 @message-custom-icon__background: #green;
 @message-custom-icon__top: 15px;
 @message-custom-icon__right: false;
diff --git a/lib/web/css/docs/source/_pages.less b/lib/web/css/docs/source/_pages.less
index 0b94f84e54f47..6b01fa7549e92 100644
--- a/lib/web/css/docs/source/_pages.less
+++ b/lib/web/css/docs/source/_pages.less
@@ -852,22 +852,22 @@
 .example-pages-3 {
     .lib-pager(
         @_pager-label-display: none,
-        @_pager-color: #fff,
+        @_pager-color: @color-white,
         @_pager-background: @link__color,
-        @_pager-color-visited: #fff,
+        @_pager-color-visited: @color-white,
         @_pager-background-visited: @link__visited__color,
-        @_pager-color-hover: #fff,
+        @_pager-color-hover: @color-white,
         @_pager-background-hover: @link__hover__color,
-        @_pager-color-active: #fff,
+        @_pager-color-active: @color-white,
         @_pager-background-active: @link__active__color,
-        @_pager-current-color: #fff,
+        @_pager-current-color: @color-white,
         @_pager-current-background: @link__visited__color,
         @_pager-action-background: @link__color,
         @_pager-action-background-visited: @link__visited__color,
         @_pager-action-background-hover: @link__hover__color,
         @_pager-action-background-active: @link__active__color,
-        @_pager-action-color: #fff,
-        @_pager-action-color-hover: #fff,
-        @_pager-action-color-active: #fff
+        @_pager-action-color: @color-white,
+        @_pager-action-color-hover: @color-white,
+        @_pager-action-color-active: @color-white
     );
 }
diff --git a/lib/web/css/docs/source/_tables.less b/lib/web/css/docs/source/_tables.less
index 9d0df2350cee9..8feec72f33699 100644
--- a/lib/web/css/docs/source/_tables.less
+++ b/lib/web/css/docs/source/_tables.less
@@ -677,7 +677,7 @@
 .example-table-5 {
     .lib-table();
     .lib-table-background-color(
-        @_table-background-color: #fff,
+        @_table-background-color: @color-white,
         @_table-head-background-color: #ccf,
         @_table-foot-background-color: #cff,
         @_table-td-background-color: #fcc,
@@ -1253,7 +1253,7 @@
     .lib-table();
     .lib-table-striped(
         @_stripped-background-color: #ffc,
-        @_stripped-color: #000,
+        @_stripped-color: @color-black,
         @_stripped-direction: horizontal,
         @_stripped-highlight: even
     );
diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less
index 80b1c85ceb46e..51ba451681df5 100644
--- a/lib/web/css/source/components/_modals.less
+++ b/lib/web/css/source/components/_modals.less
@@ -100,6 +100,12 @@
     left: 0;
     overflow-y: auto;
 
+    &.confirm {
+        .modal-inner-wrap {
+            .lib-css(width, @modal-popup-confirm__width);
+        }
+    }
+
     &._show {
         .modal-inner-wrap {
             -webkit-transform: translateY(0);
diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less
index b2ed4352a334a..acae3c629500e 100644
--- a/lib/web/css/source/lib/_navigation.less
+++ b/lib/web/css/source/lib/_navigation.less
@@ -92,6 +92,9 @@
                 .lib-css(padding, @_nav-level0-item-padding);
                 .lib-css(text-transform, @_nav-level0-text-transform);
                 word-wrap: break-word;
+                &:hover {
+                    .lib-css(color, @navigation-level0-item__hover__color);
+                }
             }
 
             &.active {
@@ -139,6 +142,11 @@
         .submenu {
             > li {
                 word-wrap: break-word;
+                > a {
+                    &:hover {
+                        .lib-css(color, @navigation-level0-item__hover__color);
+                    }
+                }
             }
 
             &:not(:first-child) {
@@ -178,6 +186,9 @@
                             .lib-css(text-decoration, @_submenu-item-text-decoration);
                             display: block;
                             line-height: normal;
+                            &:hover {
+                                .lib-css(color, @navigation-level0-item__hover__color);
+                            }
                         }
                     }
                 }
diff --git a/lib/web/css/source/lib/_resets.less b/lib/web/css/source/lib/_resets.less
index 36c7e6bf4ded3..8228a07ef92ab 100644
--- a/lib/web/css/source/lib/_resets.less
+++ b/lib/web/css/source/lib/_resets.less
@@ -185,7 +185,7 @@
 
     mark {
         background: #ff0;
-        color: #000;
+        color: @color-black;
     }
 
     small {
@@ -465,13 +465,13 @@
 
     ins {
         background-color: #ff9;
-        color: #000;
+        color: @color-black;
         text-decoration: none;
     }
 
     mark {
         background-color: #ff9;
-        color: #000;
+        color: @color-black;
         font-style: italic;
         font-weight: bold;
     }
diff --git a/lib/web/css/source/lib/variables/_navigation.less b/lib/web/css/source/lib/variables/_navigation.less
index 8cffee7f8e71a..2a4aa11014dce 100644
--- a/lib/web/css/source/lib/variables/_navigation.less
+++ b/lib/web/css/source/lib/variables/_navigation.less
@@ -28,6 +28,7 @@
 @navigation-level0-item__active__border-width: 0 0 0 8px;
 @navigation-level0-item__active__color: '';
 @navigation-level0-item__active__text-decoration: '';
+@navigation-level0-item__hover__color: @primary__color;
 
 @submenu__background: '';
 @submenu__border: '';
diff --git a/lib/web/extjs/ext-tree.js b/lib/web/extjs/ext-tree.js
index 35b41260569c2..362e928c541c9 100644
--- a/lib/web/extjs/ext-tree.js
+++ b/lib/web/extjs/ext-tree.js
@@ -10,7 +10,7 @@ Ext={};window["undefined"]=window["undefined"];Ext.apply=function(o,c,_3){if(_3)
 
 
 
-(function(){var _1;Ext.lib.Dom={getViewWidth:function(_2){return _2?this.getDocumentWidth():this.getViewportWidth();},getViewHeight:function(_3){return _3?this.getDocumentHeight():this.getViewportHeight();},getDocumentHeight:function(){var _4=(document.compatMode!="CSS1Compat")?document.body.scrollHeight:document.documentElement.scrollHeight;return Math.max(_4,this.getViewportHeight());},getDocumentWidth:function(){var _5=(document.compatMode!="CSS1Compat")?document.body.scrollWidth:document.documentElement.scrollWidth;return Math.max(_5,this.getViewportWidth());},getViewportHeight:function(){var _6=self.innerHeight;var _7=document.compatMode;if((_7||Ext.isIE)&&!Ext.isOpera){_6=(_7=="CSS1Compat")?document.documentElement.clientHeight:document.body.clientHeight;}return _6;},getViewportWidth:function(){var _8=self.innerWidth;var _9=document.compatMode;if(_9||Ext.isIE){_8=(_9=="CSS1Compat")?document.documentElement.clientWidth:document.body.clientWidth;}return _8;},isAncestor:function(p,c){p=Ext.getDom(p);c=Ext.getDom(c);if(!p||!c){return false;}if(p.contains&&!Ext.isSafari){return p.contains(c);}else{if(p.compareDocumentPosition){return !!(p.compareDocumentPosition(c)&16);}else{var _c=c.parentNode;while(_c){if(_c==p){return true;}else{if(!_c.tagName||_c.tagName.toUpperCase()=="HTML"){return false;}}_c=_c.parentNode;}return false;}}},getRegion:function(el){return Ext.lib.Region.getRegion(el);},getY:function(el){return this.getXY(el)[1];},getX:function(el){return this.getXY(el)[0];},getXY:function(el){var p,pe,b,_14,bd=document.body;el=Ext.getDom(el);if(el.getBoundingClientRect){b=el.getBoundingClientRect();_14=fly(document).getScroll();return [b.left+_14.left,b.top+_14.top];}else{var x=el.offsetLeft,y=el.offsetTop;p=el.offsetParent;var _18=false;if(p!=el){while(p){x+=p.offsetLeft;y+=p.offsetTop;if(Ext.isSafari&&!_18&&fly(p).getStyle("position")=="absolute"){_18=true;}if(Ext.isGecko){pe=fly(p);var bt=parseInt(pe.getStyle("borderTopWidth"),10)||0;var bl=parseInt(pe.getStyle("borderLeftWidth"),10)||0;x+=bl;y+=bt;if(p!=el&&pe.getStyle("overflow")!="visible"){x+=bl;y+=bt;}}p=p.offsetParent;}}if(Ext.isSafari&&(_18||fly(el).getStyle("position")=="absolute")){x-=bd.offsetLeft;y-=bd.offsetTop;}}p=el.parentNode;while(p&&p!=bd){if(!Ext.isOpera||(Ext.isOpera&&p.tagName!="TR"&&fly(p).getStyle("display")!="inline")){x-=p.scrollLeft;y-=p.scrollTop;}p=p.parentNode;}return [x,y];},setXY:function(el,xy){el=Ext.fly(el,"_setXY");el.position();var pts=el.translatePoints(xy);if(xy[0]!==false){el.dom.style.left=pts.left+"px";}if(xy[1]!==false){el.dom.style.top=pts.top+"px";}},setX:function(el,x){this.setXY(el,[x,false]);},setY:function(el,y){this.setXY(el,[false,y]);}};Ext.lib.Event={getPageX:function(e){return Event.pointerX(e.browserEvent||e);},getPageY:function(e){return Event.pointerY(e.browserEvent||e);},getXY:function(e){e=e.browserEvent||e;return [Event.pointerX(e),Event.pointerY(e)];},getTarget:function(e){return Event.element(e.browserEvent||e);},resolveTextNode:function(_26){if(_26&&3==_26.nodeType){return _26.parentNode;}else{return _26;}},getRelatedTarget:function(ev){ev=ev.browserEvent||ev;var t=ev.relatedTarget;if(!t){if(ev.type=="mouseout"){t=ev.toElement;}else{if(ev.type=="mouseover"){t=ev.fromElement;}}}return this.resolveTextNode(t);},on:function(el,_2a,fn){Event.observe(el,_2a,fn,false);},un:function(el,_2d,fn){Event.stopObserving(el,_2d,fn,false);},purgeElement:function(el){},preventDefault:function(e){e=e.browserEvent||e;if(e.preventDefault){e.preventDefault();}else{e.returnValue=false;}},stopPropagation:function(e){e=e.browserEvent||e;if(e.stopPropagation){e.stopPropagation();}else{e.cancelBubble=true;}},stopEvent:function(e){Event.stop(e.browserEvent||e);},onAvailable:function(el,fn,_35,_36){var _37=new Date(),iid;var f=function(){if(_37.getElapsed()>10000){clearInterval(iid);}var el=document.getElementById(id);if(el){clearInterval(iid);fn.call(_35||window,el);}};iid=setInterval(f,50);}};Ext.lib.Ajax=function(){var _3b=function(cb){return cb.success?function(xhr){cb.success.call(cb.scope||window,{responseText:xhr.responseText,responseXML:xhr.responseXML,argument:cb.argument});}:Ext.emptyFn;};var _3e=function(cb){return cb.failure?function(xhr){cb.failure.call(cb.scope||window,{responseText:xhr.responseText,responseXML:xhr.responseXML,argument:cb.argument});}:Ext.emptyFn;};return {request:function(_41,uri,cb,_44){new Ajax.Request(uri,{method:_41,parameters:_44||"",timeout:cb.timeout,onSuccess:_3b(cb),onFailure:_3e(cb)});},formRequest:function(_45,uri,cb,_48,_49,_4a){new Ajax.Request(uri,{method:Ext.getDom(_45).method||"POST",parameters:Form.serialize(_45)+(_48?"&"+_48:""),timeout:cb.timeout,onSuccess:_3b(cb),onFailure:_3e(cb)});},isCallInProgress:function(_4b){return false;},abort:function(_4c){return false;},serializeForm:function(_4d){return Form.serialize(_4d.dom||_4d,true);}};}();Ext.lib.Anim=function(){var _4e={easeOut:function(pos){return 1-Math.pow(1-pos,2);},easeIn:function(pos){return 1-Math.pow(1-pos,2);}};var _51=function(cb,_53){return {stop:function(_54){this.effect.cancel();},isAnimated:function(){return this.effect.state=="running";},proxyCallback:function(){Ext.callback(cb,_53);}};};return {scroll:function(el,_56,_57,_58,cb,_5a){var _5b=_51(cb,_5a);el=Ext.getDom(el);el.scrollLeft=_56.to[0];el.scrollTop=_56.to[1];_5b.proxyCallback();return _5b;},motion:function(el,_5d,_5e,_5f,cb,_61){return this.run(el,_5d,_5e,_5f,cb,_61);},color:function(el,_63,_64,_65,cb,_67){return this.run(el,_63,_64,_65,cb,_67);},run:function(el,_69,_6a,_6b,cb,_6d,_6e){var o={};for(var k in _69){switch(k){case "points":var by,pts,e=Ext.fly(el,"_animrun");e.position();if(by=_69.points.by){var xy=e.getXY();pts=e.translatePoints([xy[0]+by[0],xy[1]+by[1]]);}else{pts=e.translatePoints(_69.points.to);}o.left=pts.left+"px";o.top=pts.top+"px";break;case "width":o.width=_69.width.to+"px";break;case "height":o.height=_69.height.to+"px";break;case "opacity":o.opacity=String(_69.opacity.to);break;default:o[k]=String(_69[k].to);break;}}var _75=_51(cb,_6d);_75.effect=new Effect.Morph(Ext.id(el),{duration:_6a,afterFinish:_75.proxyCallback,transition:_4e[_6b]||Effect.Transitions.linear,style:o});return _75;}};}();function fly(el){if(!_1){_1=new Ext.Element.Flyweight();}_1.dom=el;return _1;}Ext.lib.Region=function(t,r,b,l){this.top=t;this[1]=t;this.right=r;this.bottom=b;this.left=l;this[0]=l;};Ext.lib.Region.prototype={contains:function(_7b){return (_7b.left>=this.left&&_7b.right<=this.right&&_7b.top>=this.top&&_7b.bottom<=this.bottom);},getArea:function(){return ((this.bottom-this.top)*(this.right-this.left));},intersect:function(_7c){var t=Math.max(this.top,_7c.top);var r=Math.min(this.right,_7c.right);var b=Math.min(this.bottom,_7c.bottom);var l=Math.max(this.left,_7c.left);if(b>=t&&r>=l){return new Ext.lib.Region(t,r,b,l);}else{return null;}},union:function(_81){var t=Math.min(this.top,_81.top);var r=Math.max(this.right,_81.right);var b=Math.max(this.bottom,_81.bottom);var l=Math.min(this.left,_81.left);return new Ext.lib.Region(t,r,b,l);},adjust:function(t,l,b,r){this.top+=t;this.left+=l;this.right+=r;this.bottom+=b;return this;}};Ext.lib.Region.getRegion=function(el){var p=Ext.lib.Dom.getXY(el);var t=p[1];var r=p[0]+el.offsetWidth;var b=p[1]+el.offsetHeight;var l=p[0];return new Ext.lib.Region(t,r,b,l);};Ext.lib.Point=function(x,y){if(x instanceof Array){y=x[1];x=x[0];}this.x=this.right=this.left=this[0]=x;this.y=this.top=this.bottom=this[1]=y;};Ext.lib.Point.prototype=new Ext.lib.Region();if(Ext.isIE){Event.observe(window,"unload",function(){var p=Function.prototype;delete p.createSequence;delete p.defer;delete p.createDelegate;delete p.createCallback;delete p.createInterceptor;});}})();
+(function(){var _1;Ext.lib.Dom={getViewWidth:function(_2){return _2?this.getDocumentWidth():this.getViewportWidth();},getViewHeight:function(_3){return _3?this.getDocumentHeight():this.getViewportHeight();},getDocumentHeight:function(){var _4=(document.compatMode!="CSS1Compat")?document.body.scrollHeight:document.documentElement.scrollHeight;return Math.max(_4,this.getViewportHeight());},getDocumentWidth:function(){var _5=(document.compatMode!="CSS1Compat")?document.body.scrollWidth:document.documentElement.scrollWidth;return Math.max(_5,this.getViewportWidth());},getViewportHeight:function(){var _6=self.innerHeight;var _7=document.compatMode;if((_7||Ext.isIE)&&!Ext.isOpera){_6=(_7=="CSS1Compat")?document.documentElement.clientHeight:document.body.clientHeight;}return _6;},getViewportWidth:function(){var _8=self.innerWidth;var _9=document.compatMode;if(_9||Ext.isIE){_8=(_9=="CSS1Compat")?document.documentElement.clientWidth:document.body.clientWidth;}return _8;},isAncestor:function(p,c){p=Ext.getDom(p);c=Ext.getDom(c);if(!p||!c){return false;}if(p.contains&&!Ext.isSafari){return p.contains(c);}else{if(p.compareDocumentPosition){return !!(p.compareDocumentPosition(c)&16);}else{var _c=c.parentNode;while(_c){if(_c==p){return true;}else{if(!_c.tagName||_c.tagName.toUpperCase()=="HTML"){return false;}}_c=_c.parentNode;}return false;}}},getRegion:function(el){return Ext.lib.Region.getRegion(el);},getY:function(el){return this.getXY(el)[1];},getX:function(el){return this.getXY(el)[0];},getXY:function(el){var p,pe,b,_14,bd=document.body;el=Ext.getDom(el);if(el.getBoundingClientRect){b=el.getBoundingClientRect();_14=fly(document).getScroll();return [b.left+_14.left,b.top+_14.top];}else{var x=el.offsetLeft,y=el.offsetTop;p=el.offsetParent;var _18=false;if(p!=el){while(p){x+=p.offsetLeft;y+=p.offsetTop;if(Ext.isSafari&&!_18&&fly(p).getStyle("position")=="absolute"){_18=true;}if(Ext.isGecko){pe=fly(p);var bt=parseInt(pe.getStyle("borderTopWidth"),10)||0;var bl=parseInt(pe.getStyle("borderLeftWidth"),10)||0;x+=bl;y+=bt;if(p!=el&&pe.getStyle("overflow")!="visible"){x+=bl;y+=bt;}}p=p.offsetParent;}}if(Ext.isSafari&&(_18||fly(el).getStyle("position")=="absolute")){x-=bd.offsetLeft;y-=bd.offsetTop;}}p=el.parentNode;while(p&&p!=bd){if(!Ext.isOpera||(Ext.isOpera&&p.tagName!="TR"&&fly(p).getStyle("display")!="inline")){x-=p.scrollLeft;y-=p.scrollTop;}p=p.parentNode;}return [x,y];},setXY:function(el,xy){el=Ext.fly(el,"_setXY");el.position();var pts=el.translatePoints(xy);if(xy[0]!==false){el.dom.style.left=pts.left+"px";}if(xy[1]!==false){el.dom.style.top=pts.top+"px";}},setX:function(el,x){this.setXY(el,[x,false]);},setY:function(el,y){this.setXY(el,[false,y]);}};Ext.lib.Event={getPageX:function(e){return Event.pointerX(e.browserEvent||e);},getPageY:function(e){return Event.pointerY(e.browserEvent||e);},getXY:function(e){e=e.browserEvent||e;return [Event.pointerX(e),Event.pointerY(e)];},getTarget:function(e){return Event.element(e.browserEvent||e);},resolveTextNode:function(_26){if(_26&&3==_26.nodeType){return _26.parentNode;}else{return _26;}},getRelatedTarget:function(ev){ev=ev.browserEvent||ev;var t=ev.relatedTarget;if(!t){if(ev.type=="mouseout"){t=ev.toElement;}else{if(ev.type=="mouseover"){t=ev.fromElement;}}}return this.resolveTextNode(t);},on:function(el,_2a,fn){Event.observe(el,_2a,fn,false);},un:function(el,_2d,fn){Event.stopObserving(el,_2d,fn,false);},purgeElement:function(el){},preventDefault:function(e){e=e.browserEvent||e;if(e.preventDefault){e.preventDefault();}else{e.returnValue=false;}},stopPropagation:function(e){e=e.browserEvent||e;if(e.stopPropagation){e.stopPropagation();}else{e.cancelBubble=true;}},stopEvent:function(e){Event.stop(e.browserEvent||e);},onAvailable:function(el,fn,_35,_36){var _37=new Date(),iid;var f=function(){if(_37.getElapsed()>10000){clearInterval(iid);}var el=document.getElementById(id);if(el){clearInterval(iid);fn.call(_35||window,el);}};iid=setInterval(f,50);}};Ext.lib.Ajax=function(){var _3b=function(cb){return cb.success?function(xhr){cb.success.call(cb.scope||window,{responseText:xhr.responseText,responseXML:xhr.responseXML,argument:cb.argument});}:Ext.emptyFn;};var _3e=function(cb){return cb.failure?function(xhr){cb.failure.call(cb.scope||window,{responseText:xhr.responseText,responseXML:xhr.responseXML,argument:cb.argument});}:Ext.emptyFn;};return {request:function(_41,uri,cb,_44){new Ajax.Request(uri,{method:_41,parameters:_44||"",timeout:cb.timeout,onSuccess:_3b(cb),onFailure:_3e(cb)});},formRequest:function(_45,uri,cb,_48,_49,_4a){new Ajax.Request(uri,{method:Ext.getDom(_45).method||"POST",parameters:Form.serialize(_45)+(_48?"&"+_48:""),timeout:cb.timeout,onSuccess:_3b(cb),onFailure:_3e(cb)});},isCallInProgress:function(_4b){return false;},abort:function(_4c){return false;},serializeForm:function(_4d){return Form.serialize(_4d.dom||_4d,true);}};}();Ext.lib.Anim=function(){var _4e={easeOut:function(pos){return 1-Math.pow(1-pos,2);},easeIn:function(pos){return 1-Math.pow(1-pos,2);}};var _51=function(cb,_53){return {stop:function(_54){this.effect.cancel();},isAnimated:function(){return this.effect.state=="running";},proxyCallback:function(){Ext.callback(cb,_53);}};};return {scroll:function(el,_56,_57,_58,cb,_5a){var _5b=_51(cb,_5a);el=Ext.getDom(el);el.scrollLeft=_56.scroll.to[0];el.scrollTop=_56.scroll.to[1];_5b.proxyCallback();return _5b;},motion:function(el,_5d,_5e,_5f,cb,_61){return this.run(el,_5d,_5e,_5f,cb,_61);},color:function(el,_63,_64,_65,cb,_67){return this.run(el,_63,_64,_65,cb,_67);},run:function(el,_69,_6a,_6b,cb,_6d,_6e){var o={};for(var k in _69){switch(k){case "points":var by,pts,e=Ext.fly(el,"_animrun");e.position();if(by=_69.points.by){var xy=e.getXY();pts=e.translatePoints([xy[0]+by[0],xy[1]+by[1]]);}else{pts=e.translatePoints(_69.points.to);}o.left=pts.left+"px";o.top=pts.top+"px";break;case "width":o.width=_69.width.to+"px";break;case "height":o.height=_69.height.to+"px";break;case "opacity":o.opacity=String(_69.opacity.to);break;default:o[k]=String(_69[k].to);break;}}var _75=_51(cb,_6d);_75.effect=new Effect.Morph(Ext.id(el),{duration:_6a,afterFinish:_75.proxyCallback,transition:_4e[_6b]||Effect.Transitions.linear,style:o});return _75;}};}();function fly(el){if(!_1){_1=new Ext.Element.Flyweight();}_1.dom=el;return _1;}Ext.lib.Region=function(t,r,b,l){this.top=t;this[1]=t;this.right=r;this.bottom=b;this.left=l;this[0]=l;};Ext.lib.Region.prototype={contains:function(_7b){return (_7b.left>=this.left&&_7b.right<=this.right&&_7b.top>=this.top&&_7b.bottom<=this.bottom);},getArea:function(){return ((this.bottom-this.top)*(this.right-this.left));},intersect:function(_7c){var t=Math.max(this.top,_7c.top);var r=Math.min(this.right,_7c.right);var b=Math.min(this.bottom,_7c.bottom);var l=Math.max(this.left,_7c.left);if(b>=t&&r>=l){return new Ext.lib.Region(t,r,b,l);}else{return null;}},union:function(_81){var t=Math.min(this.top,_81.top);var r=Math.max(this.right,_81.right);var b=Math.max(this.bottom,_81.bottom);var l=Math.min(this.left,_81.left);return new Ext.lib.Region(t,r,b,l);},adjust:function(t,l,b,r){this.top+=t;this.left+=l;this.right+=r;this.bottom+=b;return this;}};Ext.lib.Region.getRegion=function(el){var p=Ext.lib.Dom.getXY(el);var t=p[1];var r=p[0]+el.offsetWidth;var b=p[1]+el.offsetHeight;var l=p[0];return new Ext.lib.Region(t,r,b,l);};Ext.lib.Point=function(x,y){if(x instanceof Array){y=x[1];x=x[0];}this.x=this.right=this.left=this[0]=x;this.y=this.top=this.bottom=this[1]=y;};Ext.lib.Point.prototype=new Ext.lib.Region();if(Ext.isIE){Event.observe(window,"unload",function(){var p=Function.prototype;delete p.createSequence;delete p.defer;delete p.createDelegate;delete p.createCallback;delete p.createInterceptor;});}})();
 
 
 
diff --git a/lib/web/mage/common.js b/lib/web/mage/common.js
index a333277d9e3cd..4742c77ea8627 100644
--- a/lib/web/mage/common.js
+++ b/lib/web/mage/common.js
@@ -11,4 +11,24 @@ define([
 
     /* Form with auto submit feature */
     $('form[data-auto-submit="true"]').submit();
+
+    //Add form keys.
+    $(document).on(
+        'submit',
+        'form',
+        function (e) {
+            var formKeyElement,
+                form = $(e.target),
+                formKey = $('input[name="form_key"]').val();
+
+            if (formKey && !form.find('input[name="form_key"]').length) {
+                formKeyElement = document.createElement('input');
+                formKeyElement.setAttribute('type', 'hidden');
+                formKeyElement.setAttribute('name', 'form_key');
+                formKeyElement.setAttribute('value', formKey);
+                formKeyElement.setAttribute('auto-added-form-key', '1');
+                form.get(0).appendChild(formKeyElement);
+            }
+        }
+    );
 });
diff --git a/lib/web/mage/gallery/gallery.less b/lib/web/mage/gallery/gallery.less
index 24a5a2b4033d3..8f4dd78979018 100644
--- a/lib/web/mage/gallery/gallery.less
+++ b/lib/web/mage/gallery/gallery.less
@@ -736,24 +736,30 @@
     text-align: center;
     top: 0;
     z-index: @z-index-10;
+    overflow: hidden;
+
+    .magnifier-large {
+        width: auto;
+        height: auto;
+        max-height: none;
+        max-width: none;
+        border: none;
+        position: absolute;
+        z-index: @z-index-1;
+    }
 }
 
 .magnifier-loader-text {
     margin-top: 10px;
 }
 
-.magnifier-large {
-    position: absolute;
-    width: 32%;
-    z-index: @z-index-1;
-}
-
 .magnifier-preview {
     bottom: 0;
     left: 58%;
     overflow: hidden;
     padding: 0;
     position: absolute;
+    z-index: 2;
     top: 215px;
     &:not(.hidden) {
         background-color: @color-white;
diff --git a/lib/web/mage/requirejs/static.js b/lib/web/mage/requirejs/static.js
index 237aa0c6a8a63..898850cb2948b 100644
--- a/lib/web/mage/requirejs/static.js
+++ b/lib/web/mage/requirejs/static.js
@@ -13,7 +13,7 @@ define('buildTools', [
         isEnabled: storage.getItem(storeName) === null,
 
         /**
-         * Removes base url from the the provided string
+         * Removes base url from the provided string
          *
          * @param {String} url - Url to be processed.
          * @param {Object} config - RequiereJs config object.
diff --git a/lib/web/mage/utils/objects.js b/lib/web/mage/utils/objects.js
index d0b77aa4320e3..bd0e496339ace 100644
--- a/lib/web/mage/utils/objects.js
+++ b/lib/web/mage/utils/objects.js
@@ -83,7 +83,7 @@ define([
      * @private
      *
      * @param {Object} parent - Object from which to remove property.
-     * @param {Array} path - Splitted path to the propery.
+     * @param {Array} path - Splitted path to the property.
      */
     function removeNested(parent, path) {
         var field = path.pop();
diff --git a/lib/web/mage/utils/wrapper.js b/lib/web/mage/utils/wrapper.js
index c90d1a026b147..9d4bb045b5722 100644
--- a/lib/web/mage/utils/wrapper.js
+++ b/lib/web/mage/utils/wrapper.js
@@ -45,7 +45,7 @@ define([
     return {
 
         /**
-         * Wraps target function with a specified wrapper, which will recieve
+         * Wraps target function with a specified wrapper, which will receive
          * reference to the original function as a first argument.
          *
          * @param {Function} target - Function to be wrapped.
diff --git a/lib/web/mage/validation/url.js b/lib/web/mage/validation/url.js
index 67e0e989d248e..00ac3fd4eb15d 100644
--- a/lib/web/mage/validation/url.js
+++ b/lib/web/mage/validation/url.js
@@ -42,7 +42,7 @@ define([], function () {
         /**
          * Sanitize url, replacing disallowed chars
          *
-         * @param {Sring} path - url to be normalized
+         * @param {String} path - url to be normalized
          * @returns {String}
          */
         sanitize: function (path) {
diff --git a/lib/web/magnifier/magnifier.js b/lib/web/magnifier/magnifier.js
index c475364368922..150c8adf0b22b 100644
--- a/lib/web/magnifier/magnifier.js
+++ b/lib/web/magnifier/magnifier.js
@@ -9,101 +9,100 @@
 
         var magnify = new Magnify($(this), options);
 
-        /*events must be tracked here*/
+        /* events must be tracked here */
 
         /**
          * Return that from _init function
          *
          */
         return magnify;
-
     };
 
     function Magnify(element, options) {
-        var gOptions = options || {},
+        var customUserOptions = options || {},
             $box = $(element),
             $thumb,
             that = this,
-            largeWrapper = options.largeWrapper ||  '.magnifier-preview',
-            $largeWrapper = $(largeWrapper);
+            largeWrapper = options.largeWrapper || '.magnifier-preview',
+            $magnifierPreview = $(largeWrapper);
 
         curThumb = null,
-            currentOpts = {
-                x: 0,
-                y: 0,
-                w: 0,
-                h: 0,
-                lensW: 0,
-                lensH: 0,
-                lensBgX: 0,
-                lensBgY: 0,
-                largeW: 0,
-                largeH: 0,
-                largeL: 0,
-                largeT: 0,
-                zoom: 2,
-                zoomMin: 1.1,
-                zoomMax: 5,
-                mode: 'outside',
-                eventType: 'click',
-                status: 0,
-                zoomAttached: false,
-                zoomable: gOptions.zoomable !== undefined ?
-                    gOptions.zoomable
-                    : false,
-                onthumbenter: gOptions.onthumbenter !== undefined ?
-                    gOptions.onthumbenter
-                    : null,
-                onthumbmove: gOptions.onthumbmove !== undefined ?
-                    gOptions.onthumbmove
-                    : null,
-                onthumbleave: gOptions.onthumbleave !== undefined ?
-                    gOptions.onthumbleave
-                    : null,
-                onzoom: gOptions.onzoom !== undefined ?
-                    gOptions.onzoom
-                    : null
-            },
-            pos = {
-                t: 0,
-                l: 0,
-                x: 0,
-                y: 0
-            },
-            gId = 0,
-            status = 0,
-            curIdx = '',
-            curLens = null,
-            curLarge = null,
-            lensbg = gOptions.bg !== undefined ? gOptions.lensbg : true,
-            gZoom = gOptions.zoom !== undefined ?
-                gOptions.zoom
-                : currentOpts.zoom,
-            gZoomMin = gOptions.zoomMin !== undefined ?
-                gOptions.zoomMin
-                : currentOpts.zoomMin,
-            gZoomMax = gOptions.zoomMax !== undefined ?
-                gOptions.zoomMax
-                : currentOpts.zoomMax,
-            gMode = gOptions.mode || currentOpts.mode,
-            gEventType = gOptions.eventType || currentOpts.eventType,
-            data = {},
-            inBounds = false,
-            isOverThumb = false,
-            rate = 1,
-            paddingX = 0,
-            paddingY = 0,
-            enabled = true,
-            showWrapper = true;
+        magnifierOptions = {
+            x: 0,
+            y: 0,
+            w: 0,
+            h: 0,
+            lensW: 0,
+            lensH: 0,
+            lensBgX: 0,
+            lensBgY: 0,
+            largeW: 0,
+            largeH: 0,
+            largeL: 0,
+            largeT: 0,
+            zoom: 2,
+            zoomMin: 1.1,
+            zoomMax: 5,
+            mode: 'outside',
+            eventType: 'click',
+            status: 0,
+            zoomAttached: false,
+            zoomable: customUserOptions.zoomable !== undefined ?
+                customUserOptions.zoomable
+                : false,
+            onthumbenter: customUserOptions.onthumbenter !== undefined ?
+                customUserOptions.onthumbenter
+                : null,
+            onthumbmove: customUserOptions.onthumbmove !== undefined ?
+                customUserOptions.onthumbmove
+                : null,
+            onthumbleave: customUserOptions.onthumbleave !== undefined ?
+                customUserOptions.onthumbleave
+                : null,
+            onzoom: customUserOptions.onzoom !== undefined ?
+                customUserOptions.onzoom
+                : null
+        },
+        pos = {
+            t: 0,
+            l: 0,
+            x: 0,
+            y: 0
+        },
+        gId = 0,
+        status = 0,
+        curIdx = '',
+        curLens = null,
+        curLarge = null,
+        lensbg = customUserOptions.bg !== undefined ?
+            customUserOptions.lensbg
+            : true,
+        gZoom = customUserOptions.zoom !== undefined ?
+            customUserOptions.zoom
+            : magnifierOptions.zoom,
+        gZoomMin = customUserOptions.zoomMin !== undefined ?
+            customUserOptions.zoomMin
+            : magnifierOptions.zoomMin,
+        gZoomMax = customUserOptions.zoomMax !== undefined ?
+            customUserOptions.zoomMax
+            : magnifierOptions.zoomMax,
+        gMode = customUserOptions.mode || magnifierOptions.mode,
+        gEventType = customUserOptions.eventType || magnifierOptions.eventType,
+        data = {},
+        inBounds = false,
+        isOverThumb = false,
+        rate = 1,
+        paddingX = 0,
+        paddingY = 0,
+        enabled = true,
+        showWrapper = true;
 
         var MagnifyCls = {
             magnifyHidden: 'magnify-hidden',
             magnifyOpaque: 'magnify-opaque',
             magnifyFull: 'magnify-fullimage'
-
         };
 
-
         /**
          * Update Lens positon on.
          *
@@ -143,105 +142,104 @@
             $(thumb).parent().append(lens);
         }
 
-        function updateLensOnLoad(idx, thumb, large, largeWrapper) {
-            var lens = $box.find('.magnify-lens'),
+        function updateLensOnLoad(idSelectorMainImg, thumb, largeImgInMagnifyLens, largeWrapper) {
+            var magnifyLensElement= $box.find('.magnify-lens'),
                 textWrapper;
 
-            if (data[idx].status === 1) {
+            if (data[idSelectorMainImg].status === 1) {
                 textWrapper = $('<div class="magnifier-loader-text"></div>');
-                lens.className = 'magnifier-loader magnify-hidden';
+                magnifyLensElement.className = 'magnifier-loader magnify-hidden';
                 textWrapper.html('Loading...');
-                lens.html('').append(textWrapper);
-            } else if (data[idx].status === 2) {
-                lens.addClass(MagnifyCls.magnifyHidden);
-                lens.html('');
-                large.id = idx + '-large';
-                large.style.width = data[idx].largeW * rate + 'px';
-                large.style.height = data[idx].largeH + 'px';
-                large.className = 'magnifier-large magnify-hidden';
-
-                if (data[idx].mode === 'inside') {
-                    lens.append(large);
+                magnifyLensElement.html('').append(textWrapper);
+            } else if (data[idSelectorMainImg].status === 2) {
+                magnifyLensElement.addClass(MagnifyCls.magnifyHidden);
+                magnifyLensElement.html('');
+
+                largeImgInMagnifyLens.id = idSelectorMainImg + '-large';
+                largeImgInMagnifyLens.style.width = data[idSelectorMainImg].largeImgInMagnifyLensWidth + 'px';
+                largeImgInMagnifyLens.style.height = data[idSelectorMainImg].largeImgInMagnifyLensHeight + 'px';
+                largeImgInMagnifyLens.className = 'magnifier-large magnify-hidden';
+
+                if (data[idSelectorMainImg].mode === 'inside') {
+                    magnifyLensElement.append(largeImgInMagnifyLens);
                 } else {
-                    largeWrapper.html('').append(large);
+                    largeWrapper.html('').append(largeImgInMagnifyLens);
                 }
             }
 
-            data[idx].lensH = data[idx].lensH > $thumb.height() ? $thumb.height() : data[idx].lensH;
+            data[idSelectorMainImg].lensH = data[idSelectorMainImg].lensH > $thumb.height() ? $thumb.height() : data[idSelectorMainImg].lensH;
 
-            if (Math.round(data[idx].lensW) === 0) {
-                lens.css('display', 'none');
+            if (Math.round(data[idSelectorMainImg].lensW) === 0) {
+                magnifyLensElement.css('display', 'none');
             } else {
-                lens.css({
-                    width: data[idx].lensW + 1 + 'px',
-                    height: data[idx].lensH - 1 + 'px',
+                magnifyLensElement.css({
+                    width: Math.round(data[idSelectorMainImg].lensW) + 'px',
+                    height: Math.round(data[idSelectorMainImg].lensH) + 'px',
                     display: ''
                 });
             }
         }
 
         function getMousePos() {
-            var xPos = pos.x - currentOpts.x,
-                yPos = pos.y - currentOpts.y,
+            var xPos = pos.x - magnifierOptions.x,
+                yPos = pos.y - magnifierOptions.y,
                 t,
                 l;
 
-            inBounds =  xPos < 0 || yPos < 0 || xPos > currentOpts.w || yPos > currentOpts.h  ? false : true;
+            inBounds =  xPos < 0 || yPos < 0 || xPos > magnifierOptions.w || yPos > magnifierOptions.h  ? false : true;
 
-            l = xPos - currentOpts.lensW / 2;
-            t = yPos - currentOpts.lensH / 2;
+            l = xPos - magnifierOptions.lensW / 2;
+            t = yPos - magnifierOptions.lensH / 2;
 
-            if (currentOpts.mode !== 'inside') {
-                if (xPos < currentOpts.lensW / 2) {
-                    l = 0;
-                }
+            if (xPos < magnifierOptions.lensW / 2) {
+                l = 0;
+            }
 
-                if (yPos < currentOpts.lensH / 2) {
-                    t = 0;
-                }
+            if (yPos < magnifierOptions.lensH / 2) {
+                t = 0;
+            }
 
-                if (xPos - currentOpts.w + Math.ceil(currentOpts.lensW / 2) > 0) {
-                    l = currentOpts.w - Math.ceil(currentOpts.lensW + 2);
-                }
+            if (xPos - magnifierOptions.w + Math.ceil(magnifierOptions.lensW / 2) > 0) {
+                l = magnifierOptions.w - Math.ceil(magnifierOptions.lensW + 2);
+            }
 
-                if (yPos - currentOpts.h + Math.ceil(currentOpts.lensH / 2) > 0) {
-                    t = currentOpts.h - Math.ceil(currentOpts.lensH);
-                }
+            if (yPos - magnifierOptions.h + Math.ceil(magnifierOptions.lensH / 2) > 0) {
+                t = magnifierOptions.h - Math.ceil(magnifierOptions.lensH);
+            }
 
-                pos.l = l;
-                pos.t = t;
+            pos.l = l;
+            pos.t = t;
 
-                currentOpts.lensBgX = pos.l;
-                currentOpts.lensBgY = pos.t;
+            magnifierOptions.lensBgX = pos.l;
+            magnifierOptions.lensBgY = pos.t;
 
-                if (currentOpts.mode === 'inside') {
-                    currentOpts.largeL = xPos * (currentOpts.zoom - currentOpts.lensW / currentOpts.w);
-                    currentOpts.largeT = yPos * (currentOpts.zoom - currentOpts.lensH / currentOpts.h);
-                } else {
-                    currentOpts.largeL = currentOpts.lensBgX * currentOpts.zoom * (currentOpts.largeWrapperW / currentOpts.w) * rate;
-                    currentOpts.largeT = currentOpts.lensBgY * currentOpts.zoom * (currentOpts.largeWrapperH / currentOpts.h);
-                }
+            if (magnifierOptions.mode === 'inside') {
+                magnifierOptions.largeL = Math.round(xPos * (magnifierOptions.zoom - magnifierOptions.lensW / magnifierOptions.w));
+                magnifierOptions.largeT = Math.round(yPos * (magnifierOptions.zoom - magnifierOptions.lensH / magnifierOptions.h));
+            } else {
+                magnifierOptions.largeL = Math.round(magnifierOptions.lensBgX * magnifierOptions.zoom * (magnifierOptions.largeWrapperW / magnifierOptions.w));
+                magnifierOptions.largeT = Math.round(magnifierOptions.lensBgY * magnifierOptions.zoom * (magnifierOptions.largeWrapperH / magnifierOptions.h));
             }
         }
 
         function onThumbEnter() {
             if (_toBoolean(enabled)) {
-                currentOpts = data[curIdx];
+                magnifierOptions = data[curIdx];
                 curLens = $box.find('.magnify-lens');
 
-                if (currentOpts.status === 2) {
+                if (magnifierOptions.status === 2) {
                     curLens.removeClass(MagnifyCls.magnifyOpaque);
                     curLarge = $('#' + curIdx + '-large');
                     curLarge.removeClass(MagnifyCls.magnifyHidden);
-                } else if (currentOpts.status === 1) {
+                } else if (magnifierOptions.status === 1) {
                     curLens.className = 'magnifier-loader';
                 }
             }
         }
 
         function onThumbLeave() {
-            if (currentOpts.status > 0) {
-                var handler = currentOpts.onthumbleave;
+            if (magnifierOptions.status > 0) {
+                var handler = magnifierOptions.onthumbleave;
 
                 if (handler !== null) {
                     handler({
@@ -266,28 +264,30 @@
 
         function move() {
             if (_toBoolean(enabled)) {
-                if (status !== currentOpts.status) {
+                if (status !== magnifierOptions.status) {
                     onThumbEnter();
                 }
 
-                if (currentOpts.status > 0) {
-                    curThumb.className = currentOpts.thumbCssClass + ' magnify-opaque';
+                if (magnifierOptions.status > 0) {
+                    curThumb.className = magnifierOptions.thumbCssClass + ' magnify-opaque';
 
-                    if (currentOpts.status === 1) {
+                    if (magnifierOptions.status === 1) {
                         curLens.className = 'magnifier-loader';
-                    } else if (currentOpts.status === 2) {
+                    } else if (magnifierOptions.status === 2) {
                         curLens.removeClass(MagnifyCls.magnifyHidden);
                         curLarge.removeClass(MagnifyCls.magnifyHidden);
                         curLarge.css({
-                            left: '-' + currentOpts.largeL + 'px',
-                            top: '-' + currentOpts.largeT + 'px'
+                            left: '-' + magnifierOptions.largeL + 'px',
+                            top: '-' + magnifierOptions.largeT + 'px'
                         });
                     }
 
-                    pos.t = pos.t <= 0 ? 0 : pos.t;
+                    var borderOffset = 2; // Offset for magnify-lens border
+                    pos.t = pos.t <= 0 ? 0 : pos.t - borderOffset;
+
                     curLens.css({
                         left: pos.l + paddingX + 'px',
-                        top: pos.t + 1 + paddingY + 'px'
+                        top: pos.t + paddingY + 'px'
                     });
 
                     if (lensbg) {
@@ -296,10 +296,10 @@
                         });
                     } else {
                         curLens.get(0).style.backgroundPosition = '-' +
-                        currentOpts.lensBgX + 'px -' +
-                        currentOpts.lensBgY + 'px';
+                        magnifierOptions.lensBgX + 'px -' +
+                        magnifierOptions.lensBgY + 'px';
                     }
-                    var handler = currentOpts.onthumbmove;
+                    var handler = magnifierOptions.onthumbmove;
 
                     if (handler !== null) {
                         handler({
@@ -312,33 +312,33 @@
                     }
                 }
 
-                status = currentOpts.status;
+                status = magnifierOptions.status;
             }
         }
 
-        function setThumbData(thumb, thumbData) {
-            var thumbBounds = thumb.getBoundingClientRect(),
+        function setThumbData(mainImage, mainImageData) {
+            var thumbBounds = mainImage.getBoundingClientRect(),
                 w = 0,
                 h = 0;
 
-            thumbData.x = thumbBounds.left;
-            thumbData.y = thumbBounds.top;
-            thumbData.w = thumbBounds.right - thumbData.x;
-            thumbData.h = thumbBounds.bottom - thumbData.y;
+            mainImageData.x = Math.round(thumbBounds.left);
+            mainImageData.y = Math.round(thumbBounds.top);
+            mainImageData.w = Math.round(thumbBounds.right - mainImageData.x);
+            mainImageData.h = Math.round(thumbBounds.bottom - mainImageData.y);
 
-            if (thumbData.mode === 'inside') {
-                w = thumbData.w;
-                h = thumbData.h;
+            if (mainImageData.mode === 'inside') {
+                w = mainImageData.w;
+                h = mainImageData.h;
             } else {
-                w = thumbData.largeWrapperW;
-                h = thumbData.largeWrapperH;
+                w = mainImageData.largeWrapperW;
+                h = mainImageData.largeWrapperH;
             }
 
-            thumbData.largeW = thumbData.zoom * w;
-            thumbData.largeH = thumbData.zoom * h;
+            mainImageData.largeImgInMagnifyLensWidth = Math.round(mainImageData.zoom * w);
+            mainImageData.largeImgInMagnifyLensHeight = Math.round(mainImageData.zoom * h);
 
-            thumbData.lensW = thumbData.w / thumbData.zoom / rate;
-            thumbData.lensH = thumbData.h / thumbData.zoom;
+            mainImageData.lensW = Math.round(mainImageData.w / mainImageData.zoom);
+            mainImageData.lensH = Math.round(mainImageData.h / mainImageData.zoom);
         }
 
         function _init($box, options) {
@@ -360,11 +360,11 @@
 
                 if (_toBoolean(enabled)) {
 
-                    $largeWrapper.show().css('display', '');
-                    $largeWrapper.addClass(MagnifyCls.magnifyHidden);
+                    $magnifierPreview.show().css('display', '');
+                    $magnifierPreview.addClass(MagnifyCls.magnifyHidden);
                     set(opts);
                 } else {
-                    $largeWrapper.empty().hide();
+                    $magnifierPreview.empty().hide();
                 }
             }
 
@@ -376,7 +376,7 @@
 
                 if (showWrapper) {
 
-                    if (currentOpts.status !== 0) {
+                    if (magnifierOptions.status !== 0) {
                         onThumbLeave();
                     }
                     handleEvents(e);
@@ -390,7 +390,7 @@
 
                 if (showWrapper) {
                     if (!isOverThumb) {
-                        if (currentOpts.status !== 0) {
+                        if (magnifierOptions.status !== 0) {
                             onThumbLeave();
                         }
                         handleEvents(e);
@@ -420,7 +420,7 @@
 
             onThumbEnter(src);
 
-            setThumbData(curThumb, currentOpts);
+            setThumbData(curThumb, magnifierOptions);
 
             pos.x = e.clientX;
             pos.y = e.clientY;
@@ -428,7 +428,7 @@
             getMousePos();
             move();
 
-            var handler = currentOpts.onthumbenter;
+            var handler = magnifierOptions.onthumbenter;
 
             if (handler !== null) {
                 handler({
@@ -462,15 +462,15 @@
                 eventType = options.eventType || thumb.getAttribute('data-eventType') || gEventType,
                 onthumbenter = options.onthumbenter !== undefined ?
                     options.onthumbenter
-                    : currentOpts.onthumbenter,
+                    : magnifierOptions.onthumbenter,
                 onthumbleave = options.onthumbleave !== undefined ?
                     options.onthumbleave
-                    : currentOpts.onthumbleave,
+                    : magnifierOptions.onthumbleave,
                 onthumbmove = options.onthumbmove !== undefined ?
                     options.onthumbmove
-                    : currentOpts.onthumbmove;
+                    : magnifierOptions.onthumbmove;
 
-            largeUrl = $thumb.data('original') || gOptions.full || $thumb.attr('src');
+            largeUrl = $thumb.data('original') || customUserOptions.full || $thumb.attr('src');
 
             if (thumb.id === '') {
                 idx = thumb.id = 'magnifier-item-' + gId;
@@ -529,7 +529,6 @@
                 onthumbmove: onthumbmove
             };
 
-            rate = $thumb.width() / $thumb.height() / (data[idx].largeWrapperW / data[idx].largeWrapperH);
             paddingX = ($thumb.parent().width() - $thumb.width()) / 2;
             paddingY = ($thumb.parent().height() - $thumb.height()) / 2;
 
@@ -556,7 +555,6 @@
         }
 
         function onMousemove(e) {
-
             pos.x = e.clientX;
             pos.y = e.clientY;
 
@@ -567,29 +565,30 @@
             }
 
             if (inBounds && isOverThumb) {
-                $largeWrapper.removeClass(MagnifyCls.magnifyHidden);
+                if(gMode === 'outside'){
+                    $magnifierPreview.removeClass(MagnifyCls.magnifyHidden);
+                }
                 move();
             } else {
                 onThumbLeave();
                 isOverThumb = false;
-                $largeWrapper.addClass(MagnifyCls.magnifyHidden);
+                $magnifierPreview.addClass(MagnifyCls.magnifyHidden);
             }
         }
 
         function onScroll() {
 
             if (curThumb !== null) {
-                setThumbData(curThumb, currentOpts);
+                setThumbData(curThumb, magnifierOptions);
             }
         }
 
         $(window).on('scroll', onScroll);
         $(window).resize(function () {
-            _init($box, gOptions);
+            _init($box, customUserOptions);
         });
 
         $box.on('mousemove', onMousemove);
-        _init($box, gOptions);
-
+        _init($box, customUserOptions);
     }
 }(jQuery));
diff --git a/lib/web/modernizr/modernizr.js b/lib/web/modernizr/modernizr.js
index 0833cfb105cee..d7ddc86f63cae 100644
--- a/lib/web/modernizr/modernizr.js
+++ b/lib/web/modernizr/modernizr.js
@@ -1013,7 +1013,7 @@ window.Modernizr = (function( window, document, undefined ) {
         /** Name of the expando, to work with multiple documents or to re-shiv one document */
         var expando = '_html5shiv';
 
-        /** The id for the the documents expando */
+        /** The id for the documents expando */
         var expanID = 0;
 
         /** Cached data for each document */
diff --git a/lib/web/prototype/windows/README b/lib/web/prototype/windows/README
index e2cb960834593..44da88b6adec5 100644
--- a/lib/web/prototype/windows/README
+++ b/lib/web/prototype/windows/README
@@ -133,7 +133,7 @@ See samples/index.html for more details and go on my web page : http://prototype
             - Add Windows.focusedWindow and  Windows.closeAll
             - Add name to iframe in case of url window
             - Clean up code, use _ for private function (just name convention)
-            - Add Dialog.info function, usefull for for submit or notice info (in Rails)
+            - Add Dialog.info function, usefull for submit or notice info (in Rails)
             - Add minimize and maximize buttons
             - Add alert_lite.css without any images
             - Debug
diff --git a/nginx.conf.sample b/nginx.conf.sample
index 1e20a51a511d3..881adb84c56e3 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -3,7 +3,6 @@
 #    # use tcp connection
 #    # server  127.0.0.1:9000;
 #    # or socket
-#    server   unix:/var/run/php5-fpm.sock;
 #    server   unix:/var/run/php/php7.0-fpm.sock;
 # }
 # server {
diff --git a/setup/performance-toolkit/README.md b/setup/performance-toolkit/README.md
index 700f6cd0d775d..bb0a023ab8af1 100644
--- a/setup/performance-toolkit/README.md
+++ b/setup/performance-toolkit/README.md
@@ -116,7 +116,7 @@ To get more details about available JMeter options, read [Non-GUI Mode](http://j
 For example, you can run the B2C scenario via console with 90 threads for the Frontend Pool and 10 threads for the Admin Pool:
 
     cd {JMeter path}/bin/
-    jmeter -n -t {path to peformance toolkit}/benchmark.jmx -j ./jmeter.log -l ./jmeter-results.jtl -Jhost=magento2.dev -Jbase_path=/ -Jadmin_path=admin -JfrontendPoolUsers=90 -JadminPoolUsers=10
+    jmeter -n -t {path to performance toolkit}/benchmark.jmx -j ./jmeter.log -l ./jmeter-results.jtl -Jhost=magento2.dev -Jbase_path=/ -Jadmin_path=admin -JfrontendPoolUsers=90 -JadminPoolUsers=10
 
 As a result, you will get `jmeter.log` and `jmeter-results.jtl`. The`jmeter.log` contains information about the test run and can be helpful in determining the cause of an error.  The JTL file is a text file containing the results of a test run. It can be opened in the GUI mode to perform analysis of the results (see the *Output* section below).
 
diff --git a/setup/pub/angular/angular.js b/setup/pub/angular/angular.js
index f53b5280f8647..e3a85e3679ac6 100644
--- a/setup/pub/angular/angular.js
+++ b/setup/pub/angular/angular.js
@@ -7770,7 +7770,7 @@
                  *      caching.
                  *    - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
                  *      that should abort the request when resolved.
-                 *    - **withCredentials** - `{boolean}` - whether to to set the `withCredentials` flag on the
+                 *    - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
                  *      XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5
                  *      for more information.
                  *    - **responseType** - `{string}` - see
diff --git a/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
index 178102aa0b3b7..94337dd0742e3 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoBackupsListCommand.php
@@ -11,8 +11,10 @@
 use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\Setup\BackupRollback;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\TableFactory;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Command prints list of available backup files
@@ -33,16 +35,24 @@ class InfoBackupsListCommand extends Command
      */
     private $directoryList;
 
+    /**
+     * @var TableFactory
+     */
+    private $tableHelperFactory;
+
     /**
      * @param DirectoryList $directoryList
      * @param File $file
+     * @param TableFactory $tableHelperFactory
      */
     public function __construct(
         DirectoryList $directoryList,
-        File $file
+        File $file,
+        TableFactory $tableHelperFactory = null
     ) {
         $this->directoryList = $directoryList;
         $this->file = $file;
+        $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
         parent::__construct();
     }
 
@@ -90,14 +100,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
             }
             $output->writeln("<info>Showing backup files in $backupsDir.</info>");
-            /** @var \Symfony\Component\Console\Helper\Table $table */
-            $table = $this->getHelperSet()->get('table');
-            $table->setHeaders(['Backup Filename', 'Backup Type']);
+            /** @var \Symfony\Component\Console\Helper\Table $tableHelper */
+            $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+            $tableHelper->setHeaders(['Backup Filename', 'Backup Type']);
             asort($tempTable);
             foreach ($tempTable as $key => $value) {
-                $table->addRow([$key, $value]);
+                $tableHelper->addRow([$key, $value]);
             }
-            $table->render($output);
+            $tableHelper->render();
         } else {
             $output->writeln('<info>No backup files found.</info>');
         }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
index d673fc85c1ef1..91cfb5e7f6b5c 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoCurrencyListCommand.php
@@ -6,10 +6,12 @@
 
 namespace Magento\Setup\Console\Command;
 
+use Symfony\Component\Console\Helper\TableFactory;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Command\Command;
 use Magento\Framework\Setup\Lists;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Command prints list of available currencies
@@ -23,12 +25,19 @@ class InfoCurrencyListCommand extends Command
      */
     private $lists;
 
+    /**
+     * @var TableFactory
+     */
+    private $tableHelperFactory;
+
     /**
      * @param Lists $lists
+     * @param TableFactory $tableHelperFactory
      */
-    public function __construct(Lists $lists)
+    public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
     {
         $this->lists = $lists;
+        $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
         parent::__construct();
     }
 
@@ -48,14 +57,14 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $table = $this->getHelperSet()->get('table');
-        $table->setHeaders(['Currency', 'Code']);
+        $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+        $tableHelper->setHeaders(['Currency', 'Code']);
 
         foreach ($this->lists->getCurrencyList() as $key => $currency) {
-            $table->addRow([$currency, $key]);
+            $tableHelper->addRow([$currency, $key]);
         }
 
-        $table->render($output);
+        $tableHelper->render();
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
index 88d1bdd5601d5..8950bd5edb2fa 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
@@ -6,8 +6,10 @@
 
 namespace Magento\Setup\Console\Command;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Setup\Lists;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\TableFactory;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -23,12 +25,19 @@ class InfoLanguageListCommand extends Command
      */
     private $lists;
 
+    /**
+     * @var TableFactory
+     */
+    private $tableHelperFactory;
+
     /**
      * @param Lists $lists
+     * @param TableFactory $tableHelperFactory
      */
-    public function __construct(Lists $lists)
+    public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
     {
         $this->lists = $lists;
+        $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
         parent::__construct();
     }
 
@@ -48,14 +57,14 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $table = $this->getHelperSet()->get('table');
-        $table->setHeaders(['Language', 'Code']);
+        $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+        $tableHelper->setHeaders(['Language', 'Code']);
 
         foreach ($this->lists->getLocaleList() as $key => $locale) {
-            $table->addRow([$locale, $key]);
+            $tableHelper->addRow([$locale, $key]);
         }
 
-        $table->render($output);
+        $tableHelper->render();
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
index 95b4cd27bbd3a..2ff1d228dfe24 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoTimezoneListCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Command\Command;
 use Magento\Framework\Setup\Lists;
+use Symfony\Component\Console\Helper\TableFactory;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Command prints list of available timezones
@@ -23,12 +25,19 @@ class InfoTimezoneListCommand extends Command
      */
     private $lists;
 
+    /**
+     * @var TableFactory
+     */
+    private $tableHelperFactory;
+
     /**
      * @param Lists $lists
+     * @param TableFactory $tableHelperFactory
      */
-    public function __construct(Lists $lists)
+    public function __construct(Lists $lists, TableFactory $tableHelperFactory = null)
     {
         $this->lists = $lists;
+        $this->tableHelperFactory = $tableHelperFactory ?: ObjectManager::getInstance()->create(TableFactory::class);
         parent::__construct();
     }
 
@@ -48,14 +57,14 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $table = $this->getHelperSet()->get('table');
-        $table->setHeaders(['Timezone', 'Code']);
+        $tableHelper = $this->tableHelperFactory->create(['output' => $output]);
+        $tableHelper->setHeaders(['Timezone', 'Code']);
 
         foreach ($this->lists->getTimezoneList() as $key => $timezone) {
-            $table->addRow([$timezone, $key]);
+            $tableHelper->addRow([$timezone, $key]);
         }
 
-        $table->render($output);
+        $tableHelper->render();
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 }
diff --git a/setup/src/Magento/Setup/Fixtures/ImagesFixture.php b/setup/src/Magento/Setup/Fixtures/ImagesFixture.php
index 84081412335ac..1878a48977156 100644
--- a/setup/src/Magento/Setup/Fixtures/ImagesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/ImagesFixture.php
@@ -417,7 +417,7 @@ private function getImagesToGenerate()
     {
         $config = $this->fixtureModel->getValue('product-images', []);
 
-        return isset($config['images-count']) ? $config['images-count'] : null;
+        return $config['images-count'] ?? null;
     }
 
     /**
@@ -429,7 +429,7 @@ private function getImagesPerProduct()
     {
         $config = $this->fixtureModel->getValue('product-images', []);
 
-        return isset($config['images-per-product']) ? $config['images-per-product'] : null;
+        return $config['images-per-product'] ?? null;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index a7dc4dd1e6099..a1a62dc594683 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -815,6 +815,11 @@ public function declarativeInstallSchema(array $request)
      */
     public function installSchema(array $request)
     {
+        /** @var \Magento\Framework\Registry $registry */
+        $registry = $this->objectManagerProvider->get()->get(\Magento\Framework\Registry::class);
+        //For backward compatibility in install and upgrade scripts with enabled parallelization.
+        $registry->register('setup-mode-enabled', true);
+
         $this->assertDbConfigExists();
         $this->assertDbAccessible();
         $setup = $this->setupFactory->create($this->context->getResources());
@@ -831,6 +836,8 @@ public function installSchema(array $request)
             $schemaListener->setResource('default');
             $this->schemaPersistor->persist($schemaListener);
         }
+
+        $registry->unregister('setup-mode-enabled');
     }
 
     /**
@@ -853,12 +860,19 @@ private function convertationOfOldScriptsIsAllowed(array $request)
      */
     public function installDataFixtures(array $request = [])
     {
+        /** @var \Magento\Framework\Registry $registry */
+        $registry = $this->objectManagerProvider->get()->get(\Magento\Framework\Registry::class);
+        //For backward compatibility in install and upgrade scripts with enabled parallelization.
+        $registry->register('setup-mode-enabled', true);
+
         $this->assertDbConfigExists();
         $this->assertDbAccessible();
         $setup = $this->dataSetupFactory->create();
         $this->checkFilePermissionsForDbUpgrade();
         $this->log->log('Data install/update:');
         $this->handleDBSchemaData($setup, 'data', $request);
+
+        $registry->unregister('setup-mode-enabled');
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Module/Setup/SetupCache.php b/setup/src/Magento/Setup/Module/Setup/SetupCache.php
index 8de00c6cb6ffb..3ab81500ebf11 100644
--- a/setup/src/Magento/Setup/Module/Setup/SetupCache.php
+++ b/setup/src/Magento/Setup/Module/Setup/SetupCache.php
@@ -41,13 +41,9 @@ public function setField($table, $parentId, $rowId, $field, $value)
     public function get($table, $parentId, $rowId, $field = null)
     {
         if (null === $field) {
-            return isset($this->data[$table][$parentId][$rowId]) ?
-                $this->data[$table][$parentId][$rowId] :
-                false;
+            return $this->data[$table][$parentId][$rowId]) ?? false;
         } else {
-            return isset($this->data[$table][$parentId][$rowId][$field]) ?
-                $this->data[$table][$parentId][$rowId][$field] :
-                false;
+            return $this->data[$table][$parentId][$rowId][$field] ?? false;
         }
     }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php
index ff4722ca0fd4a..1329324b74015 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoBackupsListCommandTest.php
@@ -16,9 +16,9 @@ public function testExecute()
         $table = $this->createMock(\Symfony\Component\Console\Helper\Table::class);
         $table->expects($this->once())->method('setHeaders')->with(['Backup Filename', 'Backup Type']);
         $table->expects($this->once())->method('addRow')->with(['backupFile_media.tgz', 'media']);
-        /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
-        $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
-        $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+        /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+        $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+        $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
         /** @var \Magento\Framework\App\Filesystem\DirectoryList
          * |\PHPUnit_Framework_MockObject_MockObject $directoryList
          */
@@ -29,8 +29,7 @@ public function testExecute()
         $file->expects($this->once())
             ->method('readDirectoryRecursively')
             ->will($this->returnValue(['backupFile_media.tgz']));
-        $command = new InfoBackupsListCommand($directoryList, $file);
-        $command->setHelperSet($helperSet);
+        $command = new InfoBackupsListCommand($directoryList, $file, $tableFactoryMock);
         $commandTester = new CommandTester($command);
         $commandTester->execute([]);
         $expected = 'Showing backup files in ';
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php
index e3e0a1de71727..caee4af9c7fc4 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoCurrencyListCommandTest.php
@@ -21,15 +21,14 @@ public function testExecute()
         $table->expects($this->once())->method('setHeaders')->with(['Currency', 'Code']);
         $table->expects($this->once())->method('addRow')->with(['Currency description', 'CUR']);
 
-        /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
-        $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
-        $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+        /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+        $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+        $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
 
         /** @var \Magento\Framework\Setup\Lists|\PHPUnit_Framework_MockObject_MockObject $list */
         $list = $this->createMock(\Magento\Framework\Setup\Lists::class);
         $list->expects($this->once())->method('getCurrencyList')->will($this->returnValue($currencies));
-        $command = new InfoCurrencyListCommand($list);
-        $command->setHelperSet($helperSet);
+        $command = new InfoCurrencyListCommand($list, $tableFactoryMock);
         $commandTester = new CommandTester($command);
         $commandTester->execute([]);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php
index f1622b59c4593..d9c899b178c37 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoLanguageListCommandTest.php
@@ -21,15 +21,14 @@ public function testExecute()
         $table->expects($this->once())->method('setHeaders')->with(['Language', 'Code']);
         $table->expects($this->once())->method('addRow')->with(['Language description', 'LNG']);
 
-        /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
-        $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
-        $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+        /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+        $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+        $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
 
         /** @var \Magento\Framework\Setup\Lists|\PHPUnit_Framework_MockObject_MockObject $list */
         $list = $this->createMock(\Magento\Framework\Setup\Lists::class);
         $list->expects($this->once())->method('getLocaleList')->will($this->returnValue($languages));
-        $command = new InfoLanguageListCommand($list);
-        $command->setHelperSet($helperSet);
+        $command = new InfoLanguageListCommand($list, $tableFactoryMock);
         $commandTester = new CommandTester($command);
         $commandTester->execute([]);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php
index 860862f304971..80871ecf634ed 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InfoTimezoneListCommandTest.php
@@ -21,15 +21,14 @@ public function testExecute()
         $table->expects($this->once())->method('setHeaders')->with(['Timezone', 'Code']);
         $table->expects($this->once())->method('addRow')->with(['timezone description', 'timezone']);
 
-        /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit_Framework_MockObject_MockObject $helperSet */
-        $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
-        $helperSet->expects($this->once())->method('get')->with('table')->will($this->returnValue($table));
+        /** @var \Symfony\Component\Console\Helper\TableFactory|\PHPUnit_Framework_MockObject_MockObject $helperSet */
+        $tableFactoryMock = $this->createMock(\Symfony\Component\Console\Helper\TableFactory::class);
+        $tableFactoryMock->expects($this->once())->method('create')->will($this->returnValue($table));
 
         /** @var \Magento\Framework\Setup\Lists|\PHPUnit_Framework_MockObject_MockObject $list */
         $list = $this->createMock(\Magento\Framework\Setup\Lists::class);
         $list->expects($this->once())->method('getTimezoneList')->will($this->returnValue($timezones));
-        $command = new InfoTimezoneListCommand($list);
-        $command->setHelperSet($helperSet);
+        $command = new InfoTimezoneListCommand($list, $tableFactoryMock);
         $commandTester = new CommandTester($command);
         $commandTester->execute([]);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
index 413094a1e0115..882483ce7674a 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
@@ -267,6 +267,9 @@ private function createObject($connectionFactory = false, $objectManagerProvider
         );
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testInstall()
     {
         $request = [
@@ -316,6 +319,7 @@ public function testInstall()
         $appState->expects($this->once())
             ->method('setAreaCode')
             ->with(\Magento\Framework\App\Area::AREA_GLOBAL);
+        $registry = $this->createMock(\Magento\Framework\Registry::class);
         $this->setupFactory->expects($this->atLeastOnce())->method('create')->with($resource)->willReturn($setup);
         $this->dataSetupFactory->expects($this->atLeastOnce())->method('create')->willReturn($dataSetup);
         $this->objectManager->expects($this->any())
@@ -346,7 +350,8 @@ public function testInstall()
             ->will($this->returnValueMap([
                 [\Magento\Framework\App\State::class, $appState],
                 [\Magento\Framework\App\Cache\Manager::class, $cacheManager],
-                [\Magento\Setup\Model\DeclarationInstaller::class, $this->declarationInstallerMock]
+                [\Magento\Setup\Model\DeclarationInstaller::class, $this->declarationInstallerMock],
+                [\Magento\Framework\Registry::class, $registry]
             ]));
         $this->adminFactory->expects($this->once())->method('create')->willReturn(
             $this->createMock(\Magento\Setup\Model\AdminAccount::class)