diff --git a/.travis.yml b/.travis.yml
index d29aa241b15b6..76885ebab2896 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,6 @@ cache:
     - $HOME/node_modules
     - $HOME/yarn.lock
 before_install:
-  - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart
   - ./dev/travis/before_install.sh
 install: composer install --no-interaction
 before_script: ./dev/travis/before_script.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 322cd10d0ff08..7237ebfacf5e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -489,7 +489,7 @@ Tests:
     * Fixed an issue where found records in global search in Backend could not be selected via keyboard
     * Fixed an issue where Category menu items went out of screen when page side was reached
     * Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly
-    * Fixed an issue where popup header was our of window range while creating group product
+    * Fixed an issue where popup header was out of window range while creating group product
     * Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country
     * Fixed an ability to edit the Order from Admin panel
     * Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout
@@ -626,7 +626,7 @@ Tests:
     * Fixed an issue where filters were not shown on product reviews report grid
     * Fixed an issue where second customer address was not deleted from customer account
     * Fixed an issue where custom options pop-up was still displayed after submit
-    * Fixed an issue where Second Product was not added to Shopping Cart from Wishlist at first atempt
+    * Fixed an issue where Second Product was not added to Shopping Cart from Wishlist at first attempt
     * Fixed an issue where customer invalid email message was not displayed
     * Fixed an issue where All Access Tokens for Customer without Tokens could not be revoked
     * Fixed an issue where it was impossible to add Product to Shopping Cart from shared Wishlist
diff --git a/README.md b/README.md
index e73da84d66f46..9e3cf448f99fb 100644
--- a/README.md
+++ b/README.md
@@ -5,14 +5,14 @@
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
-## Magento system requirements
-[Magento system requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
+## Magento System Requirements
+[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
 
 ## Install Magento
 
-*	[Installation guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
+*	[Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
 
-<h2>Contributing to the Magento 2 code base</h2>
+<h2>Contributing to the Magento 2 Code Base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
 
 To learn about how to make a contribution, click [here][1].
@@ -39,11 +39,11 @@ Magento is thankful for any contribution that can improve our code base, documen
     <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
 </a>
 
-### Labels applied by the Magento team
+### Labels Applied by the Magento Team
 We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
 Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
 
-## Reporting security issues
+## Reporting Security Issues
 
 To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account [there](https://bugcrowd.com/magento) to submit and follow-up your issue. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue).
 
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index 2e17e734b1e60..591e648547d61 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
@@ -185,6 +185,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * @param AdvancedPricing\Validator\Website $websiteValidator
      * @param AdvancedPricing\Validator\TierPrice $tierPriceValidator
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws \Exception
      */
     public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
@@ -255,6 +256,7 @@ public function getEntityTypeCode()
      * @param array $rowData
      * @param int $rowNum
      * @return bool
+     * @throws \Zend_Validate_Exception
      */
     public function validateRow(array $rowData, $rowNum)
     {
@@ -308,6 +310,7 @@ protected function _importData()
      * Save advanced pricing
      *
      * @return $this
+     * @throws \Exception
      */
     public function saveAdvancedPricing()
     {
@@ -319,6 +322,7 @@ public function saveAdvancedPricing()
      * Deletes Advanced price data from raw data.
      *
      * @return $this
+     * @throws \Exception
      */
     public function deleteAdvancedPricing()
     {
@@ -347,6 +351,7 @@ public function deleteAdvancedPricing()
      * Replace advanced pricing
      *
      * @return $this
+     * @throws \Exception
      */
     public function replaceAdvancedPricing()
     {
@@ -360,6 +365,7 @@ public function replaceAdvancedPricing()
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Exception
      */
     protected function saveAndReplaceAdvancedPrices()
     {
@@ -368,8 +374,8 @@ protected function saveAndReplaceAdvancedPrices()
             $this->_cachedSkuToDelete = null;
         }
         $listSku = [];
+        $tierPrices = [];
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
-            $tierPrices = [];
             foreach ($bunch as $rowNum => $rowData) {
                 if (!$this->validateRow($rowData, $rowNum)) {
                     $this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, $rowNum);
@@ -397,23 +403,28 @@ protected function saveAndReplaceAdvancedPrices()
                     ];
                 }
             }
-            if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
-                if ($listSku) {
-                    $this->processCountNewPrices($tierPrices);
-                    if ($this->deleteProductTierPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
-                        $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
-                        $this->setUpdatedAt($listSku);
-                    }
-                }
-            } elseif (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
+
+            if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
                 $this->processCountExistingPrices($tierPrices, self::TABLE_TIER_PRICE)
                     ->processCountNewPrices($tierPrices);
+
                 $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
                 if ($listSku) {
                     $this->setUpdatedAt($listSku);
                 }
             }
         }
+
+        if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
+            if ($listSku) {
+                $this->processCountNewPrices($tierPrices);
+                if ($this->deleteProductTierPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
+                    $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
+                    $this->setUpdatedAt($listSku);
+                }
+            }
+        }
+
         return $this;
     }
 
@@ -423,6 +434,7 @@ protected function saveAndReplaceAdvancedPrices()
      * @param array $priceData
      * @param string $table
      * @return $this
+     * @throws \Exception
      */
     protected function saveProductPrices(array $priceData, $table)
     {
@@ -454,6 +466,7 @@ protected function saveProductPrices(array $priceData, $table)
      * @param array $listSku
      * @param string $table
      * @return boolean
+     * @throws \Exception
      */
     protected function deleteProductTierPrices(array $listSku, $table)
     {
@@ -531,6 +544,7 @@ protected function getCustomerGroupId($customerGroup)
      * Retrieve product skus
      *
      * @return array
+     * @throws \Exception
      */
     protected function retrieveOldSkus()
     {
@@ -551,6 +565,7 @@ protected function retrieveOldSkus()
      * @param array $prices
      * @param string $table
      * @return $this
+     * @throws \Exception
      */
     protected function processCountExistingPrices($prices, $table)
     {
@@ -562,11 +577,14 @@ protected function processCountExistingPrices($prices, $table)
 
         $tableName = $this->_resourceFactory->create()->getTable($table);
         $productEntityLinkField = $this->getProductEntityLinkField();
-        $existingPrices = $this->_connection->fetchAssoc(
+        $existingPrices = $this->_connection->fetchAll(
             $this->_connection->select()->from(
                 $tableName,
-                ['value_id', $productEntityLinkField, 'all_groups', 'customer_group_id']
-            )->where($productEntityLinkField . ' IN (?)', $existProductIds)
+                [$productEntityLinkField, 'all_groups', 'customer_group_id', 'qty']
+            )->where(
+                $productEntityLinkField . ' IN (?)',
+                $existProductIds
+            )
         );
         foreach ($existingPrices as $existingPrice) {
             foreach ($prices as $sku => $skuPrices) {
@@ -591,8 +609,10 @@ protected function incrementCounterUpdated($prices, $existingPrice)
         foreach ($prices as $price) {
             if ($existingPrice['all_groups'] == $price['all_groups']
                 && $existingPrice['customer_group_id'] == $price['customer_group_id']
+                && (int) $existingPrice['qty'] === (int) $price['qty']
             ) {
                 $this->countItemsUpdated++;
+                continue;
             }
         }
     }
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
index 340e81746f029..2aa59c1cfb758 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
@@ -921,7 +921,7 @@ public function testProcessCountExistingPrices(
         );
         $dbSelectMock = $this->createMock(\Magento\Framework\DB\Select::class);
         $this->connection->expects($this->once())
-            ->method('fetchAssoc')
+            ->method('fetchAll')
             ->willReturn($existingPrices);
         $this->connection->expects($this->once())
             ->method('select')
@@ -930,7 +930,7 @@ public function testProcessCountExistingPrices(
             ->method('from')
             ->with(
                 self::TABLE_NAME,
-                ['value_id', self::LINK_FIELD, 'all_groups', 'customer_group_id']
+                [self::LINK_FIELD, 'all_groups', 'customer_group_id', 'qty']
             )->willReturnSelf();
         $this->advancedPricing->expects($this->once())
             ->method('retrieveOldSkus')
diff --git a/app/code/Magento/Analytics/Test/Mftf/Section/AdminAdvancedReportingSection.xml b/app/code/Magento/Analytics/Test/Mftf/Section/AdminAdvancedReportingSection.xml
new file mode 100644
index 0000000000000..7b6851e5bdf37
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Section/AdminAdvancedReportingSection.xml
@@ -0,0 +1,12 @@
+<?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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminAdvancedReportingSection">
+        <element name="goToAdvancedReporting" type="text" selector="//div[@class='dashboard-advanced-reports-actions']/a[@title='Go to Advanced Reporting']" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
new file mode 100644
index 0000000000000..505e178f49f43
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
@@ -0,0 +1,35 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAdvancedReportingButtonTest">
+        <annotations>
+            <stories value="AdvancedReporting"/>
+            <title value="AdvancedReportingButtonTest"/>
+            <description value="Test log in to AdvancedReporting and tests AdvancedReportingButtonTest"/>
+            <testCaseId value="MC-14800"/>
+            <severity value="CRITICAL"/>
+            <group value="analytics"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Navigate through Advanced Reporting button on dashboard to Sign Up page-->
+        <amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnDashboardPage"/>
+        <waitForPageLoad stepKey="waitForDashboardPageLoad"/>
+        <click selector="{{AdminAdvancedReportingSection.goToAdvancedReporting}}" stepKey="clickGoToAdvancedReporting"/>
+        <switchToNextTab stepKey="switchToNewTab"/>
+        <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php b/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
index 86e691daa4213..af1ef4400e442 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
@@ -14,7 +14,7 @@
 use Magento\Framework\MessageQueue\MessageLockException;
 use Magento\Framework\MessageQueue\ConnectionLostException;
 use Magento\Framework\Exception\NotFoundException;
-use Magento\Framework\MessageQueue\CallbackInvoker;
+use Magento\Framework\MessageQueue\CallbackInvokerInterface;
 use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
 use Magento\Framework\MessageQueue\EnvelopeInterface;
 use Magento\Framework\MessageQueue\QueueInterface;
@@ -30,7 +30,7 @@
 class MassConsumer implements ConsumerInterface
 {
     /**
-     * @var \Magento\Framework\MessageQueue\CallbackInvoker
+     * @var CallbackInvokerInterface
      */
     private $invoker;
 
@@ -67,7 +67,7 @@ class MassConsumer implements ConsumerInterface
     /**
      * Initialize dependencies.
      *
-     * @param CallbackInvoker $invoker
+     * @param CallbackInvokerInterface $invoker
      * @param ResourceConnection $resource
      * @param MessageController $messageController
      * @param ConsumerConfigurationInterface $configuration
@@ -76,7 +76,7 @@ class MassConsumer implements ConsumerInterface
      * @param Registry $registry
      */
     public function __construct(
-        CallbackInvoker $invoker,
+        CallbackInvokerInterface $invoker,
         ResourceConnection $resource,
         MessageController $messageController,
         ConsumerConfigurationInterface $configuration,
diff --git a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
index eae92e1663fc8..89d468159c6e9 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -20,6 +20,7 @@
 use Psr\Log\LoggerInterface;
 use Magento\AsynchronousOperations\Model\ResourceModel\Operation\OperationRepository;
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Encryption\Encryptor;
 
 /**
  * Class MassSchedule used for adding multiple entities as Operations to Bulk Management with the status tracking
@@ -63,6 +64,11 @@ class MassSchedule
      */
     private $userContext;
 
+    /**
+     * @var Encryptor
+     */
+    private $encryptor;
+
     /**
      * Initialize dependencies.
      *
@@ -73,6 +79,7 @@ class MassSchedule
      * @param LoggerInterface $logger
      * @param OperationRepository $operationRepository
      * @param UserContextInterface $userContext
+     * @param Encryptor|null $encryptor
      */
     public function __construct(
         IdentityGeneratorInterface $identityService,
@@ -81,7 +88,8 @@ public function __construct(
         BulkManagementInterface $bulkManagement,
         LoggerInterface $logger,
         OperationRepository $operationRepository,
-        UserContextInterface $userContext = null
+        UserContextInterface $userContext = null,
+        Encryptor $encryptor = null
     ) {
         $this->identityService = $identityService;
         $this->itemStatusInterfaceFactory = $itemStatusInterfaceFactory;
@@ -90,6 +98,7 @@ public function __construct(
         $this->logger = $logger;
         $this->operationRepository = $operationRepository;
         $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
+        $this->encryptor = $encryptor ?: ObjectManager::getInstance()->get(Encryptor::class);
     }
 
     /**
@@ -130,9 +139,13 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
             $requestItem = $this->itemStatusInterfaceFactory->create();
 
             try {
-                $operations[] = $this->operationRepository->createByTopic($topicName, $entityParams, $groupId);
+                $operation = $this->operationRepository->createByTopic($topicName, $entityParams, $groupId);
+                $operations[] = $operation;
                 $requestItem->setId($key);
                 $requestItem->setStatus(ItemStatusInterface::STATUS_ACCEPTED);
+                $requestItem->setDataHash(
+                    $this->encryptor->hash($operation->getSerializedData(), Encryptor::HASH_VERSION_SHA256)
+                );
                 $requestItems[] = $requestItem;
             } catch (\Exception $exception) {
                 $this->logger->error($exception);
diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php
index 5bc9335d24439..946ec8ba01a0e 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost.php
@@ -546,15 +546,16 @@ public function setResponseData(array $postData)
     public function validateResponse()
     {
         $response = $this->getResponse();
-        //md5 check
-        if (!$this->getConfigData('trans_md5')
-            || !$this->getConfigData('login')
-            || !$response->isValidHash($this->getConfigData('trans_md5'), $this->getConfigData('login'))
+        $hashConfigKey = !empty($response->getData('x_SHA2_Hash')) ? 'signature_key' : 'trans_md5';
+
+        //hash check
+        if (!$response->isValidHash($this->getConfigData($hashConfigKey), $this->getConfigData('login'))
         ) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('The transaction was declined because the response hash validation failed.')
             );
         }
+
         return true;
     }
 
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request.php b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
index 357385e5c8c79..10be4cd5febf6 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Request.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
@@ -8,6 +8,8 @@
 namespace Magento\Authorizenet\Model\Directpost;
 
 use Magento\Authorizenet\Model\Request as AuthorizenetRequest;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Intl\DateTimeFactory;
 
 /**
  * Authorize.net request model for DirectPost model
@@ -20,10 +22,35 @@ class Request extends AuthorizenetRequest
      */
     protected $_transKey = null;
 
+    /**
+     * Hexadecimal signature key.
+     *
+     * @var string
+     */
+    private $signatureKey = '';
+
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @param array $data
+     * @param DateTimeFactory $dateTimeFactory
+     */
+    public function __construct(
+        array $data = [],
+        DateTimeFactory $dateTimeFactory = null
+    ) {
+        $this->dateTimeFactory = $dateTimeFactory ?? ObjectManager::getInstance()
+                ->get(DateTimeFactory::class);
+        parent::__construct($data);
+    }
+
     /**
      * Return merchant transaction key.
      *
-     * Needed to generate sign.
+     * Needed to generate MD5 sign.
      *
      * @return string
      */
@@ -35,7 +62,7 @@ protected function _getTransactionKey()
     /**
      * Set merchant transaction key.
      *
-     * Needed to generate sign.
+     * Needed to generate MD5 sign.
      *
      * @param string $transKey
      * @return $this
@@ -47,7 +74,7 @@ protected function _setTransactionKey($transKey)
     }
 
     /**
-     * Generates the fingerprint for request.
+     * Generates the MD5 fingerprint for request.
      *
      * @param string $merchantApiLoginId
      * @param string $merchantTransactionKey
@@ -67,7 +94,7 @@ public function generateRequestSign(
     ) {
         return hash_hmac(
             "md5",
-            $merchantApiLoginId . "^" . $fpSequence . "^" . $fpTimestamp . "^" . $amount . "^" . $currencyCode,
+            $merchantApiLoginId . '^' . $fpSequence . '^' . $fpTimestamp . '^' . $amount . '^' . $currencyCode,
             $merchantTransactionKey
         );
     }
@@ -82,7 +109,7 @@ public function setConstantData(\Magento\Authorizenet\Model\Directpost $paymentM
     {
         $this->setXVersion('3.1')->setXDelimData('FALSE')->setXRelayResponse('TRUE');
 
-        $this->setXTestRequest($paymentMethod->getConfigData('test') ? 'TRUE' : 'FALSE');
+        $this->setSignatureKey($paymentMethod->getConfigData('signature_key'));
 
         $this->setXLogin($paymentMethod->getConfigData('login'))
             ->setXMethod(\Magento\Authorizenet\Model\Authorizenet::REQUEST_METHOD_CC)
@@ -167,23 +194,87 @@ public function setDataFromOrder(
     /**
      * Set sign hash into the request object.
      *
-     * All needed fields should be placed in the object fist.
+     * All needed fields should be placed in the object first.
      *
      * @return $this
      */
     public function signRequestData()
     {
-        $fpTimestamp = time();
-        $hash = $this->generateRequestSign(
-            $this->getXLogin(),
-            $this->_getTransactionKey(),
-            $this->getXAmount(),
-            $this->getXCurrencyCode(),
-            $this->getXFpSequence(),
-            $fpTimestamp
-        );
+        $fpDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
+        $fpTimestamp = $fpDate->getTimestamp();
+
+        if (!empty($this->getSignatureKey())) {
+            $hash = $this->generateSha2RequestSign(
+                (string)$this->getXLogin(),
+                (string)$this->getSignatureKey(),
+                (string)$this->getXAmount(),
+                (string)$this->getXCurrencyCode(),
+                (string)$this->getXFpSequence(),
+                $fpTimestamp
+            );
+        } else {
+            $hash = $this->generateRequestSign(
+                $this->getXLogin(),
+                $this->_getTransactionKey(),
+                $this->getXAmount(),
+                $this->getXCurrencyCode(),
+                $this->getXFpSequence(),
+                $fpTimestamp
+            );
+        }
+
         $this->setXFpTimestamp($fpTimestamp);
         $this->setXFpHash($hash);
+
         return $this;
     }
+
+    /**
+     * Generates the SHA2 fingerprint for request.
+     *
+     * @param string $merchantApiLoginId
+     * @param string $merchantSignatureKey
+     * @param string $amount
+     * @param string $currencyCode
+     * @param string $fpSequence An invoice number or random number.
+     * @param int $fpTimestamp
+     * @return string The fingerprint.
+     */
+    private function generateSha2RequestSign(
+        string $merchantApiLoginId,
+        string $merchantSignatureKey,
+        string $amount,
+        string $currencyCode,
+        string $fpSequence,
+        int $fpTimestamp
+    ): string {
+        $message = $merchantApiLoginId . '^' . $fpSequence . '^' . $fpTimestamp . '^' . $amount . '^' . $currencyCode;
+
+        return strtoupper(hash_hmac('sha512', $message, pack('H*', $merchantSignatureKey)));
+    }
+
+    /**
+     * Return merchant hexadecimal signature key.
+     *
+     * Needed to generate SHA2 sign.
+     *
+     * @return string
+     */
+    private function getSignatureKey(): string
+    {
+        return $this->signatureKey;
+    }
+
+    /**
+     * Set merchant hexadecimal signature key.
+     *
+     * Needed to generate SHA2 sign.
+     *
+     * @param string $signatureKey
+     * @return void
+     */
+    private function setSignatureKey(string $signatureKey)
+    {
+        $this->signatureKey = $signatureKey;
+    }
 }
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Response.php b/app/code/Magento/Authorizenet/Model/Directpost/Response.php
index 1c713a159c3ad..b5604a78cb9cd 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Response.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Response.php
@@ -27,25 +27,31 @@ class Response extends AuthorizenetResponse
      */
     public function generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
     {
-        if (!$amount) {
-            $amount = '0.00';
-        }
-
         return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));
     }
 
     /**
      * Return if is valid order id.
      *
-     * @param string $merchantMd5
+     * @param string $storedHash
      * @param string $merchantApiLogin
      * @return bool
      */
-    public function isValidHash($merchantMd5, $merchantApiLogin)
+    public function isValidHash($storedHash, $merchantApiLogin)
     {
-        $hash = $this->generateHash($merchantMd5, $merchantApiLogin, $this->getXAmount(), $this->getXTransId());
+        if (empty($this->getData('x_amount'))) {
+            $this->setData('x_amount', '0.00');
+        }
 
-        return Security::compareStrings($hash, $this->getData('x_MD5_Hash'));
+        if (!empty($this->getData('x_SHA2_Hash'))) {
+            $hash = $this->generateSha2Hash($storedHash);
+            return Security::compareStrings($hash, $this->getData('x_SHA2_Hash'));
+        } elseif (!empty($this->getData('x_MD5_Hash'))) {
+            $hash = $this->generateHash($storedHash, $merchantApiLogin, $this->getXAmount(), $this->getXTransId());
+            return Security::compareStrings($hash, $this->getData('x_MD5_Hash'));
+        }
+
+        return false;
     }
 
     /**
@@ -57,4 +63,54 @@ public function isApproved()
     {
         return $this->getXResponseCode() == \Magento\Authorizenet\Model\Directpost::RESPONSE_CODE_APPROVED;
     }
+
+    /**
+     * Generates an SHA2 hash to compare against AuthNet's.
+     *
+     * @param string $signatureKey
+     * @return string
+     * @see https://support.authorize.net/s/article/MD5-Hash-End-of-Life-Signature-Key-Replacement
+     */
+    private function generateSha2Hash(string $signatureKey): string
+    {
+        $hashFields = [
+            'x_trans_id',
+            'x_test_request',
+            'x_response_code',
+            'x_auth_code',
+            'x_cvv2_resp_code',
+            'x_cavv_response',
+            'x_avs_code',
+            'x_method',
+            'x_account_number',
+            'x_amount',
+            'x_company',
+            'x_first_name',
+            'x_last_name',
+            'x_address',
+            'x_city',
+            'x_state',
+            'x_zip',
+            'x_country',
+            'x_phone',
+            'x_fax',
+            'x_email',
+            'x_ship_to_company',
+            'x_ship_to_first_name',
+            'x_ship_to_last_name',
+            'x_ship_to_address',
+            'x_ship_to_city',
+            'x_ship_to_state',
+            'x_ship_to_zip',
+            'x_ship_to_country',
+            'x_invoice_num',
+        ];
+
+        $message = '^';
+        foreach ($hashFields as $field) {
+            $message .= ($this->getData($field) ?? '') . '^';
+        }
+
+        return strtoupper(hash_hmac('sha512', $message, pack('H*', $signatureKey)));
+    }
 }
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php
new file mode 100644
index 0000000000000..94d8f3a0d27a7
--- /dev/null
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Authorizenet\Test\Unit\Model\Directpost;
+
+use Magento\Authorizenet\Model\Directpost\Request;
+use Magento\Framework\Intl\DateTimeFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class RequestTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DateTimeFactory|MockObject
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @var Request
+     */
+    private $requestModel;
+
+    protected function setUp()
+    {
+        $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dateTime = new \DateTime('2016-07-05 00:00:00', new \DateTimeZone('UTC'));
+        $this->dateTimeFactory->method('create')
+            ->willReturn($dateTime);
+
+        $this->requestModel = new Request([], $this->dateTimeFactory);
+    }
+
+    /**
+     * @param string $signatureKey
+     * @param string $expectedHash
+     * @dataProvider signRequestDataProvider
+     */
+    public function testSignRequestData(string $signatureKey, string $expectedHash)
+    {
+        /** @var \Magento\Authorizenet\Model\Directpost $paymentMethod */
+        $paymentMethod = $this->createMock(\Magento\Authorizenet\Model\Directpost::class);
+        $paymentMethod->method('getConfigData')
+            ->willReturnMap(
+                [
+                    ['test', null, true],
+                    ['login', null, 'login'],
+                    ['trans_key', null, 'trans_key'],
+                    ['signature_key', null, $signatureKey],
+                ]
+            );
+
+        $this->requestModel->setConstantData($paymentMethod);
+        $this->requestModel->signRequestData();
+        $signHash = $this->requestModel->getXFpHash();
+
+        $this->assertEquals($expectedHash, $signHash);
+    }
+
+    /**
+     * @return array
+     */
+    public function signRequestDataProvider()
+    {
+        return [
+            [
+                'signatureKey' => '3EAFCE5697C1B4B9748385C1FCD29D86F3B9B41C7EED85A3A01DFF65' .
+                    '70C8C29373C2A153355C3313CDF4AF723C0036DBF244A0821713A910024EE85547CEF37F',
+                'expectedHash' => '719ED94DF5CF3510CB5531E8115462C8F12CBCC8E917BD809E8D40B4FF06' .
+                    '1E14953554403DD9813CCCE0F31B184EB4DEF558E9C0747505A0C25420372DB00BE1'
+            ],
+            [
+                'signatureKey' => '',
+                'expectedHash' => '3656211f2c41d1e4c083606f326c0460'
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
index 15c7eecb09a69..ff4aa8b5ee361 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
@@ -13,53 +13,16 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Authorizenet\Model\Directpost\Response
      */
-    protected $responseModel;
+    private $responseModel;
 
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-        $this->responseModel = $objectManager->getObject(\Magento\Authorizenet\Model\Directpost\Response::class);
-    }
-
-    /**
-     * @param string $merchantMd5
-     * @param string $merchantApiLogin
-     * @param float|null $amount
-     * @param float|string $amountTestFunc
-     * @param string $transactionId
-     * @dataProvider generateHashDataProvider
-     */
-    public function testGenerateHash($merchantMd5, $merchantApiLogin, $amount, $amountTestFunc, $transactionId)
-    {
-        $this->assertEquals(
-            $this->generateHash($merchantMd5, $merchantApiLogin, $amountTestFunc, $transactionId),
-            $this->responseModel->generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
+        $this->responseModel = $objectManager->getObject(
+            \Magento\Authorizenet\Model\Directpost\Response::class
         );
     }
 
-    /**
-     * @return array
-     */
-    public function generateHashDataProvider()
-    {
-        return [
-            [
-                'merchantMd5' => 'FCD7F001E9274FDEFB14BFF91C799306',
-                'merchantApiLogin' => 'Magento',
-                'amount' => null,
-                'amountTestFunc' => '0.00',
-                'transactionId' => '1'
-            ],
-            [
-                'merchantMd5' => '8AEF4E508261A287C3E2F544720FCA3A',
-                'merchantApiLogin' => 'Magento2',
-                'amount' => 100.50,
-                'amountTestFunc' => 100.50,
-                'transactionId' => '2'
-            ]
-        ];
-    }
-
     /**
      * @param $merchantMd5
      * @param $merchantApiLogin
@@ -73,7 +36,8 @@ protected function generateHash($merchantMd5, $merchantApiLogin, $amount, $trans
     }
 
     /**
-     * @param string $merchantMd5
+     * @param string $storedHash
+     * @param string $hashKey
      * @param string $merchantApiLogin
      * @param float|null $amount
      * @param string $transactionId
@@ -81,12 +45,21 @@ protected function generateHash($merchantMd5, $merchantApiLogin, $amount, $trans
      * @param bool $expectedValue
      * @dataProvider isValidHashDataProvider
      */
-    public function testIsValidHash($merchantMd5, $merchantApiLogin, $amount, $transactionId, $hash, $expectedValue)
-    {
+    public function testIsValidHash(
+        string $storedHash,
+        string $hashKey,
+        string $merchantApiLogin,
+        $amount,
+        string $transactionId,
+        string $hash,
+        bool $expectedValue
+    ) {
         $this->responseModel->setXAmount($amount);
         $this->responseModel->setXTransId($transactionId);
-        $this->responseModel->setData('x_MD5_Hash', $hash);
-        $this->assertEquals($expectedValue, $this->responseModel->isValidHash($merchantMd5, $merchantApiLogin));
+        $this->responseModel->setData($hashKey, $hash);
+        $result = $this->responseModel->isValidHash($storedHash, $merchantApiLogin);
+
+        $this->assertEquals($expectedValue, $result);
     }
 
     /**
@@ -94,9 +67,14 @@ public function testIsValidHash($merchantMd5, $merchantApiLogin, $amount, $trans
      */
     public function isValidHashDataProvider()
     {
+        $signatureKey = '3EAFCE5697C1B4B9748385C1FCD29D86F3B9B41C7EED85A3A01DFF6570C8C' .
+            '29373C2A153355C3313CDF4AF723C0036DBF244A0821713A910024EE85547CEF37F';
+        $expectedSha2Hash = '368D48E0CD1274BF41C059138DA69985594021A4AD5B4C5526AE88C8F' .
+            '7C5769B13C5E1E4358900F3E51076FB69D14B0A797904C22E8A11A52AA49CDE5FBB703C';
         return [
             [
                 'merchantMd5' => 'FCD7F001E9274FDEFB14BFF91C799306',
+                'hashKey' => 'x_MD5_Hash',
                 'merchantApiLogin' => 'Magento',
                 'amount' => null,
                 'transactionId' => '1',
@@ -105,11 +83,21 @@ public function isValidHashDataProvider()
             ],
             [
                 'merchantMd5' => '8AEF4E508261A287C3E2F544720FCA3A',
+                'hashKey' => 'x_MD5_Hash',
                 'merchantApiLogin' => 'Magento2',
                 'amount' => 100.50,
                 'transactionId' => '2',
                 'hash' => '1F24A4EC9A169B2B2A072A5F168E16DC',
                 'expectedValue' => false
+            ],
+            [
+                'signatureKey' => $signatureKey,
+                'hashKey' => 'x_SHA2_Hash',
+                'merchantApiLogin' => 'Magento2',
+                'amount' => 100.50,
+                'transactionId' => '2',
+                'hash' => $expectedSha2Hash,
+                'expectedValue' => true
             ]
         ];
     }
diff --git a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
index 28bf6945c8b81..fc86c0d2dc68d 100644
--- a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
+++ b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
@@ -29,6 +29,10 @@
                     <label>Transaction Key</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
+                <field id="signature_key" translate="label" type="obscure" sortOrder="55" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Signature Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                </field>
                 <field id="trans_md5" translate="label" type="obscure" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Merchant MD5</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
diff --git a/app/code/Magento/Authorizenet/etc/config.xml b/app/code/Magento/Authorizenet/etc/config.xml
index 02dca74023e22..60356460f553f 100644
--- a/app/code/Magento/Authorizenet/etc/config.xml
+++ b/app/code/Magento/Authorizenet/etc/config.xml
@@ -22,6 +22,7 @@
                 <title>Credit Card Direct Post (Authorize.Net)</title>
                 <trans_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <trans_md5 backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
+                <signature_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <allowspecific>0</allowspecific>
                 <currency>USD</currency>
                 <create_order_before>1</create_order_before>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
index 24291187c0584..7324421d3c14b 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
@@ -7,6 +7,13 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
+        <dev>
+            <js>
+                <minify_exclude>
+                    <authorizenet_acceptjs>\.authorize\.net/v1/Accept</authorizenet_acceptjs>
+                </minify_exclude>
+            </js>
+        </dev>
         <payment>
             <authorizenet_acceptjs>
                 <active>0</active>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js b/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js
index cbe0a6c30e699..83ddd1094ea1a 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js
+++ b/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js
@@ -4,10 +4,16 @@
  */
 
 var config = {
-    map: {
-        '*': {
-            acceptjssandbox: 'https://jstest.authorize.net/v1/Accept.js',
-            acceptjs: 'https://js.authorize.net/v1/Accept.js'
+    shim: {
+        acceptjs: {
+            exports: 'Accept'
+        },
+        acceptjssandbox: {
+            exports: 'Accept'
         }
+    },
+    paths: {
+        acceptjssandbox: 'https://jstest.authorize.net/v1/Accept',
+        acceptjs: 'https://js.authorize.net/v1/Accept'
     }
 };
diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js
index c8813c17c70c7..e98a204e36cee 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js
+++ b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js
@@ -16,7 +16,7 @@ define([
             dependency = 'acceptjssandbox';
         }
 
-        require([dependency], function () {
+        require([dependency], function (accept) {
                 var $body = $('body');
 
                 /*
@@ -26,16 +26,7 @@ define([
                  * Dynamically-loading-Accept-js-E-WC-03-Accept-js-is-not-loaded/td-p/63283
                  */
                 $body.on('handshake.acceptjs', function () {
-                    /*
-                     * Accept.js doesn't return the library when loading
-                     * and requirejs "shim" can't be used because it only works with the "paths" config option
-                     * and we can't use "paths" because require will try to load ".min.js" in production
-                     * and that doesn't work because it doesn't exist
-                     * and we can't add a query string to force a URL because accept.js will reject it
-                     * and we can't include it locally because they check in the script before loading more scripts
-                     * So, we use the global version as "shim" would
-                     */
-                    deferred.resolve(window.Accept);
+                    deferred.resolve(accept);
                     $body.off('handshake.acceptjs');
                 });
             },
diff --git a/app/code/Magento/Backend/App/Request/BackendValidator.php b/app/code/Magento/Backend/App/Request/BackendValidator.php
index 4d04d2fed8eb2..7ec6c83f29b50 100644
--- a/app/code/Magento/Backend/App/Request/BackendValidator.php
+++ b/app/code/Magento/Backend/App/Request/BackendValidator.php
@@ -146,8 +146,9 @@ private function createException(
                 $exception = new InvalidRequestException($response);
             } else {
                 //For regular requests.
+                $startPageUrl = $this->backendUrl->getStartupPageUrl();
                 $response = $this->redirectFactory->create()
-                    ->setUrl($this->backendUrl->getStartupPageUrl());
+                    ->setUrl($this->backendUrl->getUrl($startPageUrl));
                 $exception = new InvalidRequestException(
                     $response,
                     [
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
index 5a09e1f17f617..6004d08b4b738 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Backend\Block\System\Design\Edit\Tab;
 
+/**
+ * General system tab block.
+ */
 class General extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
@@ -90,7 +93,7 @@ protected function _prepareForm()
             ]
         );
 
-        $dateFormat = $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT);
+        $dateFormat = $this->_localeDate->getDateFormatWithLongYear();
         $fieldset->addField(
             'date_from',
             'date',
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
index 9890a10a4ceb0..891b2a3ada724 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -282,25 +282,23 @@ public function getGridIdsJson()
         if (!$this->getUseSelectAll()) {
             return '';
         }
-        /** @var \Magento\Framework\Data\Collection $allIdsCollection */
-        $allIdsCollection = clone $this->getParentBlock()->getCollection();
 
-        if ($this->getMassactionIdField()) {
-            $massActionIdField = $this->getMassactionIdField();
+        /** @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection $collection */
+        $collection = clone $this->getParentBlock()->getCollection();
+
+        if ($collection instanceof AbstractDb) {
+            $idsSelect = clone $collection->getSelect();
+            $idsSelect->reset(\Magento\Framework\DB\Select::ORDER);
+            $idsSelect->reset(\Magento\Framework\DB\Select::LIMIT_COUNT);
+            $idsSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET);
+            $idsSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
+            $idsSelect->columns($this->getMassactionIdField(), 'main_table');
+            $idList = $collection->getConnection()->fetchCol($idsSelect);
         } else {
-            $massActionIdField = $this->getParentBlock()->getMassactionIdField();
+            $idList = $collection->setPageSize(0)->getColumnValues($this->getMassactionIdField());
         }
 
-        if ($allIdsCollection instanceof AbstractDb) {
-            $allIdsCollection->getSelect()->limit();
-            $allIdsCollection->clear();
-        }
-
-        $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
-        if (!empty($gridIds)) {
-            return join(",", $gridIds);
-        }
-        return '';
+        return implode(',', $idList);
     }
 
     /**
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
index e8143b5f6b43a..e62b73f39241d 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
@@ -269,62 +269,6 @@ public function testGetGridIdsJsonWithoutUseSelectAll()
         $this->assertEmpty($this->_block->getGridIdsJson());
     }
 
-    /**
-     * @param array $items
-     * @param string $result
-     *
-     * @dataProvider dataProviderGetGridIdsJsonWithUseSelectAll
-     */
-    public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
-    {
-        $this->_block->setUseSelectAll(true);
-
-        if ($this->_block->getMassactionIdField()) {
-            $massActionIdField = $this->_block->getMassactionIdField();
-        } else {
-            $massActionIdField = $this->_block->getParentBlock()->getMassactionIdField();
-        }
-
-        $collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->_gridMock->expects($this->once())
-            ->method('getCollection')
-            ->willReturn($collectionMock);
-        $collectionMock->expects($this->once())
-            ->method('setPageSize')
-            ->with(0)
-            ->willReturnSelf();
-        $collectionMock->expects($this->once())
-            ->method('getColumnValues')
-            ->with($massActionIdField)
-            ->willReturn($items);
-
-        $this->assertEquals($result, $this->_block->getGridIdsJson());
-    }
-
-    /**
-     * @return array
-     */
-    public function dataProviderGetGridIdsJsonWithUseSelectAll()
-    {
-        return [
-            [
-                [],
-                '',
-            ],
-            [
-                [1],
-                '1',
-            ],
-            [
-                [1, 2, 3],
-                '1,2,3',
-            ],
-        ];
-    }
-
     /**
      * @param string $itemId
      * @param array|\Magento\Framework\DataObject $item
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index a52033b8d2501..98b8e702b1c53 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -169,15 +169,15 @@
             </group>
             <group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>JavaScript Settings</label>
-                <field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Merge JavaScript Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable JavaScript Bundling</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minify JavaScript Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Minification is not applied in developer mode.</comment>
@@ -185,11 +185,11 @@
             </group>
             <group id="css" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>CSS Settings</label>
-                <field id="merge_css_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="merge_css_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Merge CSS Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minify CSS Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Minification is not applied in developer mode.</comment>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
index 69d545f12d075..0a1dcb0b626e6 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <?php if ($block->getChildHtml()):?>
-    <div data-mage-init='{"floatingHeader": {}}' class="page-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
+    <div data-mage-init='{"floatingHeader": {}}' class="page-actions floating-header" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
         <?= $block->getChildHtml() ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
index fe30ca7e83f19..0033f4c071e42 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
+++ b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
@@ -69,7 +69,7 @@
 
                         <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                         <td if="elem.template"
-                            visible="elem.visible"
+                            visible="elem.visible() && elem.formElement !== 'hidden'"
                             disable="elem.disabled"
                             css="$parent.setClasses(elem)"
                             template="elem.template"
diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
index 4f34f24c3a806..ebc4ac1fb056a 100644
--- a/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
@@ -17,9 +17,10 @@
         <click selector="{{AdminGridTableSection.backupRowCheckbox(backup.name)}}" stepKey="selectBackupRow"/>
         <selectOption selector="{{AdminGridActionSection.actionSelect}}" userInput="Delete" stepKey="selectDeleteAction"/>
         <click selector="{{AdminGridActionSection.submitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForConfirmWindowToAppear"/>
         <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to delete the selected backup(s)?" stepKey="seeConfirmationModal"/>
+        <waitForPageLoad stepKey="waitForSubmitAction"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOkConfirmDelete"/>
         <dontSee selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="dontSeeBackupInGrid"/>
     </actionGroup>
-
 </actionGroups>
diff --git a/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml b/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
index ae97351cafcaf..ad218cdd57500 100644
--- a/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
+++ b/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
@@ -20,4 +20,8 @@
         <data key="name" unique="suffix">databaseBackup</data>
         <data key="type">Database</data>
     </entity>
-</entities>
+    <entity name="WebSetupWizardBackup" type="backup">
+        <data key="name">WebSetupWizard</data>
+        <data key="type">Database</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Controller/Paypal/Review.php b/app/code/Magento/Braintree/Controller/Paypal/Review.php
index 14ec829d98024..eb2de7c7b6e39 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/Review.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/Review.php
@@ -13,11 +13,12 @@
 use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
 /**
  * Class Review
  */
-class Review extends AbstractAction implements HttpPostActionInterface
+class Review extends AbstractAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @var QuoteUpdater
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
new file mode 100644
index 0000000000000..a00f1e367864e
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
@@ -0,0 +1,14 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="VerifyProductTypeOrder">
+        <seeElement stepKey="seeBundleInOrder" selector="{{AdminProductDropdownOrderSection.bundleProduct}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
new file mode 100644
index 0000000000000..787f7ade8ffab
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductDropdownOrderSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductDropdownOrderSection">
+        <element name="bundleProduct" type="text" selector="//li[not(preceding-sibling::li[span[@title='Downloadable Product']]) and not(following-sibling::li[span[@title='Simple Product']]) and not(following-sibling::li[span[@title='Configurable Product']]) and not(following-sibling::li[span[@title='Grouped Product']]) and not(following-sibling::li[span[@title='Virtual Product']])]/span[@title='Bundle Product']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
index 574c0dccdb07f..c922b981aecd9 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
@@ -31,6 +31,10 @@
             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <!-- Delete the bundled product we created in the test body -->
+            <actionGroup ref="deleteProductBySku" stepKey="deleteBundleProduct">
+                <argument name="sku" value="{{BundleProduct.sku}}"/>
+            </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Go to bundle product creation page-->
diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index e56cc6f32d804..f8d2f8bc11116 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -374,8 +374,17 @@ define([
     function applyTierPrice(oneItemPrice, qty, optionConfig) {
         var tiers = optionConfig.tierPrice,
             magicKey = _.keys(oneItemPrice)[0],
+            tiersFirstKey = _.keys(optionConfig)[0],
             lowest = false;
 
+        if (!tiers) {//tiers is undefined when options has only one option
+            tiers = optionConfig[tiersFirstKey].tierPrice;
+        }
+
+        tiers.sort(function (a, b) {//sorting based on "price_qty"
+            return a['price_qty'] - b['price_qty'];
+        });
+
         _.each(tiers, function (tier, index) {
             if (tier['price_qty'] > qty) {
                 return;
diff --git a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
index f79efa4c814d7..954acd35a07db 100644
--- a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
@@ -4,18 +4,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Api;
 
 /**
- * Interface which provides product renders information for products
+ * Interface which provides product renders information for products.
+ *
  * @api
  * @since 101.1.0
  */
 interface ProductRenderListInterface
 {
     /**
-     * Collect and retrieve the list of product render info
-     * This info contains raw prices and formated prices, product name, stock status, store_id, etc
+     * Collect and retrieve the list of product render info.
+     *
+     * This info contains raw prices and formatted prices, product name, stock status, store_id, etc.
+     *
      * @see \Magento\Catalog\Api\Data\ProductRenderInfoDtoInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index dd09e40ac5b35..1b6756968662f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -4,11 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Product attribute add/edit form main tab
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
 use Magento\Backend\Block\Widget\Form\Generic;
@@ -18,6 +13,8 @@
 use Magento\Framework\App\ObjectManager;
 
 /**
+ * Product attribute add/edit form main tab
+ *
  * @api
  * @since 100.0.2
  */
@@ -73,6 +70,7 @@ public function __construct(
      * Adding product form elements for editing attribute
      *
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD)
      */
     protected function _prepareForm()
@@ -255,7 +253,7 @@ protected function _prepareForm()
     }
 
     /**
-     * Initialize form fileds values
+     * Initialize form fields values
      *
      * @return $this
      */
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index c1b255c762dbb..c1d79894162ae 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -178,8 +178,9 @@ private function getDefaultListingMode()
     }
 
     /**
-     * Need use as _prepareLayout - but problem in declaring collection from
-     * another block (was problem with search result)
+     * Need use as _prepareLayout - but problem in declaring collection from another block.
+     * (was problem with search result)
+     *
      * @return $this
      */
     protected function _beforeToHtml()
@@ -188,7 +189,9 @@ protected function _beforeToHtml()
 
         $this->addToolbarBlock($collection);
 
-        $collection->load();
+        if (!$collection->isLoaded()) {
+            $collection->load();
+        }
 
         return parent::_beforeToHtml();
     }
@@ -262,6 +265,8 @@ public function getToolbarHtml()
     }
 
     /**
+     * Set collection.
+     *
      * @param AbstractCollection $collection
      * @return $this
      */
@@ -272,7 +277,9 @@ public function setCollection($collection)
     }
 
     /**
-     * @param array|string|integer| Element $code
+     * Add attribute.
+     *
+     * @param array|string|integer|Element $code
      * @return $this
      */
     public function addAttribute($code)
@@ -282,6 +289,8 @@ public function addAttribute($code)
     }
 
     /**
+     * Get price block template.
+     *
      * @return mixed
      */
     public function getPriceBlockTemplate()
@@ -371,6 +380,8 @@ public function getAddToCartPostParams(Product $product)
     }
 
     /**
+     * Get product price.
+     *
      * @param Product $product
      * @return string
      */
@@ -396,8 +407,8 @@ public function getProductPrice(Product $product)
     }
 
     /**
-     * Specifies that price rendering should be done for the list of products
-     * i.e. rendering happens in the scope of product list, but not single product
+     * Specifies that price rendering should be done for the list of products.
+     * (rendering happens in the scope of product list, but not single product)
      *
      * @return Render
      */
diff --git a/app/code/Magento/Catalog/Block/Product/View/Attributes.php b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
index 1cf9851d403a0..5b9777cbfd1e7 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
@@ -94,7 +94,7 @@ public function getAdditionalData(array $excludeAttr = [])
 
                 if (is_string($value) && strlen(trim($value))) {
                     $data[$attribute->getAttributeCode()] = [
-                        'label' => __($attribute->getStoreLabel()),
+                        'label' => $attribute->getStoreLabel(),
                         'value' => $value,
                         'code' => $attribute->getAttributeCode(),
                     ];
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index 181211a0fc4a2..059580b9b5eae 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -9,11 +9,14 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
+
 namespace Magento\Catalog\Block\Product\View\Options;
 
 use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
 
 /**
+ * Product aoptions section abstract block.
+ *
  * @api
  * @since 100.0.2
  */
@@ -46,7 +49,7 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
-     * @param \Magento\Catalog\Helper\Data $catalogData,
+     * @param \Magento\Catalog\Helper\Data $catalogData
      * @param array $data
      */
     public function __construct(
@@ -123,6 +126,8 @@ public function getFormattedPrice()
     }
 
     /**
+     * Retrieve formatted price.
+     *
      * @return string
      *
      * @deprecated
@@ -134,7 +139,7 @@ public function getFormatedPrice()
     }
 
     /**
-     * Return formated price
+     * Return formatted price
      *
      * @param array $value
      * @param bool $flag
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 0730e7a7c5dc1..342bbc388f872 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
@@ -6,8 +6,10 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
  * Class Save
@@ -16,75 +18,68 @@
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface
 {
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
+     * @var \Magento\Framework\Bulk\BulkManagementInterface
      */
-    protected $_productFlatIndexerProcessor;
+    private $bulkManagement;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
+     * @var \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory
      */
-    protected $_productPriceIndexerProcessor;
+    private $operationFactory;
 
     /**
-     * Catalog product
-     *
-     * @var \Magento\Catalog\Helper\Product
+     * @var \Magento\Framework\DataObject\IdentityGeneratorInterface
      */
-    protected $_catalogProduct;
+    private $identityService;
 
     /**
-     * @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory
+     * @var \Magento\Framework\Serialize\SerializerInterface
      */
-    protected $stockItemFactory;
+    private $serializer;
 
     /**
-     * Stock Indexer
-     *
-     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
+     * @var \Magento\Authorization\Model\UserContextInterface
      */
-    protected $_stockIndexerProcessor;
+    private $userContext;
 
     /**
-     * @var \Magento\Framework\Api\DataObjectHelper
+     * @var int
      */
-    protected $dataObjectHelper;
+    private $bulkSize;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
-     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
-     * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
-     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
-     * @param \Magento\Catalog\Helper\Product $catalogProduct
-     * @param \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory
-     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     * @param \Magento\Framework\Bulk\BulkManagementInterface $bulkManagement
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory
+     * @param \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     * @param \Magento\Authorization\Model\UserContextInterface $userContext
+     * @param int $bulkSize
      */
     public function __construct(
         Action\Context $context,
         \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper,
-        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
-        \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
-        \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
-        \Magento\Catalog\Helper\Product $catalogProduct,
-        \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory,
-        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+        \Magento\Framework\Bulk\BulkManagementInterface $bulkManagement,
+        \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory,
+        \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService,
+        \Magento\Framework\Serialize\SerializerInterface $serializer,
+        \Magento\Authorization\Model\UserContextInterface $userContext,
+        int $bulkSize = 100
     ) {
-        $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
-        $this->_productPriceIndexerProcessor = $productPriceIndexerProcessor;
-        $this->_stockIndexerProcessor = $stockIndexerProcessor;
-        $this->_catalogProduct = $catalogProduct;
-        $this->stockItemFactory = $stockItemFactory;
         parent::__construct($context, $attributeHelper);
-        $this->dataObjectHelper = $dataObjectHelper;
+        $this->bulkManagement = $bulkManagement;
+        $this->operationFactory = $operartionFactory;
+        $this->identityService = $identityService;
+        $this->serializer = $serializer;
+        $this->userContext = $userContext;
+        $this->bulkSize = $bulkSize;
     }
 
     /**
      * Update product attributes
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -93,128 +88,184 @@ public function execute()
         }
 
         /* Collect Data */
-        $inventoryData = $this->getRequest()->getParam('inventory', []);
         $attributesData = $this->getRequest()->getParam('attributes', []);
         $websiteRemoveData = $this->getRequest()->getParam('remove_website_ids', []);
         $websiteAddData = $this->getRequest()->getParam('add_website_ids', []);
 
-        /* Prepare inventory data item options (use config settings) */
-        $options = $this->_objectManager->get(\Magento\CatalogInventory\Api\StockConfigurationInterface::class)
-            ->getConfigItemOptions();
-        foreach ($options as $option) {
-            if (isset($inventoryData[$option]) && !isset($inventoryData['use_config_' . $option])) {
-                $inventoryData['use_config_' . $option] = 0;
-            }
-        }
+        $storeId = $this->attributeHelper->getSelectedStoreId();
+        $websiteId = $this->attributeHelper->getStoreWebsiteId($storeId);
+        $productIds = $this->attributeHelper->getProductIds();
+
+        $attributesData = $this->sanitizeProductAttributes($attributesData);
 
         try {
-            $storeId = $this->attributeHelper->getSelectedStoreId();
-            if ($attributesData) {
-                $dateFormat = $this->_objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
-                    ->getDateFormat(\IntlDateFormatter::SHORT);
-
-                foreach ($attributesData as $attributeCode => $value) {
-                    $attribute = $this->_objectManager->get(\Magento\Eav\Model\Config::class)
-                        ->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
-                    if (!$attribute->getAttributeId()) {
-                        unset($attributesData[$attributeCode]);
-                        continue;
-                    }
-                    if ($attribute->getBackendType() == 'datetime') {
-                        if (!empty($value)) {
-                            $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
-                            $filterInternal = new \Zend_Filter_NormalizedToLocalized(
-                                ['date_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT]
-                            );
-                            $value = $filterInternal->filter($filterInput->filter($value));
-                        } else {
-                            $value = null;
-                        }
-                        $attributesData[$attributeCode] = $value;
-                    } elseif ($attribute->getFrontendInput() == 'multiselect') {
-                        // Check if 'Change' checkbox has been checked by admin for this attribute
-                        $isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
-                        if (!$isChanged) {
-                            unset($attributesData[$attributeCode]);
-                            continue;
-                        }
-                        if (is_array($value)) {
-                            $value = implode(',', $value);
-                        }
-                        $attributesData[$attributeCode] = $value;
-                    }
-                }
+            $this->publish($attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds);
+            $this->messageManager->addSuccessMessage(__('Message is added to queue'));
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $this->messageManager->addErrorMessage($e->getMessage());
+        } catch (\Exception $e) {
+            $this->messageManager->addExceptionMessage(
+                $e,
+                __('Something went wrong while updating the product(s) attributes.')
+            );
+        }
 
-                $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class)
-                    ->updateAttributes($this->attributeHelper->getProductIds(), $attributesData, $storeId);
-            }
+        return $this->resultRedirectFactory->create()->setPath('catalog/product/', ['store' => $storeId]);
+    }
 
-            if ($inventoryData) {
-                // TODO why use ObjectManager?
-                /** @var \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry */
-                $stockRegistry = $this->_objectManager
-                    ->create(\Magento\CatalogInventory\Api\StockRegistryInterface::class);
-                /** @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository */
-                $stockItemRepository = $this->_objectManager
-                    ->create(\Magento\CatalogInventory\Api\StockItemRepositoryInterface::class);
-                foreach ($this->attributeHelper->getProductIds() as $productId) {
-                    $stockItemDo = $stockRegistry->getStockItem(
-                        $productId,
-                        $this->attributeHelper->getStoreWebsiteId($storeId)
-                    );
-                    if (!$stockItemDo->getProductId()) {
-                        $inventoryData['product_id'] = $productId;
-                    }
-
-                    $stockItemId = $stockItemDo->getId();
-                    $this->dataObjectHelper->populateWithArray(
-                        $stockItemDo,
-                        $inventoryData,
-                        \Magento\CatalogInventory\Api\Data\StockItemInterface::class
+    /**
+     * Sanitize product attributes
+     *
+     * @param array $attributesData
+     *
+     * @return array
+     */
+    private function sanitizeProductAttributes($attributesData)
+    {
+        $dateFormat = $this->_objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
+        $config = $this->_objectManager->get(\Magento\Eav\Model\Config::class);
+
+        foreach ($attributesData as $attributeCode => $value) {
+            $attribute = $config->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
+            if (!$attribute->getAttributeId()) {
+                unset($attributesData[$attributeCode]);
+                continue;
+            }
+            if ($attribute->getBackendType() === 'datetime') {
+                if (!empty($value)) {
+                    $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
+                    $filterInternal = new \Zend_Filter_NormalizedToLocalized(
+                        ['date_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT]
                     );
-                    $stockItemDo->setItemId($stockItemId);
-                    $stockItemRepository->save($stockItemDo);
+                    $value = $filterInternal->filter($filterInput->filter($value));
+                } else {
+                    $value = null;
                 }
-                $this->_stockIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
-            }
-
-            if ($websiteAddData || $websiteRemoveData) {
-                /* @var $actionModel \Magento\Catalog\Model\Product\Action */
-                $actionModel = $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class);
-                $productIds = $this->attributeHelper->getProductIds();
-
-                if ($websiteRemoveData) {
-                    $actionModel->updateWebsites($productIds, $websiteRemoveData, 'remove');
+                $attributesData[$attributeCode] = $value;
+            } elseif ($attribute->getFrontendInput() === 'multiselect') {
+                // Check if 'Change' checkbox has been checked by admin for this attribute
+                $isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
+                if (!$isChanged) {
+                    unset($attributesData[$attributeCode]);
+                    continue;
                 }
-                if ($websiteAddData) {
-                    $actionModel->updateWebsites($productIds, $websiteAddData, 'add');
+                if (is_array($value)) {
+                    $value = implode(',', $value);
                 }
-
-                $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
+                $attributesData[$attributeCode] = $value;
             }
+        }
+        return $attributesData;
+    }
 
-            $this->messageManager->addSuccessMessage(
-                __('A total of %1 record(s) were updated.', count($this->attributeHelper->getProductIds()))
-            );
-
-            $this->_productFlatIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
+    /**
+     * Schedule new bulk
+     *
+     * @param array $attributesData
+     * @param array $websiteRemoveData
+     * @param array $websiteAddData
+     * @param int $storeId
+     * @param int $websiteId
+     * @param array $productIds
+     * @throws \Magento\Framework\Exception\LocalizedException
+     *
+     * @return void
+     */
+    private function publish(
+        $attributesData,
+        $websiteRemoveData,
+        $websiteAddData,
+        $storeId,
+        $websiteId,
+        $productIds
+    ):void {
+        $productIdsChunks = array_chunk($productIds, $this->bulkSize);
+        $bulkUuid = $this->identityService->generateId();
+        $bulkDescription = __('Update attributes for ' . count($productIds) . ' selected products');
+        $operations = [];
+        foreach ($productIdsChunks as $productIdsChunk) {
+            if ($websiteRemoveData || $websiteAddData) {
+                $dataToUpdate = [
+                    'website_assign' => $websiteAddData,
+                    'website_detach' => $websiteRemoveData
+                ];
+                $operations[] = $this->makeOperation(
+                    'Update website assign',
+                    'product_action_attribute.website.update',
+                    $dataToUpdate,
+                    $storeId,
+                    $websiteId,
+                    $productIdsChunk,
+                    $bulkUuid
+                );
+            }
 
-            if ($this->_catalogProduct->isDataForPriceIndexerWasChanged($attributesData)
-                || !empty($websiteRemoveData)
-                || !empty($websiteAddData)
-            ) {
-                $this->_productPriceIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
+            if ($attributesData) {
+                $operations[] = $this->makeOperation(
+                    'Update product attributes',
+                    'product_action_attribute.update',
+                    $attributesData,
+                    $storeId,
+                    $websiteId,
+                    $productIdsChunk,
+                    $bulkUuid
+                );
             }
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addErrorMessage($e->getMessage());
-        } catch (\Exception $e) {
-            $this->messageManager->addExceptionMessage(
-                $e,
-                __('Something went wrong while updating the product(s) attributes.')
+        }
+
+        if (!empty($operations)) {
+            $result = $this->bulkManagement->scheduleBulk(
+                $bulkUuid,
+                $operations,
+                $bulkDescription,
+                $this->userContext->getUserId()
             );
+            if (!$result) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('Something went wrong while processing the request.')
+                );
+            }
         }
+    }
+
+    /**
+     * Make asynchronous operation
+     *
+     * @param string $meta
+     * @param string $queue
+     * @param array $dataToUpdate
+     * @param int $storeId
+     * @param int $websiteId
+     * @param array $productIds
+     * @param int $bulkUuid
+     *
+     * @return OperationInterface
+     */
+    private function makeOperation(
+        $meta,
+        $queue,
+        $dataToUpdate,
+        $storeId,
+        $websiteId,
+        $productIds,
+        $bulkUuid
+    ): OperationInterface {
+        $dataToEncode = [
+            'meta_information' => $meta,
+            'product_ids' => $productIds,
+            'store_id' => $storeId,
+            'website_id' => $websiteId,
+            'attributes' => $dataToUpdate
+        ];
+        $data = [
+            'data' => [
+                'bulk_uuid' => $bulkUuid,
+                'topic_name' => $queue,
+                'serialized_data' => $this->serializer->serialize($dataToEncode),
+                'status' => \Magento\Framework\Bulk\OperationInterface::STATUS_TYPE_OPEN,
+            ]
+        ];
 
-        return $this->resultRedirectFactory->create()
-            ->setPath('catalog/product/', ['store' => $this->attributeHelper->getSelectedStoreId()]);
+        return $this->operationFactory->create($data);
     }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
index 125406061aed7..78ad9f423871f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Cms\Model\Wysiwyg as WysiwygModel;
 use Magento\Framework\App\RequestInterface;
@@ -15,6 +18,11 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Type as ProductTypes;
 
+/**
+ * Build a product based on a request
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Builder
 {
     /**
@@ -79,10 +87,11 @@ public function __construct(
      * Build product based on user request
      *
      * @param RequestInterface $request
-     * @return \Magento\Catalog\Model\Product
+     * @return ProductInterface
      * @throws \RuntimeException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function build(RequestInterface $request)
+    public function build(RequestInterface $request): ProductInterface
     {
         $productId = (int) $request->getParam('id');
         $storeId = $request->getParam('store', 0);
@@ -92,6 +101,9 @@ public function build(RequestInterface $request)
         if ($productId) {
             try {
                 $product = $this->productRepository->getById($productId, true, $storeId);
+                if ($attributeSetId) {
+                    $product->setAttributeSetId($attributeSetId);
+                }
             } catch (\Exception $e) {
                 $product = $this->createEmptyProduct(ProductTypes::DEFAULT_TYPE, $attributeSetId, $storeId);
                 $this->logger->critical($e);
@@ -113,6 +125,8 @@ public function build(RequestInterface $request)
     }
 
     /**
+     * Create a product with the given properties
+     *
      * @param int $typeId
      * @param int $attributeSetId
      * @param int $storeId
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
new file mode 100644
index 0000000000000..dc24a3090481e
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Attribute\Backend;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
+use Magento\Framework\Bulk\OperationInterface;
+
+/**
+ * Consumer for export message.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Consumer
+{
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
+     */
+    private $productFlatIndexerProcessor;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
+     */
+    private $productPriceIndexerProcessor;
+
+    /**
+     * @var \Magento\Catalog\Helper\Product
+     */
+    private $catalogProduct;
+
+    /**
+     * @var \Magento\Catalog\Model\Product\Action
+     */
+    private $productAction;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var \Magento\Framework\Bulk\OperationManagementInterface
+     */
+    private $operationManagement;
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @param \Magento\Catalog\Helper\Product $catalogProduct
+     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
+     * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
+     * @param \Magento\Framework\Bulk\OperationManagementInterface $operationManagement
+     * @param \Magento\Catalog\Model\Product\Action $action
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     * @param EntityManager $entityManager
+     */
+    public function __construct(
+        \Magento\Catalog\Helper\Product $catalogProduct,
+        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
+        \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
+        \Magento\Framework\Bulk\OperationManagementInterface $operationManagement,
+        \Magento\Catalog\Model\Product\Action $action,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\Serialize\SerializerInterface $serializer,
+        EntityManager $entityManager
+    ) {
+        $this->catalogProduct = $catalogProduct;
+        $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
+        $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
+        $this->productAction = $action;
+        $this->logger = $logger;
+        $this->serializer = $serializer;
+        $this->operationManagement = $operationManagement;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * Process
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation
+     * @throws \Exception
+     *
+     * @return void
+     */
+    public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterface $operation)
+    {
+        try {
+            $serializedData = $operation->getSerializedData();
+            $data = $this->serializer->unserialize($serializedData);
+            $this->execute($data);
+        } catch (\Zend_Db_Adapter_Exception $e) {
+            $this->logger->critical($e->getMessage());
+            if ($e instanceof \Magento\Framework\DB\Adapter\LockWaitException
+                || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
+                || $e instanceof \Magento\Framework\DB\Adapter\ConnectionException
+            ) {
+                $status = OperationInterface::STATUS_TYPE_RETRIABLY_FAILED;
+                $errorCode = $e->getCode();
+                $message = $e->getMessage();
+            } else {
+                $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+                $errorCode = $e->getCode();
+                $message = __(
+                    'Sorry, something went wrong during product attributes update. Please see log for details.'
+                );
+            }
+        } catch (NoSuchEntityException $e) {
+            $this->logger->critical($e->getMessage());
+            $status = ($e instanceof TemporaryStateExceptionInterface)
+                ? OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+                : OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = $e->getMessage();
+        } catch (LocalizedException $e) {
+            $this->logger->critical($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = $e->getMessage();
+        } catch (\Exception $e) {
+            $this->logger->critical($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
+        }
+
+        $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)
+            ->setErrorCode($errorCode ?? null)
+            ->setResultMessage($message ?? null);
+
+        $this->entityManager->save($operation);
+    }
+
+    /**
+     * Execute
+     *
+     * @param array $data
+     *
+     * @return void
+     */
+    private function execute($data): void
+    {
+        $this->productAction->updateAttributes($data['product_ids'], $data['attributes'], $data['store_id']);
+        if ($this->catalogProduct->isDataForPriceIndexerWasChanged($data['attributes'])) {
+            $this->productPriceIndexerProcessor->reindexList($data['product_ids']);
+        }
+
+        $this->productFlatIndexerProcessor->reindexList($data['product_ids']);
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
new file mode 100644
index 0000000000000..32ba39d9afd98
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Attribute\Backend;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
+use Magento\Framework\Bulk\OperationInterface;
+use Magento\Framework\EntityManager\EntityManager;
+
+/**
+ * Consumer for export message.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ConsumerWebsiteAssign
+{
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
+     */
+    private $productFlatIndexerProcessor;
+
+    /**
+     * @var \Magento\Catalog\Model\Product\Action
+     */
+    private $productAction;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
+     */
+    private $productPriceIndexerProcessor;
+
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
+     * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
+     * @param \Magento\Catalog\Model\Product\Action $action
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     * @param EntityManager $entityManager
+     */
+    public function __construct(
+        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
+        \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
+        \Magento\Catalog\Model\Product\Action $action,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\Serialize\SerializerInterface $serializer,
+        EntityManager $entityManager
+    ) {
+        $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
+        $this->productAction = $action;
+        $this->logger = $logger;
+        $this->serializer = $serializer;
+        $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * Process
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation
+     * @throws \Exception
+     *
+     * @return void
+     */
+    public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterface $operation)
+    {
+        try {
+            $serializedData = $operation->getSerializedData();
+            $data = $this->serializer->unserialize($serializedData);
+            $this->execute($data);
+        } catch (\Zend_Db_Adapter_Exception $e) {
+            $this->logger->critical($e->getMessage());
+            if ($e instanceof \Magento\Framework\DB\Adapter\LockWaitException
+                || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
+                || $e instanceof \Magento\Framework\DB\Adapter\ConnectionException
+            ) {
+                $status = OperationInterface::STATUS_TYPE_RETRIABLY_FAILED;
+                $errorCode = $e->getCode();
+                $message = __($e->getMessage());
+            } else {
+                $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+                $errorCode = $e->getCode();
+                $message = __(
+                    'Sorry, something went wrong during product attributes update. Please see log for details.'
+                );
+            }
+        } catch (NoSuchEntityException $e) {
+            $this->logger->critical($e->getMessage());
+            $status = ($e instanceof TemporaryStateExceptionInterface)
+                ? OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+                : OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = $e->getMessage();
+        } catch (LocalizedException $e) {
+            $this->logger->critical($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = $e->getMessage();
+        } catch (\Exception $e) {
+            $this->logger->critical($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
+        }
+
+        $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)
+            ->setErrorCode($errorCode ?? null)
+            ->setResultMessage($message ?? null);
+
+        $this->entityManager->save($operation);
+    }
+
+    /**
+     * Update website in products
+     *
+     * @param array $productIds
+     * @param array $websiteRemoveData
+     * @param array $websiteAddData
+     *
+     * @return void
+     */
+    private function updateWebsiteInProducts($productIds, $websiteRemoveData, $websiteAddData): void
+    {
+        if ($websiteRemoveData) {
+            $this->productAction->updateWebsites($productIds, $websiteRemoveData, 'remove');
+        }
+        if ($websiteAddData) {
+            $this->productAction->updateWebsites($productIds, $websiteAddData, 'add');
+        }
+    }
+
+    /**
+     * Execute
+     *
+     * @param array $data
+     *
+     * @return void
+     */
+    private function execute($data): void
+    {
+        $this->updateWebsiteInProducts(
+            $data['product_ids'],
+            $data['attributes']['website_detach'],
+            $data['attributes']['website_assign']
+        );
+        $this->productPriceIndexerProcessor->reindexList($data['product_ids']);
+        $this->productFlatIndexerProcessor->reindexList($data['product_ids']);
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Category/Tree.php b/app/code/Magento/Catalog/Model/Category/Tree.php
index 6080f74d5fa06..0a9cb25d7b0e5 100644
--- a/app/code/Magento/Catalog/Model/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Category/Tree.php
@@ -32,27 +32,40 @@ class Tree
      */
     protected $treeFactory;
 
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
+     */
+    private $treeResourceFactory;
+
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection
      * @param \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Category\TreeFactory|null $treeResourceFactory
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection,
-        \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory
+        \Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory $treeFactory,
+        \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $treeResourceFactory = null
     ) {
         $this->categoryTree = $categoryTree;
         $this->storeManager = $storeManager;
         $this->categoryCollection = $categoryCollection;
         $this->treeFactory = $treeFactory;
+        $this->treeResourceFactory = $treeResourceFactory ?? \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Catalog\Model\ResourceModel\Category\TreeFactory::class);
     }
 
     /**
+     * Get root node by category.
+     *
      * @param \Magento\Catalog\Model\Category|null $category
      * @return Node|null
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getRootNode($category = null)
     {
@@ -71,13 +84,18 @@ public function getRootNode($category = null)
     }
 
     /**
+     * Get node by category.
+     *
      * @param \Magento\Catalog\Model\Category $category
      * @return Node
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function getNode(\Magento\Catalog\Model\Category $category)
     {
         $nodeId = $category->getId();
-        $node = $this->categoryTree->loadNode($nodeId);
+        $categoryTree = $this->treeResourceFactory->create();
+        $node = $categoryTree->loadNode($nodeId);
         $node->loadChildren();
         $this->prepareCollection();
         $this->categoryTree->addCollectionData($this->categoryCollection);
@@ -85,7 +103,11 @@ protected function getNode(\Magento\Catalog\Model\Category $category)
     }
 
     /**
+     * Prepare category collection.
+     *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function prepareCollection()
     {
@@ -104,6 +126,8 @@ protected function prepareCollection()
     }
 
     /**
+     * Get tree by node.
+     *
      * @param \Magento\Framework\Data\Tree\Node $node
      * @param int $depth
      * @param int $currentLevel
@@ -127,6 +151,8 @@ public function getTree($node, $depth = null, $currentLevel = 0)
     }
 
     /**
+     * Get node children.
+     *
      * @param \Magento\Framework\Data\Tree\Node $node
      * @param int $depth
      * @param int $currentLevel
diff --git a/app/code/Magento/Catalog/Model/CategoryList.php b/app/code/Magento/Catalog/Model/CategoryList.php
index e3318db505489..cab8e013d9ba1 100644
--- a/app/code/Magento/Catalog/Model/CategoryList.php
+++ b/app/code/Magento/Catalog/Model/CategoryList.php
@@ -76,11 +76,10 @@ public function getList(SearchCriteriaInterface $searchCriteria)
         $this->extensionAttributesJoinProcessor->process($collection);
 
         $this->collectionProcessor->process($searchCriteria, $collection);
-        $collection->load();
 
         $items = [];
-        foreach ($collection->getItems() as $category) {
-            $items[] = $this->categoryRepository->get($category->getId());
+        foreach ($collection->getAllIds() as $id) {
+            $items[] = $this->categoryRepository->get($id);
         }
 
         /** @var CategorySearchResultsInterface $searchResult */
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 f8121b55dbf99..eb59acb56c356 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
@@ -3,33 +3,46 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Indexer\Category\Product\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Config;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Indexer\BatchProviderInterface;
+use Magento\Framework\Indexer\BatchSizeManagementInterface;
 use Magento\Indexer\Model\ProcessManager;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Full reindex action
  *
- * @package Magento\Catalog\Model\Indexer\Category\Product\Action
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
+class Full extends AbstractAction
 {
     /**
-     * @var \Magento\Framework\Indexer\BatchSizeManagementInterface
+     * @var BatchSizeManagementInterface
      */
     private $batchSizeManagement;
 
     /**
-     * @var \Magento\Framework\Indexer\BatchProviderInterface
+     * @var BatchProviderInterface
      */
     private $batchProvider;
 
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     protected $metadataPool;
 
@@ -52,25 +65,25 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
 
     /**
      * @param ResourceConnection $resource
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Catalog\Model\Config $config
+     * @param StoreManagerInterface $storeManager
+     * @param Config $config
      * @param QueryGenerator|null $queryGenerator
-     * @param \Magento\Framework\Indexer\BatchSizeManagementInterface|null $batchSizeManagement
-     * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
-     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
+     * @param BatchSizeManagementInterface|null $batchSizeManagement
+     * @param BatchProviderInterface|null $batchProvider
+     * @param MetadataPool|null $metadataPool
      * @param int|null $batchRowsCount
      * @param ActiveTableSwitcher|null $activeTableSwitcher
      * @param ProcessManager $processManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Catalog\Model\Config $config,
+        ResourceConnection $resource,
+        StoreManagerInterface $storeManager,
+        Config $config,
         QueryGenerator $queryGenerator = null,
-        \Magento\Framework\Indexer\BatchSizeManagementInterface $batchSizeManagement = null,
-        \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
+        BatchSizeManagementInterface $batchSizeManagement = null,
+        BatchProviderInterface $batchProvider = null,
+        MetadataPool $metadataPool = null,
         $batchRowsCount = null,
         ActiveTableSwitcher $activeTableSwitcher = null,
         ProcessManager $processManager = null
@@ -81,15 +94,15 @@ public function __construct(
             $config,
             $queryGenerator
         );
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $objectManager = ObjectManager::getInstance();
         $this->batchSizeManagement = $batchSizeManagement ?: $objectManager->get(
-            \Magento\Framework\Indexer\BatchSizeManagementInterface::class
+            BatchSizeManagementInterface::class
         );
         $this->batchProvider = $batchProvider ?: $objectManager->get(
-            \Magento\Framework\Indexer\BatchProviderInterface::class
+            BatchProviderInterface::class
         );
         $this->metadataPool = $metadataPool ?: $objectManager->get(
-            \Magento\Framework\EntityManager\MetadataPool::class
+            MetadataPool::class
         );
         $this->batchRowsCount = $batchRowsCount;
         $this->activeTableSwitcher = $activeTableSwitcher ?: $objectManager->get(ActiveTableSwitcher::class);
@@ -97,33 +110,39 @@ public function __construct(
     }
 
     /**
+     * Create the store tables
+     *
      * @return void
      */
-    private function createTables()
+    private function createTables(): void
     {
         foreach ($this->storeManager->getStores() as $store) {
-            $this->tableMaintainer->createTablesForStore($store->getId());
+            $this->tableMaintainer->createTablesForStore((int)$store->getId());
         }
     }
 
     /**
+     * Truncates the replica tables
+     *
      * @return void
      */
-    private function clearReplicaTables()
+    private function clearReplicaTables(): void
     {
         foreach ($this->storeManager->getStores() as $store) {
-            $this->connection->truncateTable($this->tableMaintainer->getMainReplicaTable($store->getId()));
+            $this->connection->truncateTable($this->tableMaintainer->getMainReplicaTable((int)$store->getId()));
         }
     }
 
     /**
+     * Switches the active table
+     *
      * @return void
      */
-    private function switchTables()
+    private function switchTables(): void
     {
         $tablesToSwitch = [];
         foreach ($this->storeManager->getStores() as $store) {
-            $tablesToSwitch[] = $this->tableMaintainer->getMainTable($store->getId());
+            $tablesToSwitch[] = $this->tableMaintainer->getMainTable((int)$store->getId());
         }
         $this->activeTableSwitcher->switchTable($this->connection, $tablesToSwitch);
     }
@@ -133,12 +152,13 @@ private function switchTables()
      *
      * @return $this
      */
-    public function execute()
+    public function execute(): self
     {
         $this->createTables();
         $this->clearReplicaTables();
         $this->reindex();
         $this->switchTables();
+
         return $this;
     }
 
@@ -147,7 +167,7 @@ public function execute()
      *
      * @return void
      */
-    protected function reindex()
+    protected function reindex(): void
     {
         $userFunctions = [];
 
@@ -165,9 +185,9 @@ protected function reindex()
     /**
      * Execute indexation by store
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      */
-    private function reindexStore($store)
+    private function reindexStore($store): void
     {
         $this->reindexRootCategory($store);
         $this->reindexAnchorCategories($store);
@@ -177,31 +197,31 @@ private function reindexStore($store)
     /**
      * Publish data from tmp to replica table
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
-    private function publishData($store)
+    private function publishData($store): void
     {
-        $select = $this->connection->select()->from($this->tableMaintainer->getMainTmpTable($store->getId()));
+        $select = $this->connection->select()->from($this->tableMaintainer->getMainTmpTable((int)$store->getId()));
         $columns = array_keys(
-            $this->connection->describeTable($this->tableMaintainer->getMainReplicaTable($store->getId()))
+            $this->connection->describeTable($this->tableMaintainer->getMainReplicaTable((int)$store->getId()))
         );
-        $tableName = $this->tableMaintainer->getMainReplicaTable($store->getId());
+        $tableName = $this->tableMaintainer->getMainReplicaTable((int)$store->getId());
 
         $this->connection->query(
             $this->connection->insertFromSelect(
                 $select,
                 $tableName,
                 $columns,
-                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+                AdapterInterface::INSERT_ON_DUPLICATE
             )
         );
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    protected function reindexRootCategory(\Magento\Store\Model\Store $store)
+    protected function reindexRootCategory(Store $store): void
     {
         if ($this->isIndexRootCategoryNeeded()) {
             $this->reindexCategoriesBySelect($this->getAllProducts($store), 'cp.entity_id IN (?)', $store);
@@ -211,10 +231,10 @@ protected function reindexRootCategory(\Magento\Store\Model\Store $store)
     /**
      * Reindex products of anchor categories
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
-    protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
+    protected function reindexAnchorCategories(Store $store): void
     {
         $this->reindexCategoriesBySelect($this->getAnchorCategoriesSelect($store), 'ccp.product_id IN (?)', $store);
     }
@@ -222,10 +242,10 @@ protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
     /**
      * Reindex products of non anchor categories
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
-    protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
+    protected function reindexNonAnchorCategories(Store $store): void
     {
         $this->reindexCategoriesBySelect($this->getNonAnchorCategoriesSelect($store), 'ccp.product_id IN (?)', $store);
     }
@@ -233,40 +253,42 @@ protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
     /**
      * Reindex categories using given SQL select and condition.
      *
-     * @param \Magento\Framework\DB\Select $basicSelect
+     * @param Select $basicSelect
      * @param string $whereCondition
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
-    private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSelect, $whereCondition, $store)
+    private function reindexCategoriesBySelect(Select $basicSelect, $whereCondition, $store): void
     {
-        $this->tableMaintainer->createMainTmpTable($store->getId());
+        $this->tableMaintainer->createMainTmpTable((int)$store->getId());
 
-        $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+        $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
         $columns = array_keys(
-            $this->connection->describeTable($this->tableMaintainer->getMainTmpTable($store->getId()))
+            $this->connection->describeTable($this->tableMaintainer->getMainTmpTable((int)$store->getId()))
         );
         $this->batchSizeManagement->ensureBatchSize($this->connection, $this->batchRowsCount);
-        $batches = $this->batchProvider->getBatches(
-            $this->connection,
-            $entityMetadata->getEntityTable(),
+
+        $select = $this->connection->select();
+        $select->distinct(true);
+        $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
+
+        $batchQueries = $this->prepareSelectsByRange(
+            $select,
             $entityMetadata->getIdentifierField(),
-            $this->batchRowsCount
+            (int)$this->batchRowsCount
         );
-        foreach ($batches as $batch) {
-            $this->connection->delete($this->tableMaintainer->getMainTmpTable($store->getId()));
+
+        foreach ($batchQueries as $query) {
+            $this->connection->delete($this->tableMaintainer->getMainTmpTable((int)$store->getId()));
+            $entityIds = $this->connection->fetchCol($query);
             $resultSelect = clone $basicSelect;
-            $select = $this->connection->select();
-            $select->distinct(true);
-            $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-            $entityIds = $this->batchProvider->getBatchIds($this->connection, $select, $batch);
             $resultSelect->where($whereCondition, $entityIds);
             $this->connection->query(
                 $this->connection->insertFromSelect(
                     $resultSelect,
-                    $this->tableMaintainer->getMainTmpTable($store->getId()),
+                    $this->tableMaintainer->getMainTmpTable((int)$store->getId()),
                     $columns,
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+                    AdapterInterface::INSERT_ON_DUPLICATE
                 )
             );
             $this->publishData($store);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
index 802176092d147..ed8f692885d91 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
@@ -7,26 +7,41 @@
 
 namespace Magento\Catalog\Model\Indexer\Product\Eav\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Query\BatchIteratorInterface;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Indexer\BatchProviderInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Class Full reindex action
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
+class Full extends AbstractAction
 {
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     private $metadataPool;
 
     /**
-     * @var \Magento\Framework\Indexer\BatchProviderInterface
+     * @var BatchProviderInterface
      */
     private $batchProvider;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator
+     * @var BatchSizeCalculator
      */
     private $batchSizeCalculator;
 
@@ -36,44 +51,54 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
     private $activeTableSwitcher;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     private $scopeConfig;
 
     /**
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory
-     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
-     * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator $batchSizeCalculator
+     * @var QueryGenerator|null
+     */
+    private $batchQueryGenerator;
+
+    /**
+     * @param DecimalFactory $eavDecimalFactory
+     * @param SourceFactory $eavSourceFactory
+     * @param MetadataPool|null $metadataPool
+     * @param BatchProviderInterface|null $batchProvider
+     * @param BatchSizeCalculator $batchSizeCalculator
      * @param ActiveTableSwitcher|null $activeTableSwitcher
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface|null $scopeConfig
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @param QueryGenerator|null $batchQueryGenerator
      */
     public function __construct(
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
-        \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator $batchSizeCalculator = null,
+        DecimalFactory $eavDecimalFactory,
+        SourceFactory $eavSourceFactory,
+        MetadataPool $metadataPool = null,
+        BatchProviderInterface $batchProvider = null,
+        BatchSizeCalculator $batchSizeCalculator = null,
         ActiveTableSwitcher $activeTableSwitcher = null,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null
+        ScopeConfigInterface $scopeConfig = null,
+        QueryGenerator $batchQueryGenerator = null
     ) {
-        $this->scopeConfig = $scopeConfig ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(
+            ScopeConfigInterface::class
         );
         parent::__construct($eavDecimalFactory, $eavSourceFactory, $scopeConfig);
-        $this->metadataPool = $metadataPool ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\EntityManager\MetadataPool::class
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(
+            MetadataPool::class
         );
-        $this->batchProvider = $batchProvider ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Indexer\BatchProviderInterface::class
+        $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(
+            BatchProviderInterface::class
         );
-        $this->batchSizeCalculator = $batchSizeCalculator ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator::class
+        $this->batchSizeCalculator = $batchSizeCalculator ?: ObjectManager::getInstance()->get(
+            BatchSizeCalculator::class
         );
-        $this->activeTableSwitcher = $activeTableSwitcher ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+        $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()->get(
             ActiveTableSwitcher::class
         );
+        $this->batchQueryGenerator = $batchQueryGenerator ?: ObjectManager::getInstance()->get(
+            QueryGenerator::class
+        );
     }
 
     /**
@@ -81,10 +106,10 @@ public function __construct(
      *
      * @param array|int|null $ids
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute($ids = null)
+    public function execute($ids = null): void
     {
         if (!$this->isEavIndexerEnabled()) {
             return;
@@ -94,20 +119,21 @@ public function execute($ids = null)
                 $connection = $indexer->getConnection();
                 $mainTable = $this->activeTableSwitcher->getAdditionalTableName($indexer->getMainTable());
                 $connection->truncateTable($mainTable);
-                $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-                $batches = $this->batchProvider->getBatches(
-                    $connection,
-                    $entityMetadata->getEntityTable(),
+                $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
+
+                $select = $connection->select();
+                $select->distinct(true);
+                $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
+
+                $batchQueries = $this->batchQueryGenerator->generate(
                     $entityMetadata->getIdentifierField(),
-                    $this->batchSizeCalculator->estimateBatchSize($connection, $indexerName)
+                    $select,
+                    $this->batchSizeCalculator->estimateBatchSize($connection, $indexerName),
+                    BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
                 );
 
-                foreach ($batches as $batch) {
-                    /** @var \Magento\Framework\DB\Select $select */
-                    $select = $connection->select();
-                    $select->distinct(true);
-                    $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-                    $entityIds = $this->batchProvider->getBatchIds($connection, $select, $batch);
+                foreach ($batchQueries as $query) {
+                    $entityIds = $connection->fetchCol($query);
                     if (!empty($entityIds)) {
                         $indexer->reindexEntities($this->processRelations($indexer, $entityIds, true));
                         $this->syncData($indexer, $mainTable);
@@ -116,14 +142,14 @@ public function execute($ids = null)
                 $this->activeTableSwitcher->switchTable($indexer->getConnection(), [$indexer->getMainTable()]);
             }
         } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
+            throw new LocalizedException(__($e->getMessage()), $e);
         }
     }
 
     /**
      * @inheritdoc
      */
-    protected function syncData($indexer, $destinationTable, $ids = null)
+    protected function syncData($indexer, $destinationTable, $ids = null): void
     {
         $connection = $indexer->getConnection();
         $connection->beginTransaction();
@@ -136,7 +162,7 @@ protected function syncData($indexer, $destinationTable, $ids = null)
                 $select,
                 $destinationTable,
                 $targetColumns,
-                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+                AdapterInterface::INSERT_ON_DUPLICATE
             );
             $connection->query($query);
             $connection->commit();
@@ -155,7 +181,7 @@ private function isEavIndexerEnabled(): bool
     {
         $eavIndexerStatus = $this->scopeConfig->getValue(
             self::ENABLE_EAV_INDEXER,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
 
         return (bool)$eavIndexerStatus;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
index 1a75751570658..858eba3ab217a 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
@@ -3,41 +3,64 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Indexer\Product\Price\Action;
 
+use Magento\Catalog\Model\Indexer\Product\Price\AbstractAction;
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Query\BatchIterator;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
+use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Indexer\BatchProviderInterface;
 use Magento\Framework\Indexer\DimensionalIndexerInterface;
 use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Indexer\Model\ProcessManager;
 use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Full reindex action
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
+class Full extends AbstractAction
 {
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     private $metadataPool;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator
+     * @var BatchSizeCalculator
      */
     private $batchSizeCalculator;
 
     /**
-     * @var \Magento\Framework\Indexer\BatchProviderInterface
+     * @var BatchProviderInterface
      */
     private $batchProvider;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+     * @var ActiveTableSwitcher
      */
     private $activeTableSwitcher;
 
@@ -47,54 +70,61 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
     private $productMetaDataCached;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory
+     * @var DimensionCollectionFactory
      */
     private $dimensionCollectionFactory;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer
+     * @var TableMaintainer
      */
     private $dimensionTableMaintainer;
 
     /**
-     * @var \Magento\Indexer\Model\ProcessManager
+     * @var ProcessManager
      */
     private $processManager;
 
     /**
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Catalog\Model\Product\Type $catalogProductType
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $defaultIndexerResource
-     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator|null $batchSizeCalculator
-     * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
-     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
-     * @param \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory|null $dimensionCollectionFactory
-     * @param \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer|null $dimensionTableMaintainer
-     * @param \Magento\Indexer\Model\ProcessManager $processManager
+     * @var QueryGenerator|null
+     */
+    private $batchQueryGenerator;
+
+    /**
+     * @param ScopeConfigInterface $config
+     * @param StoreManagerInterface $storeManager
+     * @param CurrencyFactory $currencyFactory
+     * @param TimezoneInterface $localeDate
+     * @param DateTime $dateTime
+     * @param Type $catalogProductType
+     * @param Factory $indexerPriceFactory
+     * @param DefaultPrice $defaultIndexerResource
+     * @param MetadataPool|null $metadataPool
+     * @param BatchSizeCalculator|null $batchSizeCalculator
+     * @param BatchProviderInterface|null $batchProvider
+     * @param ActiveTableSwitcher|null $activeTableSwitcher
+     * @param DimensionCollectionFactory|null $dimensionCollectionFactory
+     * @param TableMaintainer|null $dimensionTableMaintainer
+     * @param ProcessManager $processManager
+     * @param QueryGenerator|null $batchQueryGenerator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-        \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Catalog\Model\Product\Type $catalogProductType,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $defaultIndexerResource,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator $batchSizeCalculator = null,
-        \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null,
-        \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory $dimensionCollectionFactory = null,
-        \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer $dimensionTableMaintainer = null,
-        \Magento\Indexer\Model\ProcessManager $processManager = null
+        ScopeConfigInterface $config,
+        StoreManagerInterface $storeManager,
+        CurrencyFactory $currencyFactory,
+        TimezoneInterface $localeDate,
+        DateTime $dateTime,
+        Type $catalogProductType,
+        Factory $indexerPriceFactory,
+        DefaultPrice $defaultIndexerResource,
+        MetadataPool $metadataPool = null,
+        BatchSizeCalculator $batchSizeCalculator = null,
+        BatchProviderInterface $batchProvider = null,
+        ActiveTableSwitcher $activeTableSwitcher = null,
+        DimensionCollectionFactory $dimensionCollectionFactory = null,
+        TableMaintainer $dimensionTableMaintainer = null,
+        ProcessManager $processManager = null,
+        QueryGenerator $batchQueryGenerator = null
     ) {
         parent::__construct(
             $config,
@@ -107,26 +137,27 @@ public function __construct(
             $defaultIndexerResource
         );
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(
-            \Magento\Framework\EntityManager\MetadataPool::class
+            MetadataPool::class
         );
         $this->batchSizeCalculator = $batchSizeCalculator ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator::class
+            BatchSizeCalculator::class
         );
         $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(
-            \Magento\Framework\Indexer\BatchProviderInterface::class
+            BatchProviderInterface::class
         );
         $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class
+            ActiveTableSwitcher::class
         );
         $this->dimensionCollectionFactory = $dimensionCollectionFactory ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
+            DimensionCollectionFactory::class
         );
         $this->dimensionTableMaintainer = $dimensionTableMaintainer ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer::class
+            TableMaintainer::class
         );
         $this->processManager = $processManager ?: ObjectManager::getInstance()->get(
-            \Magento\Indexer\Model\ProcessManager::class
+            ProcessManager::class
         );
+        $this->batchQueryGenerator = $batchQueryGenerator ?? ObjectManager::getInstance()->get(QueryGenerator::class);
     }
 
     /**
@@ -137,13 +168,13 @@ public function __construct(
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute($ids = null)
+    public function execute($ids = null): void
     {
         try {
             //Prepare indexer tables before full reindex
             $this->prepareTables();
 
-            /** @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $indexer */
+            /** @var DefaultPrice $indexer */
             foreach ($this->getTypeIndexers(true) as $typeId => $priceIndexer) {
                 if ($priceIndexer instanceof DimensionalIndexerInterface) {
                     //New price reindex mechanism
@@ -170,7 +201,7 @@ public function execute($ids = null)
      * @return void
      * @throws \Exception
      */
-    private function prepareTables()
+    private function prepareTables(): void
     {
         $this->_defaultIndexerResource->getTableStrategy()->setUseIdxTable(false);
 
@@ -185,7 +216,7 @@ private function prepareTables()
      * @return void
      * @throws \Exception
      */
-    private function truncateReplicaTables()
+    private function truncateReplicaTables(): void
     {
         foreach ($this->dimensionCollectionFactory->create() as $dimension) {
             $dimensionTable = $this->dimensionTableMaintainer->getMainReplicaTable($dimension);
@@ -202,12 +233,12 @@ private function truncateReplicaTables()
      * @return void
      * @throws \Exception
      */
-    private function reindexProductTypeWithDimensions(DimensionalIndexerInterface $priceIndexer, string $typeId)
+    private function reindexProductTypeWithDimensions(DimensionalIndexerInterface $priceIndexer, string $typeId): void
     {
         $userFunctions = [];
         foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
             $userFunctions[] = function () use ($priceIndexer, $dimensions, $typeId) {
-                return $this->reindexByBatches($priceIndexer, $dimensions, $typeId);
+                $this->reindexByBatches($priceIndexer, $dimensions, $typeId);
             };
         }
         $this->processManager->execute($userFunctions);
@@ -223,10 +254,13 @@ private function reindexProductTypeWithDimensions(DimensionalIndexerInterface $p
      * @return void
      * @throws \Exception
      */
-    private function reindexByBatches(DimensionalIndexerInterface $priceIndexer, array $dimensions, string $typeId)
-    {
+    private function reindexByBatches(
+        DimensionalIndexerInterface $priceIndexer,
+        array $dimensions,
+        string $typeId
+    ): void {
         foreach ($this->getBatchesForIndexer($typeId) as $batch) {
-            $this->reindexByBatchWithDimensions($priceIndexer, $batch, $dimensions, $typeId);
+            $this->reindexByBatchWithDimensions($priceIndexer, $batch, $dimensions);
         }
     }
 
@@ -235,16 +269,20 @@ private function reindexByBatches(DimensionalIndexerInterface $priceIndexer, arr
      *
      * @param string $typeId
      *
-     * @return \Generator
+     * @return BatchIterator
      * @throws \Exception
      */
-    private function getBatchesForIndexer(string $typeId)
+    private function getBatchesForIndexer(string $typeId): BatchIterator
     {
         $connection = $this->_defaultIndexerResource->getConnection();
-        return $this->batchProvider->getBatches(
-            $connection,
-            $this->getProductMetaData()->getEntityTable(),
+        $entityMetadata = $this->getProductMetaData();
+        $select = $connection->select();
+        $select->distinct(true);
+        $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
+
+        return $this->batchQueryGenerator->generate(
             $this->getProductMetaData()->getIdentifierField(),
+            $select,
             $this->batchSizeCalculator->estimateBatchSize(
                 $connection,
                 $typeId
@@ -256,20 +294,18 @@ private function getBatchesForIndexer(string $typeId)
      * Reindex by batch for new 'Dimensional' price indexer
      *
      * @param DimensionalIndexerInterface $priceIndexer
-     * @param array $batch
+     * @param Select $batchQuery
      * @param array $dimensions
-     * @param string $typeId
      *
      * @return void
      * @throws \Exception
      */
     private function reindexByBatchWithDimensions(
         DimensionalIndexerInterface $priceIndexer,
-        array $batch,
-        array $dimensions,
-        string $typeId
-    ) {
-        $entityIds = $this->getEntityIdsFromBatch($typeId, $batch);
+        Select $batchQuery,
+        array $dimensions
+    ): void {
+        $entityIds = $this->getEntityIdsFromBatch($batchQuery);
 
         if (!empty($entityIds)) {
             $this->dimensionTableMaintainer->createMainTmpTable($dimensions);
@@ -295,10 +331,10 @@ private function reindexByBatchWithDimensions(
      * @return void
      * @throws \Exception
      */
-    private function reindexProductType(PriceInterface $priceIndexer, string $typeId)
+    private function reindexProductType(PriceInterface $priceIndexer, string $typeId): void
     {
         foreach ($this->getBatchesForIndexer($typeId) as $batch) {
-            $this->reindexBatch($priceIndexer, $batch, $typeId);
+            $this->reindexBatch($priceIndexer, $batch);
         }
     }
 
@@ -306,15 +342,13 @@ private function reindexProductType(PriceInterface $priceIndexer, string $typeId
      * Reindex by batch for old price indexer
      *
      * @param PriceInterface $priceIndexer
-     * @param array $batch
-     * @param string $typeId
-     *
+     * @param Select $batch
      * @return void
      * @throws \Exception
      */
-    private function reindexBatch(PriceInterface $priceIndexer, array $batch, string $typeId)
+    private function reindexBatch(PriceInterface $priceIndexer, Select $batch): void
     {
-        $entityIds = $this->getEntityIdsFromBatch($typeId, $batch);
+        $entityIds = $this->getEntityIdsFromBatch($batch);
 
         if (!empty($entityIds)) {
             // Temporary table will created if not exists
@@ -339,27 +373,15 @@ private function reindexBatch(PriceInterface $priceIndexer, array $batch, string
     /**
      * Get Entity Ids from batch
      *
-     * @param string $typeId
-     * @param array $batch
-     *
+     * @param Select $batch
      * @return array
      * @throws \Exception
      */
-    private function getEntityIdsFromBatch(string $typeId, array $batch)
+    private function getEntityIdsFromBatch(Select $batch): array
     {
         $connection = $this->_defaultIndexerResource->getConnection();
 
-        // Get entity ids from batch
-        $select = $connection
-            ->select()
-            ->distinct(true)
-            ->from(
-                ['e' => $this->getProductMetaData()->getEntityTable()],
-                $this->getProductMetaData()->getIdentifierField()
-            )
-            ->where('type_id = ?', $typeId);
-
-        return $this->batchProvider->getBatchIds($connection, $select, $batch);
+        return $connection->fetchCol($batch);
     }
 
     /**
@@ -368,7 +390,7 @@ private function getEntityIdsFromBatch(string $typeId, array $batch)
      * @return EntityMetadataInterface
      * @throws \Exception
      */
-    private function getProductMetaData()
+    private function getProductMetaData(): EntityMetadataInterface
     {
         if ($this->productMetaDataCached === null) {
             $this->productMetaDataCached = $this->metadataPool->getMetadata(ProductInterface::class);
@@ -383,7 +405,7 @@ private function getProductMetaData()
      * @return string
      * @throws \Exception
      */
-    private function getReplicaTable()
+    private function getReplicaTable(): string
     {
         return $this->activeTableSwitcher->getAdditionalTableName(
             $this->_defaultIndexerResource->getMainTable()
@@ -394,8 +416,9 @@ private function getReplicaTable()
      * Replacement of tables from replica to main
      *
      * @return void
+     * @throws \Zend_Db_Statement_Exception
      */
-    private function switchTables()
+    private function switchTables(): void
     {
         // Switch dimension tables
         $mainTablesByDimension = [];
@@ -417,13 +440,14 @@ private function switchTables()
 
     /**
      * Move data from old price indexer mechanism to new indexer mechanism by dimensions.
+     *
      * Used only for backward compatibility
      *
      * @param array $dimensions
-     *
      * @return void
+     * @throws \Zend_Db_Statement_Exception
      */
-    private function moveDataFromReplicaTableToReplicaTables(array $dimensions)
+    private function moveDataFromReplicaTableToReplicaTables(array $dimensions): void
     {
         if (!$dimensions) {
             return;
@@ -455,17 +479,17 @@ private function moveDataFromReplicaTableToReplicaTables(array $dimensions)
                 $select,
                 $replicaTablesByDimension,
                 [],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+                AdapterInterface::INSERT_ON_DUPLICATE
             )
         );
     }
 
     /**
-     * @deprecated
+     * Retrieves the index table that should be used
      *
-     * @inheritdoc
+     * @deprecated
      */
-    protected function getIndexTargetTable()
+    protected function getIndexTargetTable(): string
     {
         return $this->activeTableSwitcher->getAdditionalTableName($this->_defaultIndexerResource->getMainTable());
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php
index f78048424b42c..3863cf2457247 100644
--- a/app/code/Magento/Catalog/Model/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/Product/Action.php
@@ -168,5 +168,7 @@ public function updateWebsites($productIds, $websiteIds, $type)
         if (!$categoryIndexer->isScheduled()) {
             $categoryIndexer->reindexList(array_unique($productIds));
         }
+
+        $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index e346c912dccaa..db967052cb7a5 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -165,19 +165,6 @@ protected function modifyPriceData($object, $data)
         /** @var \Magento\Catalog\Model\Product $object */
         $data = parent::modifyPriceData($object, $data);
         $price = $object->getPrice();
-
-        $specialPrice = $object->getSpecialPrice();
-        $specialPriceFromDate = $object->getSpecialFromDate();
-        $specialPriceToDate = $object->getSpecialToDate();
-        $today = time();
-
-        if ($specialPrice && ($object->getPrice() > $object->getFinalPrice())) {
-            if ($today >= strtotime($specialPriceFromDate) && $today <= strtotime($specialPriceToDate) ||
-                $today >= strtotime($specialPriceFromDate) && $specialPriceToDate === null) {
-                $price = $specialPrice;
-            }
-        }
-
         foreach ($data as $key => $tierPrice) {
             $percentageValue = $this->getPercentage($tierPrice);
             if ($percentageValue) {
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
index 692487c1d60cd..a544be434f9c5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
@@ -11,9 +11,13 @@
         <arguments>
             <argument name="product" defaultValue="product"/>
         </arguments>
-        <amOnPage url="/{{product.name}}.html" stepKey="navigateProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url(product.custom_attributes[url_key])}}" stepKey="goToProductPage"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
-        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
-        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
+        <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>
+        <waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAddToCart}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAddToCart"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" time="30" stepKey="waitForProductAddedMessage"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{product.name}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
index 89bfc1ac19eb2..90d732c9654e1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
@@ -231,6 +231,23 @@
         <waitForPageLoad stepKey="waitForStoreViewChangeLoad"/>
     </actionGroup>
 
+    <actionGroup name="switchCategoryToAllStoreView">
+        <arguments>
+            <argument name="CatName"/>
+        </arguments>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatName)}}" stepKey="navigateToCreatedCategory" />
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSpinner1"/>
+        <scrollToTopOfPage stepKey="scrollToToggle"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}" stepKey="openStoreViewDropDown"/>
+        <click selector="{{AdminCategoryMainActionsSection.allStoreViews}}" stepKey="clickStoreViewByName"/>
+        <see selector="{{AdminCategoryMainActionsSection.storeSwitcher}}" userInput="All Store Views" stepKey="seeAllStoreView"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSpinner2"/>
+        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}" stepKey="selectStoreViewAccept"/>
+        <waitForPageLoad stepKey="waitForStoreViewChangeLoad"/>
+    </actionGroup>
+
     <actionGroup name="navigateToCreatedCategory">
         <arguments>
             <argument name="Category"/>
@@ -285,4 +302,18 @@
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveProductMessage"/>
     </actionGroup>
+    <actionGroup name="FillCategoryNameAndUrlKeyAndSave">
+        <arguments>
+            <argument name="categoryName" type="string"/>
+            <argument name="categoryUrlKey" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryName}}" stepKey="enterCategoryName"/>
+        <scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="scrollToSearchEngineOptimization"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{categoryUrlKey}}" stepKey="enterURLKey"/>
+        <scrollToTopOfPage stepKey="scrollToTheTopOfPage"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 3afdc41888c79..da570f9ed99b0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -15,12 +15,12 @@
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForElementVisible selector="{{AdminProductGridActionSection.addTypeProduct(product.type_id)}}" stepKey="waitForAddProductDropdown" time="30"/>
         <click selector="{{AdminProductGridActionSection.addTypeProduct(product.type_id)}}" stepKey="clickAddProductType"/>
-        <waitForPageLoad stepKey="waitForCreateProductPageLoad"/>
+        <waitForPageLoad time="30" stepKey="waitForCreateProductPageLoad"/>
         <seeInCurrentUrl url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, product.type_id)}}" stepKey="seeNewProductUrl"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeNewProductTitle"/>
     </actionGroup>
 
-    <!--Fill main fields in create product form-->
+    <!-- Fill main fields in create product form using a product entity -->
     <actionGroup name="fillMainProductForm">
         <arguments>
             <argument name="product" defaultValue="_defaultProduct"/>
@@ -34,6 +34,25 @@
         <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="fillProductWeight"/>
     </actionGroup>
 
+    <!-- Fill main fields in create product form using strings for flexibility -->
+    <actionGroup name="FillMainProductFormByString">
+        <arguments>
+            <argument name="productName" type="string"/>
+            <argument name="productSku" type="string"/>
+            <argument name="productPrice" type="string"/>
+            <argument name="productQuantity" type="string"/>
+            <argument name="productStatus" type="string"/>
+            <argument name="productWeight" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{productName}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{productSku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{productPrice}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{productQuantity}}" stepKey="fillProductQty"/>
+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{productStatus}}" stepKey="selectStockStatus"/>
+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has weight" stepKey="selectWeight"/>
+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{productWeight}}" stepKey="fillProductWeight"/>
+    </actionGroup>
+
     <!--Fill main fields in create product form with no weight, useful for virtual and downloadable products -->
     <actionGroup name="fillMainProductFormNoWeight">
         <arguments>
@@ -77,6 +96,11 @@
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
     </actionGroup>
 
+    <!-- Save product but do not expect a success message -->
+    <actionGroup name="SaveProductFormNoSuccessCheck" extends="saveProductForm">
+        <remove keyForRemoval="seeSaveConfirmation"/>
+    </actionGroup>
+
     <!--Upload image for product-->
     <actionGroup name="addProductImage">
         <arguments>
@@ -180,12 +204,14 @@
         <arguments>
             <argument name="website" type="string"/>
         </arguments>
-        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="ScrollToWebsites"/>
-        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="ClickTpOpenProductInWebsite"/>
+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{ProductInWebsitesSection.website(website)}}" visible="false" stepKey="clickToOpenProductInWebsite"/>
         <waitForPageLoad stepKey="waitForPageOpened"/>
-        <click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="SelectWebsite"/>
+        <click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct"/>
-        <waitForPageLoad time='60' stepKey="waitForPageOpened1"/>
+        <waitForPageLoad time='60' stepKey="waitForProducrSaved"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSaveSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveSuccessMessage"/>
     </actionGroup>
 
     <actionGroup name="ProductSetAdvancedPricing">
@@ -387,6 +413,22 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
         <fillField userInput="{{product.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
     </actionGroup>
+
+    <actionGroup name="SetProductUrlKeyByString">
+        <arguments>
+            <argument name="urlKey" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+    </actionGroup>
+
+    <actionGroup name="SetCategoryByName">
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{categoryName}}]" stepKey="searchAndSelectCategory"/>
+    </actionGroup>
+
     <actionGroup name="expandAdminProductSection">
         <arguments>
             <argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
index acf7800dfed7c..2914ecc470220 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
@@ -74,4 +74,21 @@
         <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
     </actionGroup>
+
+    <!-- Delete attribute set -->
+    <actionGroup name="deleteAttributeSetByLabel">
+        <arguments>
+            <argument name="label" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
+        <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="{{label}}" stepKey="filterByName"/>
+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch"/>
+        <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+        <waitForPageLoad stepKey="waitForClick"/>
+        <click selector="{{AdminProductAttributeSetSection.deleteBtn}}" stepKey="clickDelete"/>
+        <click selector="{{AdminProductAttributeSetSection.modalOk}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="The attribute set has been removed." stepKey="seeDeleteMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index c9d70319c2877..cbdabe6a2d218 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -192,7 +192,7 @@
         </arguments>
         <!--TODO use other action group for filtering grid when MQE-539 is implemented -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
         <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
@@ -201,8 +201,9 @@
         <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
         <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
         <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
-        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
-        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmProductDelete"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="record(s) have been deleted." stepKey="seeSuccessMessage"/>
     </actionGroup>
 
     <actionGroup name="deleteProductByName" extends="deleteProductBySku">
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAttributeDeletionErrorMessageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAttributeDeletionErrorMessageActionGroup.xml
new file mode 100644
index 0000000000000..9402ac05d79a5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAttributeDeletionErrorMessageActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertAttributeDeletionErrorMessageActionGroup">
+        <waitForElementVisible selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="waitForErrorMessage"/>
+        <see selector="{{AdminProductMessagesSection.errorMessage}}" userInput="This attribute is used in configurable products." stepKey="deleteProductAttributeFailureMessage"/>
+    </actionGroup>
+</actionGroups>
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductAttributePresenceInCatalogProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductAttributePresenceInCatalogProductGridActionGroup.xml
new file mode 100644
index 0000000000000..25390e6b4a80b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductAttributePresenceInCatalogProductGridActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertProductAttributePresenceInCatalogProductGridActionGroup">
+        <arguments>
+            <argument name="productAttribute" type="entity"/>
+        </arguments>
+         <waitForPageLoad stepKey="waitForCatalogProductGridPageLoad"/>
+        <seeElement selector="{{AdminGridHeaders.headerByName(productAttribute.label)}}" stepKey="seeAttributeInHeaders"/>
+    </actionGroup>
+</actionGroups>
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml
new file mode 100644
index 0000000000000..7917fe68aaebc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml
@@ -0,0 +1,22 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertProductInfoOnEditPageActionGroup" extends="OpenEditProductOnBackendActionGroup">
+        <arguments>
+            <argument name="product" type="entity"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="seeProductQuantity"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="seeProductStockStatus"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml
new file mode 100644
index 0000000000000..963c9d9f1c911
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertProductOnAdminGridActionGroup" extends="viewProductInAdminGrid">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+       <remove keyForRemoval="clickClearFiltersAfter"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml
new file mode 100644
index 0000000000000..575cbdcd9b6dc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+<actionGroup name="DeleteProductAttributeByAttributeCodeActionGroup">
+    <arguments>
+        <argument name="productAttributeCode" type="string"/>
+    </arguments>
+    <waitForPageLoad stepKey="waitForViewAdminProductAttributeLoad" time="30" />
+    <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
+    <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="clickOnConfirmOk"/>
+    <waitForPageLoad stepKey="waitForViewProductAttributePageLoad"/>
+</actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml
new file mode 100644
index 0000000000000..31b024c82a9a0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="OpenProductAttributeFromSearchResultInGridActionGroup" extends="SearchAttributeByCodeOnProductAttributeGridActionGroup">
+        <arguments>
+            <argument name="productAttributeCode" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" stepKey="waitForAdminProductAttributeGridLoad"/>
+        <click selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" stepKey="clickAttributeToView"/>
+        <waitForPageLoad stepKey="waitForViewAdminProductAttributeLoad" />
+   </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAttributeByCodeOnProductAttributeGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAttributeByCodeOnProductAttributeGridActionGroup.xml
new file mode 100644
index 0000000000000..67cdd8192fcb4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAttributeByCodeOnProductAttributeGridActionGroup.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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SearchAttributeByCodeOnProductAttributeGridActionGroup">
+        <arguments>
+            <argument name="productAttributeCode" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <waitForPageLoad stepKey="waitForAdminProductAttributeGridLoad"/>
+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
+        <waitForPageLoad stepKey="waitForAdminProductAttributeGridSectionLoad"/>
+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{productAttributeCode}}" stepKey="setAttributeCode"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOnGridToDisappear"/>
+        <see selector="{{AdminProductAttributeGridSection.attributeCodeColumn}}" userInput="{{productAttributeCode}}" stepKey="seeAttributeCodeInGrid"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..1bb7c179dfca8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
@@ -0,0 +1,22 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertProductImagesOnProductPageActionGroup">
+        <arguments>
+            <argument name="productImage" type="string" defaultValue="Magento_Catalog/images/product/placeholder/image.jpg" />
+        </arguments>
+        <waitForElementNotVisible selector="{{StorefrontProductMediaSection.gallerySpinner}}" stepKey="waitGallerySpinnerDisappear" />
+        <seeElement selector="{{StorefrontProductMediaSection.gallery}}" stepKey="seeProductGallery" />
+        <seeElement selector="{{StorefrontProductMediaSection.productImage(productImage)}}" stepKey="seeProductImage" />
+        <click selector="{{StorefrontProductMediaSection.productImage(productImage)}}" stepKey="openFullscreenImage" />
+        <waitForPageLoad stepKey="waitForGalleryLoaded" />
+        <seeElement selector="{{StorefrontProductMediaSection.productImageFullscreen(productImage)}}" stepKey="seeFullscreenProductImage" />
+        <click selector="{{StorefrontProductMediaSection.closeFullscreenImage}}" stepKey="closeFullScreenImage" />
+        <waitForPageLoad stepKey="waitForGalleryDisappear" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..6cb156723b286
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertProductNameOnProductPageActionGroup">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{productName}}" stepKey="seeProductName" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..3c62ef89e584b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertProductPriceOnProductPageActionGroup">
+        <arguments>
+            <argument name="productPrice" type="string"/>
+        </arguments>
+        <see selector="{{StorefrontProductInfoMainSection.price}}" userInput="{{productPrice}}" stepKey="seeProductPrice" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..85d3927a6d6d0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertProductSkuOnProductPageActionGroup">
+        <arguments>
+            <argument name="productSku" type="string"/>
+        </arguments>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{productSku}}" stepKey="seeProductSku" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml
new file mode 100644
index 0000000000000..f5fabae5fc4ce
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontOpenProductPageActionGroup">
+        <arguments>
+            <argument name="productUrl" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontProductPage.url(productUrl)}}" stepKey="openProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoaded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
new file mode 100644
index 0000000000000..aec21f3bc48c9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="VerifyProductTypeOrder">
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <waitForPageLoad stepKey="waitForLoad"/>
+        <seeElement stepKey="seeSimpleInOrder" selector="{{AdminProductDropdownOrderSection.simpleProduct}}"/>
+        <seeElement stepKey="seeVirtualInOrder" selector="{{AdminProductDropdownOrderSection.virtualProduct}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml
new file mode 100644
index 0000000000000..31783526932b6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.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="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="specialProductPrice" type="catalogSpecialPrice">
+        <data key="price">99.99</data>
+        <data key="store_id">0</data>
+        <var key="sku" entityType="product2" entityKey="sku" />
+    </entity>
+    <entity name="specialProductPrice2" type="catalogSpecialPrice">
+        <data key="price">55.55</data>
+        <data key="store_id">0</data>
+        <var key="sku" entityType="product" entityKey="sku" />
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
index 6e1db92f5a040..134abcaa50354 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -52,6 +52,27 @@
         <data key="used_for_sort_by">true</data>
         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
     </entity>
+    <entity name="productAttributeWithTwoOptionsNotVisible" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">test_attr_</data>
+        <data key="frontend_input">select</data>
+        <data key="scope">global</data>
+        <data key="is_required">false</data>
+        <data key="is_unique">false</data>
+        <data key="is_searchable">false</data>
+        <data key="is_visible">true</data>
+        <data key="is_visible_in_advanced_search">false</data>
+        <data key="is_visible_on_front">false</data>
+        <data key="is_filterable">false</data>
+        <data key="is_filterable_in_search">false</data>
+        <data key="used_in_product_listing">false</data>
+        <data key="is_used_for_promo_rules">false</data>
+        <data key="is_comparable">false</data>
+        <data key="is_used_in_grid">false</data>
+        <data key="is_visible_in_grid">false</data>
+        <data key="is_filterable_in_grid">false</data>
+        <data key="used_for_sort_by">false</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
     <entity name="productDropDownAttribute" type="ProductAttribute">
         <data key="attribute_code" unique="suffix">attribute</data>
         <data key="frontend_input">select</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index d812123e4b553..383797933074e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -60,6 +60,48 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="SimpleProductAfterImport1" type="product">
+        <data key="sku">SimpleProductForTest1</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name">SimpleProductAfterImport1</data>
+        <data key="price">250.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="urlKey">simple-product-for-test-1</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="SimpleProductAfterImport2" type="product">
+        <data key="sku">SimpleProductForTest2</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name">SimpleProductAfterImport2</data>
+        <data key="price">300.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="urlKey">simple-product-for-test-2</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="SimpleProductAfterImport3" type="product">
+        <data key="sku">SimpleProductForTest3</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name">SimpleProductAfterImport3</data>
+        <data key="price">350.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="urlKey">simple-product-for-test-3</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
     <entity name="SimpleProduct2" type="product">
         <data key="sku" unique="suffix">SimpleProduct</data>
         <data key="type_id">simple</data>
@@ -96,6 +138,31 @@
         <data key="quantity">0</data>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="SimpleOutOfStockProduct" type="product">
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">OutOfStockProduct</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">0</data>
+    </entity>
+    <!-- Simple Product Disabled -->
+    <entity name="SimpleProductOffline" type="product2">
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">SimpleOffline</data>
+        <data key="price">123.00</data>
+        <data key="status">2</data>
+        <data key="quantity">100</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
     <entity name="NewSimpleProduct" type="product">
         <data key="price">321.00</data>
     </entity>
@@ -110,6 +177,18 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
+    <entity name="ApiSimpleOutOfStock" type="product2">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Out Of Stock Product</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
     <entity name="ApiSimpleOne" type="product2">
         <data key="sku" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
@@ -349,6 +428,11 @@
         <var key="sku" entityType="product" entityKey="sku" />
         <requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>
     </entity>
+    <entity name="ProductWithTextFieldAndAreaOptions" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <requiredEntity type="product_option">ProductOptionField</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionArea</requiredEntity>
+    </entity>
     <entity name="ApiVirtualProductWithDescription" type="product">
         <data key="sku" unique="suffix">api-virtual-product</data>
         <data key="type_id">virtual</data>
@@ -869,4 +953,20 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="simpleProductWithoutCategory" type="product">
+        <data key="sku" unique="suffix">sku_simple_product_</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">560</data>
+        <data key="urlKey" unique="suffix">simple-product-</data>
+        <data key="status">1</data>
+        <data key="quantity">25</data>
+        <data key="weight">1</data>
+        <data key="product_has_weight">1</data>
+        <data key="is_in_stock">1</data>
+        <data key="tax_class_id">2</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
index a3a358fda44fd..e5070340421a9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
@@ -48,4 +48,12 @@
         <data key="price">500,000.00</data>
         <data key="qty">1</data>
     </entity>
+    <entity name="tierProductPrice" type="catalogTierPrice">
+        <data key="price">90.00</data>
+        <data key="price_type">fixed</data>
+        <data key="website_id">0</data>
+        <data key="customer_group">ALL GROUPS</data>
+        <data key="quantity">2</data>
+        <var key="sku" entityType="product2" entityKey="sku" />
+    </entity>
 </entities>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml
new file mode 100644
index 0000000000000..354277ad056f7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml
@@ -0,0 +1,22 @@
+<?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="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="catalogSpecialPrice" dataType="catalogSpecialPrice" type="create" auth="adminOauth" url="/V1/products/special-price" method="POST">
+        <contentType>application/json</contentType>
+        <object key="prices" dataType="catalogSpecialPrice">
+            <object dataType="catalogSpecialPrice" key="0">
+                <field key="price">number</field>
+                <field key="store_id">integer</field>
+                <field key="sku">string</field>
+                <field key="price_from">string</field>
+                <field key="price_to">string</field>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_tier_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_tier_price-meta.xml
new file mode 100644
index 0000000000000..7aa7530b0fda8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_tier_price-meta.xml
@@ -0,0 +1,23 @@
+<?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="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="catalogTierPrice" dataType="catalogTierPrice" type="create" auth="adminOauth" url="/V1/products/tier-prices" method="POST">
+        <contentType>application/json</contentType>
+        <object key="prices" dataType="catalogTierPrice">
+            <object dataType="catalogTierPrice" key="0">
+                <field key="price">number</field>
+                <field key="price_type">string</field>
+                <field key="website_id">integer</field>
+                <field key="sku">string</field>
+                <field key="customer_group">string</field>
+                <field key="quantity">integer</field>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
index 009110a729bde..e8adede5b2de6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
@@ -14,5 +14,7 @@
         <element name="CategoryStoreViewDropdownToggle" type="button" selector="#store-change-button"/>
         <element name="CategoryStoreViewOption" type="button" selector="//div[contains(@class, 'store-switcher')]//a[normalize-space()='{{store}}']" parameterized="true"/>
         <element name="CategoryStoreViewModalAccept" type="button" selector=".modal-popup.confirm._show .action-accept"/>
+        <element name="allStoreViews" type="button" selector=".store-switcher .store-switcher-all" timeout="30"/>
+        <element name="storeSwitcher" type="text" selector=".store-switcher"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
index fee86ca1caa29..ea4f4bf53eb71 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCategoryMessagesSection">
         <element name="SuccessMessage" type="text" selector=".message-success"/>
+        <element name="errorMessage" type="text" selector="//div[@class='message message-error error']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
index e218f5ae74fc0..2de7bf19fd378 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
@@ -15,7 +15,7 @@
         <element name="addValue" type="button" selector="//button[contains(@data-action,'add_new_row')]" timeout="30"/>
         <element name="defaultStoreView" type="input" selector="//input[contains(@name,'option[value][option_{{row}}][1]')]" parameterized="true"/>
         <element name="adminOption" type="input" selector="//input[contains(@name,'option[value][option_{{row}}][0]')]" parameterized="true"/>
-        <element name="defaultRadioButton" type="radio" selector="//tr[{{row}}]//input[contains(@name,'default[]')]/..//label" parameterized="true"/>
+        <element name="defaultRadioButton" type="radio" selector="//tr[{{row}}]//input[contains(@name,'default[]')]" parameterized="true"/>
         <element name="isRequired" type="checkbox" selector="//input[contains(@name,'is_required')]/..//label"/>
         <element name="advancedAttributeProperties" type="text" selector="//div[contains(@data-index,'advanced_fieldset')]"/>
         <element name="attributeCode" type="input" selector="//*[@class='admin__fieldset-wrapper-content admin__collapsible-content _show']//input[@name='attribute_code']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
index 263a445b0fc64..d24c501152b78 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
@@ -46,6 +46,7 @@
         <element name="StoreFrontPropertiesTab" selector="#product_attribute_tabs_front" type="button"/>
         <element name="EnableWYSIWYG" type="select" selector="#enabled"/>
         <element name="useForPromoRuleConditions" type="select" selector="#is_used_for_promo_rules"/>
+        <element name="StorefrontPropertiesSectionToggle" type="button" selector="#front_fieldset-wrapper"/>
     </section>
     <section name="WYSIWYGProductAttributeSection">
         <element name="ShowHideBtn" type="button" selector="#toggledefault_value_texteditor"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
new file mode 100644
index 0000000000000..b58fb2316f915
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductDropdownOrderSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductDropdownOrderSection">
+        <element name="simpleProduct" type="text" selector="//li[not(preceding-sibling::li)]//span[@title='Simple Product']"/>
+        <element name="virtualProduct" type="text" selector="//li[not(preceding-sibling::li[span[@title='Bundle Product']]) and not(preceding-sibling::li[span[@title='Downloadable Product']]) and not(following-sibling::li[span[@title='Simple Product']]) and not(following-sibling::li[span[@title='Configurable Product']]) and not(following-sibling::li[span[@title='Grouped Product']])]/span[@title='Virtual Product']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 656a844d49700..da282d06145aa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -13,17 +13,23 @@
         <element name="attributeSetFilterResult" type="input" selector="div[data-index='attribute_set_id'] .action-menu-item._last" timeout="30"/>
         <element name="attributeSetFilterResultByName" type="text" selector="//label/span[text() = '{{var}}']" timeout="30" parameterized="true"/>
         <element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
+        <element name="productNameDisabled" type="input" selector=".admin__field[data-index=name] input[disabled=true]"/>
         <element name="RequiredNameIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
         <element name="RequiredSkuIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=sku]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
         <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
+        <element name="productSkuDisabled" type="input" selector=".admin__field[data-index=sku] input[disabled=true]"/>
         <element name="enableProductAttributeLabel" type="text" selector="//span[text()='Enable Product']/parent::label"/>
         <element name="enableProductAttributeLabelWrapper" type="text" selector="//span[text()='Enable Product']/parent::label/parent::div"/>
         <element name="productStatus" type="checkbox" selector="input[name='product[status]']"/>
+        <element name="productStatusDisabled" type="checkbox" selector="input[name='product[status]'][disabled]"/>
         <element name="enableProductLabel" type="checkbox" selector="input[name='product[status]']+label"/>
         <element name="productStatusUseDefault" type="checkbox" selector="input[name='use_default[status]']"/>
         <element name="productNameUseDefault" type="checkbox" selector="input[name='use_default[name]']"/>
         <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
+        <element name="productPriceDisabled" type="input" selector=".admin__field[data-index=price] input[disabled=true]"/>
+        <element name="productPriceUseDefault" type="checkbox" selector=".admin__field[data-index=price] [name='use_default[price]']"/>
         <element name="productTaxClass" type="select" selector="//*[@name='product[tax_class_id]']"/>
+        <element name="productTaxClassDisabled" type="select" selector="select[name='product[tax_class_id]'][disabled=true]"/>
         <element name="productTaxClassUseDefault" type="checkbox" selector="input[name='use_default[tax_class_id]']"/>
         <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']" timeout="30"/>
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
@@ -31,6 +37,7 @@
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
         <element name="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]" timeout="30"/>
         <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']"/>
+        <element name="productStockStatusDisabled" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]'][disabled=true]"/>
         <element name="stockStatus" type="select" selector="[data-index='product-details'] select[name='product[quantity_and_stock_status][is_in_stock]']"/>
         <element name="productWeight" type="input" selector=".admin__field[data-index=weight] input"/>
         <element name="productWeightSelect" type="select" selector="select[name='product[product_has_weight]']"/>
@@ -48,6 +55,7 @@
         <element name="productFormTab" type="button" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]" parameterized="true"/>
         <element name="productFormTabState" type="text" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]/parent::*/parent::*[@data-state-collapsible='{{state}}']" parameterized="true"/>
         <element name="visibility" type="select" selector="//select[@name='product[visibility]']"/>
+        <element name="visibilityDisabled" type="select" selector="select[name='product[visibility]'][disabled=true]"/>
         <element name="visibilityUseDefault" type="checkbox" selector="//input[@name='use_default[visibility]']"/>
         <element name="divByDataIndex" type="input" selector="div[data-index='{{var}}']" parameterized="true"/>
         <element name="setProductAsNewFrom" type="input" selector="input[name='product[news_from_date]']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index 43345c69e6c04..939974248aabf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -28,6 +28,7 @@
         <element name="priceFilterTo" type="input" selector="input.admin__control-text[name='price[to]']"/>
         <element name="typeFilter" type="select" selector="select.admin__control-select[name='type_id']"/>
         <element name="statusFilter" type="select" selector="select.admin__control-select[name='status']"/>
+        <element name="firstRowBySku" type="button" selector="//div[text()='{{var}}']/ancestor::tr" parameterized="true" timeout="30"/>
         <element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
         <element name="keywordSearch" type="input" selector="input#fulltext"/>
         <element name="keywordSearchButton" type="button" selector=".data-grid-search-control-wrap button.action-submit" timeout="30"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index f35eb63ee0e0a..51b5a0242d976 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -32,5 +32,6 @@
         <!--<element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>-->
         <element name="ProductAddToCompareByName" type="text" selector="//*[contains(@class,'product-item-info')][descendant::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"/>
+        <element name="ProductStockUnavailable" type="text" selector="//*[text()='Out of stock']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
index 4dcda8dcd41ae..c58479a7b73e5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -11,6 +11,6 @@
     <section name="StorefrontMessagesSection">
         <element name="success" type="text" selector="div.message-success.success.message"/>
         <element name="error" type="text" selector="div.message-error.error.message"/>
-        <element name="noticeMessage" type="text" selector="div.message-notice"/>
+        <element name="noticeMessage" type="text" selector="div.message.notice div"/>
     </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 058f369ad139b..8393cee57996f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -13,6 +13,7 @@
         <element name="productName" type="text" selector=".base"/>
         <element name="productSku" type="text" selector=".product.attribute.sku>.value"/>
         <element name="productPriceLabel" type="text" selector=".price-label"/>
+        <element name="price" type="text" selector=".product-info-main [data-price-type='finalPrice']"/>
         <element name="productPrice" type="text" selector=".price-final_price"/>
         <element name="qty" type="input" selector="#qty"/>
         <element name="specialPrice" type="text" selector=".special-price"/>
@@ -74,6 +75,11 @@
         <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"/>
 
+        <!-- Special price selectors -->
+        <element name="productSpecialPrice" type="text" selector="//span[@data-price-type='finalPrice']/span"/>
+        <element name="specialProductText" type="text" selector="//span[text()='Regular Price']"/>
+        <element name="oldProductPrice" type="text" selector="//span[@data-price-type='oldPrice']/span"/>
+
         <!-- Customizable Option selectors -->
         <element name="allCustomOptionLabels" type="text" selector="#product-options-wrapper label"/>
         <element name="customOptionLabel" type="text" selector="//label[contains(., '{{customOptionTitle}}')]" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
index 45e0b03e8d995..ea10e12fb73f5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
@@ -9,6 +9,11 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontProductMediaSection">
+        <element name="gallerySpinner" type="block" selector="#maincontent .fotorama__spinner--show" />
+        <element name="gallery" type="block" selector="[data-gallery-role='gallery']" />
+        <element name="productImage" type="text" selector="//*[@data-gallery-role='gallery' and not(contains(@class, 'fullscreen'))]//img[contains(@src, '{{filename}}') and not(contains(@class, 'full'))]" parameterized="true" />
+        <element name="productImageFullscreen" type="text" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//img[contains(@src, '{{filename}}') and contains(@class, 'full')]" parameterized="true" />
+        <element name="closeFullscreenImage" type="button" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//*[@data-gallery-role='fotorama__fullscreen-icon']" />
         <element name="imageFile" type="text" selector="//*[@class='product media']//img[contains(@src, '{{filename}}')]" parameterized="true"/>
         <element name="productImageActive" type="text" selector=".product.media div[data-active=true] > img[src*='{{filename}}']" parameterized="true"/>
     </section>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
new file mode 100644
index 0000000000000..3027416ee520b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
@@ -0,0 +1,66 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminChangeProductAttributeSet">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="The required product attribute is not displayed when change attribute set"/>
+            <title value="Attributes from the selected attribute set should be shown"/>
+            <description value="Attributes from the selected attribute set should be shown"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-98452"/>
+            <useCaseId value="MAGETWO-98357"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <createData entity="productAttributeWithTwoOptions" stepKey="createProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createProductAttributeOption1">
+                <requiredEntity createDataKey="createProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createProductAttributeOption2">
+                <requiredEntity createDataKey="createProductAttribute"/>
+            </createData>
+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$$createAttributeSet.attribute_set_id$$}}/" stepKey="onAttributeSetEdit"/>
+            <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
+                <argument name="group" value="Product Details"/>
+                <argument name="attribute" value="$$createProductAttribute.attribute_code$$"/>
+            </actionGroup>
+            <actionGroup ref="SaveAttributeSet" stepKey="SaveAttributeSet"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
+            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
+        </after>
+
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="$$createAttributeSet.attribute_set_name$$" stepKey="searchForAttrSet"/>
+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
+
+        <waitForText userInput="$$createProductAttribute.default_frontend_label$$" stepKey="seeAttributeInForm"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
new file mode 100644
index 0000000000000..37ec4e0d32528
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
@@ -0,0 +1,41 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateDuplicateCategoryTest">
+        <annotations>
+            <stories value="Create category"/>
+            <title value="Create Duplicate Category With Already Existed UrlKey"/>
+            <description value="Login as admin and create duplicate category"/>
+            <testCaseId value="MC-14702"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Open Category Page and select Add category -->
+        <actionGroup ref="goToCreateCategoryPage" stepKey="goToCategoryPage"/>
+
+        <!-- Fill the Category form with same name and urlKey as initially created category(SimpleSubCategory) -->
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillCategoryForm">
+             <argument name="categoryName" value="$$category.name$$"/>
+             <argument name="categoryUrlKey" value="$$category.custom_attributes[url_key]$$"/>
+        </actionGroup>
+
+        <!-- Assert error message -->
+        <see selector="{{AdminCategoryMessagesSection.errorMessage}}" userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
new file mode 100644
index 0000000000000..575bb56912b25
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
@@ -0,0 +1,61 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateDuplicateProductTest">
+        <annotations>
+            <stories value="Create Product"/>
+            <title value="Create Duplicate Product With Existed Subcategory Name And UrlKey"/>
+            <description value="Login as admin and create duplicate Product"/>
+            <testCaseId value="MC-14714"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="SubCategory" stepKey="category"/>
+            <createData entity="Two_nested_categories" stepKey="subCategory">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="subCategory" stepKey="deleteSubCategory"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to new simple product page -->
+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="goToCreateProductPage"/>
+
+        <!-- Fill the main fields in the form -->
+        <actionGroup ref="FillMainProductFormByString" stepKey="fillMainProductForm">
+            <argument name="productName" value="$$subCategory.name$$"/>
+            <argument name="productSku" value="{{defaultSimpleProduct.sku}}"/>
+            <argument name="productPrice" value="{{defaultSimpleProduct.price}}"/>
+            <argument name="productQuantity" value="{{defaultSimpleProduct.quantity}}"/>
+            <argument name="productStatus" value="{{defaultSimpleProduct.status}}"/>
+            <argument name="productWeight" value="{{defaultSimpleProduct.weight}}"/>
+        </actionGroup>
+
+        <!-- Select the category that we created in the before block -->
+        <actionGroup ref="SetCategoryByName" stepKey="setCategory">
+            <argument name="categoryName" value="$$category.name$$"/>
+        </actionGroup>
+
+        <!-- Set the url key to match the subcategory created in the before block -->
+        <actionGroup ref="SetProductUrlKeyByString" stepKey="fillUrlKey">
+            <argument name="urlKey" value="$$subCategory.custom_attributes[url_key]$$"/>
+        </actionGroup>
+
+        <!-- Save the product and expect to see an error message -->
+        <actionGroup ref="SaveProductFormNoSuccessCheck" stepKey="tryToSaveProduct"/>
+        <see selector="{{AdminProductFormSection.successMessage}}"  userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index 70edb0ce3ea7d..17769c79677f7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -139,7 +139,7 @@
         </assertEquals>
 
         <!--Verify we see customizable options are Required -->
-        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption1.title)}}" stepKey="verifyFistCustomOptionIsRequired" />
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption1.title)}}" stepKey="verifyFirstCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption2.title)}}" stepKey="verifySecondCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption3.title)}}" stepKey="verifyThirdCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption4.title)}}" stepKey="verifyFourthCustomOptionIsRequired" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
index d7607b4b269e8..4d581bae700d7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
@@ -54,7 +54,13 @@
         <fillField stepKey="fillPrice" selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="90.99"/>
         <click stepKey="clickOnSaveButton" selector="{{AdminEditProductAttributesSection.Save}}"/>
         <waitForPageLoad stepKey="waitForUpdatedProductToSave" />
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
+
+        <!-- Run cron twice -->
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
 
         <!--Verify product name, sku and updated price-->
         <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct1.sku$$)}}"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
index c0eebd1512d6d..8a44c8093ca5e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -58,7 +58,13 @@
         <click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="toggleToChangePrice"/>
         <fillField selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="$$createProductOne.price$$0" stepKey="fillAttributeNameField"/>
         <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
+
+        <!-- Run cron twice -->
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
 
         <!-- Assert on storefront default view -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
index 845c47c0e4c20..bee13bec370da 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
@@ -52,7 +52,13 @@
         <click selector="{{AdminEditProductAttributesSection.ChangeAttributeDescriptionToggle}}" stepKey="toggleToChangeDescription"/>
         <fillField selector="{{AdminEditProductAttributesSection.AttributeDescription}}" userInput="Updated $$createProductOne.custom_attributes[description]$$" stepKey="fillAttributeDescriptionField"/>
         <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
+
+        <!-- Run cron twice -->
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
 
         <!-- Assert on storefront default view -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
new file mode 100644
index 0000000000000..234a7c69913c9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSortingByWebsitesTest">
+        <annotations>
+            <stories value="View sorting by websites"/>
+            <title value="Sorting by websites in Admin"/>
+            <description value="Sorting products by websites in Admin"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="productAssignedToCustomWebsite">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="productAssignedToMainWebsite">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create new website -->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+            <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
+            <magentoCLI command="cache:flush" stepKey="flushCacheAfterEnableWebUrlOptions"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="productAssignedToCustomWebsite" stepKey="deleteProductAssignedToCustomWebsite"/>
+            <deleteData createDataKey="productAssignedToMainWebsite" stepKey="deleteProductAssignedToMainWebsite"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+            </actionGroup>
+            <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Assign Custom Website to Simple Product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
+        <waitForPageLoad stepKey="waitForCatalogProductGrid"/>
+
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="assignCustomWebsiteToProduct">
+            <argument name="product" value="$$productAssignedToCustomWebsite$$"/>
+        </actionGroup>
+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeaderShow}}" visible="false" stepKey="expandSection"/>
+        <waitForPageLoad stepKey="waitForPageOpened"/>
+        <uncheckOption selector="{{ProductInWebsitesSection.website(_defaultWebsite.name)}}" stepKey="deselectMainWebsite"/>
+        <checkOption selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectWebsite"/>
+
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForProductPageToSaveAgain"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
+
+        <!--Navigate To Product Grid To Check Website Sorting-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGridToSortByWebsite"/>
+        <waitForPageLoad stepKey="waitForCatalogProductGridLoaded"/>
+
+        <!--Sorting works (By Websites) ASC-->
+        <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortAsc"/>
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Main Website" stepKey="checkIfProduct1WebsitesAsc"/>
+
+        <!--Sorting works (By Websites) DESC-->
+        <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortDesc"/>
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="{{customWebsite.name}}" stepKey="checkIfProduct1WebsitesDesc"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
index c9a37ec40e8fa..318ab6555235e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
@@ -135,7 +135,7 @@
         </assertEquals>
 
         <!--Verify customer see customizable options are Required -->
-        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(simpleProductCustomizableOption.title)}}" stepKey="verifyFistCustomOptionIsRequired"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(simpleProductCustomizableOption.title)}}" stepKey="verifyFirstCustomOptionIsRequired"/>
 
         <!--Verify customer see customizable option titles and prices -->
         <grabAttributeFrom userInput="for" selector="{{StorefrontProductInfoMainSection.customOptionLabel(simpleProductCustomizableOption.title)}}" stepKey="simpleOptionId"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
index d67d5b36109e6..34d85e7b46850 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -229,7 +229,7 @@
             <actualResult type="variable">productPriceAmount</actualResult>
         </assertEquals>
         <!--Verify we customer see customizable options are Required -->
-        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption1.title)}}" stepKey="verifyFistCustomOptionIsRequired" />
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption1.title)}}" stepKey="verifyFirstCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption2.title)}}" stepKey="verifySecondCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption3.title)}}" stepKey="verifyThirdCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption4.title)}}" stepKey="verifyFourthCustomOptionIsRequired" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyProductOrderTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyProductOrderTest.xml
new file mode 100644
index 0000000000000..a81c26b6e6eaf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminVerifyProductOrderTest.xml
@@ -0,0 +1,31 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminVerifyProductOrder">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Verify Product Order"/>
+            <title value="Admin should see product types in specified order"/>
+            <description value="Product Type Order should be Simple -> Configurable -> Grouped -> Virtual -> Bundle -> Downloadable -> EE"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14207"/>
+            <group value="mtf_migrated"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="GoToProductCatalogPage" stepKey="goToProductCatalogPage"/>
+        <actionGroup ref="VerifyProductTypeOrder" stepKey="verifyProductTypeOrder"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteUsedInConfigurableProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteUsedInConfigurableProductAttributeTest.xml
new file mode 100644
index 0000000000000..e79e4cea408fb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteUsedInConfigurableProductAttributeTest.xml
@@ -0,0 +1,105 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="DeleteUsedInConfigurableProductAttributeTest">
+        <annotations>
+            <stories value="Delete product attribute"/>
+            <title value="Admin should not be able to delete product attribute used in configurable product"/>
+            <description value="Admin should not be able to delete product attribute used in configurable product"/>
+            <testCaseId value="MC-14061"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create category -->
+            <createData entity="SimpleSubCategory" stepKey="categoryHandle"/>
+
+            <!-- Create base configurable product-->
+            <createData entity="BaseConfigurableProduct" stepKey="baseConfigProductHandle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <!-- Create Dropdown Product Attribute -->
+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
+
+            <!--Create attribute options -->
+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <!--Add to attribute to Default attribute set-->
+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <!-- Get handle of the attribute options -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+
+            <!--Create configurable product with the options -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <!-- Login As Admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete the configurable product created in the before block -->
+            <deleteData createDataKey="baseConfigProductHandle" stepKey="deleteConfig"/>
+
+            <!-- Delete the category created in the before block -->
+            <deleteData createDataKey="categoryHandle" stepKey="deleteCategory"/>
+
+            <!-- Delete configurable product attribute created in the before block -->
+            <deleteData createDataKey="productAttributeHandle" stepKey="deleteProductAttribute"/>
+
+            <!-- Logout -->
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <!-- Go to Stores > Attributes > Products. Search and select the product attribute that was used to create the configurable product-->
+        <actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
+            <argument name="productAttributeCode" value="$$productAttributeHandle.attribute_code$$"/>
+        </actionGroup>
+
+        <!-- Click Delete Attribute button -->
+        <actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
+            <argument name="productAttributeCode" value="$$productAttributeHandle.attribute_code$$"/>
+        </actionGroup>
+
+        <!-- Should see error message: This attribute is used in configurable products.  -->
+        <actionGroup ref="AssertAttributeDeletionErrorMessageActionGroup" stepKey="assertAttributeDeletionErrorMessage"/>
+
+        <!-- Go back to the product attribute grid. Should see the product attribute in the grid -->
+        <actionGroup ref="SearchAttributeByCodeOnProductAttributeGridActionGroup" stepKey="searchAttributeByCodeOnProductAttributeGrid">
+            <argument name="productAttributeCode" value="$$productAttributeHandle.attribute_code$$"/>
+        </actionGroup>
+
+        <!-- Go to the Catalog > Products page and search configurable product created in before block.-->
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProductOnBackend">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+
+        <!--Should see the product attributes as expected -->
+        <actionGroup ref="AssertProductAttributePresenceInCatalogProductGridActionGroup" stepKey="assertProductAttributePresenceInCatalogProductGrid">
+            <argument name="productAttribute" value="$$productAttributeHandle$$"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index 951afa2ddb68b..a3bce2d4fe2f2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -20,30 +20,36 @@
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!--Create Simple Product with Custom Options-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">17</field>
+            </createData>
+            <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithOption"/>
+            <!-- Logout customer before in case of it logged in from previous test -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
         </before>
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!-- Delete product and category -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderListingFilters"/>
+            <actionGroup ref="logout" stepKey="logoutAdmin"/>
+            <!-- Logout customer -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
         </after>
 
-        <!--Create Simple Product with Custom Options-->
+        <!-- Login Customer Storefront -->
 
-        <createData entity="_defaultCategory" stepKey="createCategory"/>
-        <createData entity="_defaultProduct" stepKey="createProduct">
-            <requiredEntity createDataKey="createCategory"/>
-            <field key="price">17</field>
-        </createData>
-        <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithOption"/>
-
-        <!-- Login Customer Storeront -->
-
-        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
-        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
-        <fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomerOnStorefront">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
 
         <!-- Checking the correctness of displayed prices for user parameters -->
 
-        <amOnPage url="{{StorefrontHomePage.url}}$createProduct.custom_attributes[url_key]$.html" stepKey="amOnProduct3Page"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPage"/>
 
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionField.title, ProductOptionField.price)}}" stepKey="checkFieldProductOption"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionArea.title, '1.7')}}" stepKey="checkAreaProductOption"/>
@@ -80,7 +86,7 @@
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="finalProductPrice"/>
 
         <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
-            <argument name="productName" value="$createProduct.name$"/>
+            <argument name="productName" value="$$createProduct.name$$"/>
         </actionGroup>
 
         <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
@@ -92,21 +98,21 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
         <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
 
-        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$createProduct.name$" stepKey="seeProductInCart"/>
-
-        <conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName($createProduct.name$)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" visible="false" stepKey="exposeProductOptions"/>
-
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionField.title}}" stepKey="seeProductOptionFieldInput1"/>
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeProductOptionAreaInput1"/>
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{productWithOptions.file}}" stepKey="seeProductOptionFileInput1"/>
-        <seeElement selector="{{CheckoutPaymentSection.ProductOptionLinkActiveByProductItemName($createProduct.name$, productWithOptions.file)}}" stepKey="seeProductOptionFileInputLink1"/>
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeProductOptionValueRadioButtons1Input1"/>
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeProductOptionValueCheckboxInput1" />
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeproductAttributeOptionsMultiselect1Input1" />
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="Jan 1, $year" stepKey="seeProductOptionDateAndTimeInput" />
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeProductOptionDataInput" />
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1:00 AM" stepKey="seeProductOptionTimeInput" />
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
+
+        <conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName($$createProduct.name$$)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" visible="false" stepKey="exposeProductOptions"/>
+
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionField.title}}" stepKey="seeProductOptionFieldInput1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeProductOptionAreaInput1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{productWithOptions.file}}" stepKey="seeProductOptionFileInput1"/>
+        <seeElement selector="{{CheckoutPaymentSection.ProductOptionLinkActiveByProductItemName($$createProduct.name$$, productWithOptions.file)}}" stepKey="seeProductOptionFileInputLink1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeProductOptionValueRadioButtons1Input1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeProductOptionValueCheckboxInput1" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeproductAttributeOptionsMultiselect1Input1" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="Jan 1, $year" stepKey="seeProductOptionDateAndTimeInput" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeProductOptionDataInput" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="1:00 AM" stepKey="seeProductOptionTimeInput" />
         <!--Select shipping method-->
         <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
         <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
@@ -124,13 +130,11 @@
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
-        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
-        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
-        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <actionGroup ref="filterOrderGridById" stepKey="filterByOrderId">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForOrderPageOpened"/>
 
         <!-- Checking the correctness of displayed custom options for user parameters on Order -->
 
@@ -168,24 +172,18 @@
 
         <!-- Go to Customer Order Page and Checking the correctness of displayed custom options for user parameters on Order -->
 
-        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnProduct4Page"/>
+        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnOrderPage"/>
 
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptionsFile($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" userInput="{{productWithOptions.file}}" stepKey="seeStorefontOrderProductOptionFile1"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptionsFile($$createProduct.name$$, ProductOptionFile.title, productWithOptions.file)}}" userInput="{{productWithOptions.file}}" stepKey="seeStorefontOrderProductOptionFile1"/>
         <seeElement selector="{{StorefrontCustomerOrderSection.productCustomOptionsLink($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" stepKey="seeStorefontOrderProductOptionFileLink1"/>
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDropDown.title, ProductOptionValueDropdown1.title)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeStorefontOrderProductOptionValueDropdown11"/>
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.title)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeStorefontOrderProductOptionValueRadioButtons11"/>
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionCheckbox.title, ProductOptionValueCheckbox.title)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeStorefontOrderProductOptionValueCheckbox1" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.title)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeStorefontOrderproductAttributeOptionsMultiselect11" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDate.title, 'Jan 1, $year')}}" userInput="Jan 1, $year" stepKey="seeStorefontOrderProductOptionDateAndTime1" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDateTime.title, '1/1/$shortYear, 1:00 AM')}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeStorefontOrderProductOptionData1" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionTime.title, '1:00 AM')}}" userInput="1:00 AM" stepKey="seeStorefontOrderProductOptionTime1" />
-
-        <!-- Delete product and category -->
-
-        <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-        <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionDropDown.title, ProductOptionValueDropdown1.title)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeStorefontOrderProductOptionValueDropdown11"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.title)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeStorefontOrderProductOptionValueRadioButtons11"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionCheckbox.title, ProductOptionValueCheckbox.title)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeStorefontOrderProductOptionValueCheckbox1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.title)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeStorefontOrderproductAttributeOptionsMultiselect11" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionDate.title, 'Jan 1, $year')}}" userInput="Jan 1, $year" stepKey="seeStorefontOrderProductOptionDateAndTime1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionDateTime.title, '1/1/$shortYear, 1:00 AM')}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeStorefontOrderProductOptionData1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionTime.title, '1:00 AM')}}" userInput="1:00 AM" stepKey="seeStorefontOrderProductOptionTime1" />
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
deleted file mode 100644
index de44af7f58afc..0000000000000
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Action\Attribute;
-
-/**
- * @SuppressWarnings(PHPMD.TooManyFields)
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class SaveTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save */
-    protected $object;
-
-    /** @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute|\PHPUnit_Framework_MockObject_MockObject */
-    protected $attributeHelper;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $dataObjectHelperMock;
-
-    /** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor|\PHPUnit_Framework_MockObject_MockObject */
-    protected $stockIndexerProcessor;
-
-    /** @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject */
-    protected $context;
-
-    /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject */
-    protected $request;
-
-    /** @var \Magento\Framework\App\Response\Http|\PHPUnit_Framework_MockObject_MockObject */
-    protected $response;
-
-    /** @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $objectManager;
-
-    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $eventManager;
-
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $url;
-
-    /** @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $redirect;
-
-    /** @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject */
-    protected $actionFlag;
-
-    /** @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $view;
-
-    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $messageManager;
-
-    /** @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
-    protected $session;
-
-    /** @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $authorization;
-
-    /** @var \Magento\Backend\Model\Auth|\PHPUnit_Framework_MockObject_MockObject */
-    protected $auth;
-
-    /** @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-    protected $helper;
-
-    /** @var \Magento\Backend\Model\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $backendUrl;
-
-    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
-    protected $formKeyValidator;
-
-    /** @var \Magento\Framework\Locale\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $localeResolver;
-
-    /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
-    protected $product;
-
-    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $stockItemService;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $stockItem;
-
-    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $stockConfig;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $stockItemRepository;
-
-    /**
-     * @var  \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultRedirectFactory;
-
-    protected function setUp()
-    {
-        $this->attributeHelper = $this->createPartialMock(
-            \Magento\Catalog\Helper\Product\Edit\Action\Attribute::class,
-            ['getProductIds', 'getSelectedStoreId', 'getStoreWebsiteId']
-        );
-
-        $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->stockIndexerProcessor = $this->createPartialMock(
-            \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class,
-            ['reindexList']
-        );
-
-        $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultRedirectFactory = $this->getMockBuilder(\Magento\Backend\Model\View\Result\RedirectFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->resultRedirectFactory->expects($this->atLeastOnce())
-            ->method('create')
-            ->willReturn($resultRedirect);
-
-        $this->prepareContext();
-
-        $this->object = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
-            \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save::class,
-            [
-                'context' => $this->context,
-                'attributeHelper' => $this->attributeHelper,
-                'stockIndexerProcessor' => $this->stockIndexerProcessor,
-                'dataObjectHelper' => $this->dataObjectHelperMock,
-            ]
-        );
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    protected function prepareContext()
-    {
-        $this->stockItemRepository = $this->getMockBuilder(
-            \Magento\CatalogInventory\Api\StockItemRepositoryInterface::class
-        )->disableOriginalConstructor()->getMock();
-
-        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-            ->disableOriginalConstructor()->getMock();
-        $this->response = $this->createMock(\Magento\Framework\App\Response\Http::class);
-        $this->objectManager = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-        $this->eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-        $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
-        $this->redirect = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
-        $this->actionFlag = $this->createMock(\Magento\Framework\App\ActionFlag::class);
-        $this->view = $this->createMock(\Magento\Framework\App\ViewInterface::class);
-        $this->messageManager = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
-        $this->session = $this->createMock(\Magento\Backend\Model\Session::class);
-        $this->authorization = $this->createMock(\Magento\Framework\AuthorizationInterface::class);
-        $this->auth = $this->createMock(\Magento\Backend\Model\Auth::class);
-        $this->helper = $this->createMock(\Magento\Backend\Helper\Data::class);
-        $this->backendUrl = $this->createMock(\Magento\Backend\Model\UrlInterface::class);
-        $this->formKeyValidator = $this->createMock(\Magento\Framework\Data\Form\FormKey\Validator::class);
-        $this->localeResolver = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
-
-        $this->context = $this->context = $this->createPartialMock(\Magento\Backend\App\Action\Context::class, [
-                'getRequest',
-                'getResponse',
-                'getObjectManager',
-                'getEventManager',
-                'getUrl',
-                'getRedirect',
-                'getActionFlag',
-                'getView',
-                'getMessageManager',
-                'getSession',
-                'getAuthorization',
-                'getAuth',
-                'getHelper',
-                'getBackendUrl',
-                'getFormKeyValidator',
-                'getLocaleResolver',
-                'getResultRedirectFactory'
-            ]);
-        $this->context->expects($this->any())->method('getRequest')->willReturn($this->request);
-        $this->context->expects($this->any())->method('getResponse')->willReturn($this->response);
-        $this->context->expects($this->any())->method('getObjectManager')->willReturn($this->objectManager);
-        $this->context->expects($this->any())->method('getEventManager')->willReturn($this->eventManager);
-        $this->context->expects($this->any())->method('getUrl')->willReturn($this->url);
-        $this->context->expects($this->any())->method('getRedirect')->willReturn($this->redirect);
-        $this->context->expects($this->any())->method('getActionFlag')->willReturn($this->actionFlag);
-        $this->context->expects($this->any())->method('getView')->willReturn($this->view);
-        $this->context->expects($this->any())->method('getMessageManager')->willReturn($this->messageManager);
-        $this->context->expects($this->any())->method('getSession')->willReturn($this->session);
-        $this->context->expects($this->any())->method('getAuthorization')->willReturn($this->authorization);
-        $this->context->expects($this->any())->method('getAuth')->willReturn($this->auth);
-        $this->context->expects($this->any())->method('getHelper')->willReturn($this->helper);
-        $this->context->expects($this->any())->method('getBackendUrl')->willReturn($this->backendUrl);
-        $this->context->expects($this->any())->method('getFormKeyValidator')->willReturn($this->formKeyValidator);
-        $this->context->expects($this->any())->method('getLocaleResolver')->willReturn($this->localeResolver);
-        $this->context->expects($this->any())
-            ->method('getResultRedirectFactory')
-            ->willReturn($this->resultRedirectFactory);
-
-        $this->product = $this->createPartialMock(
-            \Magento\Catalog\Model\Product::class,
-            ['isProductsHasSku', '__wakeup']
-        );
-
-        $this->stockItemService = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockRegistryInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getStockItem', 'saveStockItem'])
-            ->getMockForAbstractClass();
-        $this->stockItem = $this->getMockBuilder(\Magento\CatalogInventory\Api\Data\StockItemInterface::class)
-            ->setMethods(['getId', 'getProductId'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->stockConfig = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockConfigurationInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->objectManager->expects($this->any())->method('create')->will($this->returnValueMap([
-            [\Magento\Catalog\Model\Product::class, [], $this->product],
-            [\Magento\CatalogInventory\Api\StockRegistryInterface::class, [], $this->stockItemService],
-            [\Magento\CatalogInventory\Api\StockItemRepositoryInterface::class, [], $this->stockItemRepository],
-        ]));
-
-        $this->objectManager->expects($this->any())->method('get')->will($this->returnValueMap([
-            [\Magento\CatalogInventory\Api\StockConfigurationInterface::class, $this->stockConfig],
-        ]));
-    }
-
-    public function testExecuteThatProductIdsAreObtainedFromAttributeHelper()
-    {
-        $this->attributeHelper->expects($this->any())->method('getProductIds')->will($this->returnValue([5]));
-        $this->attributeHelper->expects($this->any())->method('getSelectedStoreId')->will($this->returnValue([1]));
-        $this->attributeHelper->expects($this->any())->method('getStoreWebsiteId')->will($this->returnValue(1));
-        $this->stockConfig->expects($this->any())->method('getConfigItemOptions')->will($this->returnValue([]));
-        $this->dataObjectHelperMock->expects($this->any())
-            ->method('populateWithArray')
-            ->with($this->stockItem, $this->anything(), \Magento\CatalogInventory\Api\Data\StockItemInterface::class)
-            ->willReturnSelf();
-        $this->product->expects($this->any())->method('isProductsHasSku')->with([5])->will($this->returnValue(true));
-        $this->stockItemService->expects($this->any())->method('getStockItem')->with(5, 1)
-            ->will($this->returnValue($this->stockItem));
-        $this->stockIndexerProcessor->expects($this->any())->method('reindexList')->with([5]);
-
-        $this->request->expects($this->any())->method('getParam')->will($this->returnValueMap([
-            ['inventory', [], [7]],
-        ]));
-
-        $this->messageManager->expects($this->never())->method('addErrorMessage');
-        $this->messageManager->expects($this->never())->method('addExceptionMessage');
-
-        $this->object->execute();
-    }
-}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php
index 9fb2adb2b8ecd..97c098ba0ff2e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php
@@ -43,6 +43,11 @@ class TreeTest extends \PHPUnit\Framework\TestCase
      */
     protected $node;
 
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
+     */
+    private $treeResourceFactoryMock;
+
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -59,6 +64,12 @@ protected function setUp()
             \Magento\Store\Model\StoreManagerInterface::class
         )->disableOriginalConstructor()->getMock();
 
+        $this->treeResourceFactoryMock = $this->createMock(
+            \Magento\Catalog\Model\ResourceModel\Category\TreeFactory::class
+        );
+        $this->treeResourceFactoryMock->method('create')
+            ->willReturn($this->categoryTreeMock);
+
         $methods = ['create'];
         $this->treeFactoryMock =
             $this->createPartialMock(\Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory::class, $methods);
@@ -70,7 +81,8 @@ protected function setUp()
                     'categoryCollection' => $this->categoryCollection,
                     'categoryTree' => $this->categoryTreeMock,
                     'storeManager' => $this->storeManagerMock,
-                    'treeFactory' => $this->treeFactoryMock
+                    'treeFactory' => $this->treeFactoryMock,
+                    'treeResourceFactory' => $this->treeResourceFactoryMock,
                 ]
             );
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php
index f78c0ad924954..b8b76524099f4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php
@@ -93,7 +93,7 @@ public function testGetList()
 
         $collection = $this->getMockBuilder(Collection::class)->disableOriginalConstructor()->getMock();
         $collection->expects($this->once())->method('getSize')->willReturn($totalCount);
-        $collection->expects($this->once())->method('getItems')->willReturn([$categoryFirst, $categorySecond]);
+        $collection->expects($this->once())->method('getAllIds')->willReturn([$categoryIdFirst, $categoryIdSecond]);
 
         $this->collectionProcessorMock->expects($this->once())
             ->method('process')
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
index 90c3f999a6a8b..2e1cff834fd34 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
@@ -3,15 +3,29 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Eav\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Indexer\Product\Eav\Action\Full;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Decimal;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Source;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Indexer\BatchProviderInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator;
+use PHPUnit\Framework\MockObject\MockObject as MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -19,45 +33,50 @@
 class FullTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full|\PHPUnit_Framework_MockObject_MockObject
+     * @var Full|MockObject
      */
     private $model;
 
     /**
-     * @var DecimalFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var DecimalFactory|MockObject
      */
     private $eavDecimalFactory;
 
     /**
-     * @var SourceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var SourceFactory|MockObject
      */
     private $eavSourceFactory;
 
     /**
-     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     * @var MetadataPool|MockObject
      */
     private $metadataPool;
 
     /**
-     * @var BatchProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var BatchProviderInterface|MockObject
      */
     private $batchProvider;
 
     /**
-     * @var BatchSizeCalculator|\PHPUnit_Framework_MockObject_MockObject
+     * @var BatchSizeCalculator|MockObject
      */
     private $batchSizeCalculator;
 
     /**
-     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var ActiveTableSwitcher|MockObject
      */
     private $activeTableSwitcher;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|MockObject
      */
     private $scopeConfig;
 
+    /**
+     * @var Generator
+     */
+    private $batchQueryGenerator;
+
     /**
      * @return void
      */
@@ -67,15 +86,16 @@ protected function setUp()
         $this->eavSourceFactory = $this->createPartialMock(SourceFactory::class, ['create']);
         $this->metadataPool = $this->createMock(MetadataPool::class);
         $this->batchProvider = $this->getMockForAbstractClass(BatchProviderInterface::class);
+        $this->batchQueryGenerator = $this->createMock(Generator::class);
         $this->batchSizeCalculator = $this->createMock(BatchSizeCalculator::class);
         $this->activeTableSwitcher = $this->createMock(ActiveTableSwitcher::class);
-        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
-            \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full::class,
+            Full::class,
             [
                 'eavDecimalFactory' => $this->eavDecimalFactory,
                 'eavSourceFactory' => $this->eavSourceFactory,
@@ -83,7 +103,8 @@ protected function setUp()
                 'batchProvider' => $this->batchProvider,
                 'batchSizeCalculator' => $this->batchSizeCalculator,
                 'activeTableSwitcher' => $this->activeTableSwitcher,
-                'scopeConfig' => $this->scopeConfig
+                'scopeConfig' => $this->scopeConfig,
+                'batchQueryGenerator' => $this->batchQueryGenerator,
             ]
         );
     }
@@ -96,15 +117,15 @@ public function testExecute()
         $this->scopeConfig->expects($this->once())->method('getValue')->willReturn(1);
 
         $ids = [1, 2, 3];
-        $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+        $connectionMock = $this->getMockBuilder(AdapterInterface::class)
             ->getMockForAbstractClass();
 
         $connectionMock->expects($this->atLeastOnce())->method('describeTable')->willReturn(['id' => []]);
-        $eavSource = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Source::class)
+        $eavSource = $this->getMockBuilder(Source::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $eavDecimal = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Decimal::class)
+        $eavDecimal = $this->getMockBuilder(Decimal::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -125,22 +146,28 @@ public function testExecute()
 
         $this->eavSourceFactory->expects($this->once())->method('create')->will($this->returnValue($eavDecimal));
 
-        $entityMetadataMock = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+        $entityMetadataMock = $this->getMockBuilder(EntityMetadataInterface::class)
             ->getMockForAbstractClass();
 
         $this->metadataPool->expects($this->atLeastOnce())
             ->method('getMetadata')
-            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->with(ProductInterface::class)
             ->willReturn($entityMetadataMock);
 
-        $this->batchProvider->expects($this->atLeastOnce())
-            ->method('getBatches')
-            ->willReturn([['from' => 10, 'to' => 100]]);
-        $this->batchProvider->expects($this->atLeastOnce())
-            ->method('getBatchIds')
+        // Super inefficient algorithm in some cases
+        $this->batchProvider->expects($this->never())
+            ->method('getBatches');
+
+        $batchQuery = $this->createMock(Select::class);
+
+        $connectionMock->method('fetchCol')
+            ->with($batchQuery)
             ->willReturn($ids);
 
-        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+        $this->batchQueryGenerator->method('generate')
+            ->willReturn([$batchQuery]);
+
+        $selectMock = $this->getMockBuilder(Select::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -153,7 +180,7 @@ public function testExecute()
 
     /**
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function testExecuteWithDisabledEavIndexer()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php
new file mode 100644
index 0000000000000..774edcfeb6b64
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Ui\Component;
+
+use PHPUnit\Framework\TestCase;
+use Magento\Catalog\Ui\Component\ColumnFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Listing\Columns\ColumnInterface;
+use Magento\Ui\Component\Filters\FilterModifier;
+
+/**
+ * ColumnFactory test.
+ */
+class ColumnFactoryTest extends TestCase
+{
+    /**
+     * @var ColumnFactory
+     */
+    private $columnFactory;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductAttributeInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $attribute;
+
+    /**
+     * @var ContextInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $context;
+
+    /**
+     * @var UiComponentFactory|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $uiComponentFactory;
+
+    /**
+     * @var ColumnInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $column;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->attribute = $this->getMockBuilder(ProductAttributeInterface::class)
+            ->setMethods(['usesSource'])
+            ->getMockForAbstractClass();
+        $this->context = $this->createMock(ContextInterface::class);
+        $this->uiComponentFactory = $this->createMock(UiComponentFactory::class);
+        $this->column = $this->getMockForAbstractClass(ColumnInterface::class);
+        $this->uiComponentFactory->method('create')
+            ->willReturn($this->column);
+
+        $this->columnFactory = $this->objectManager->getObject(ColumnFactory::class, [
+            'componentFactory' => $this->uiComponentFactory
+        ]);
+    }
+
+    /**
+     * Tests the create method will return correct object.
+     *
+     * @return void
+     */
+    public function testCreatedObject(): void
+    {
+        $this->context->method('getRequestParam')
+            ->with(FilterModifier::FILTER_MODIFIER, [])
+            ->willReturn([]);
+
+        $object = $this->columnFactory->create($this->attribute, $this->context);
+        $this->assertEquals(
+            $this->column,
+            $object,
+            'Object must be the same which the ui component factory creates.'
+        );
+    }
+
+    /**
+     * Tests create method with not filterable in grid attribute.
+     *
+     * @param array $filterModifiers
+     * @param null|string $filter
+     *
+     * @return void
+     * @dataProvider filterModifiersProvider
+     */
+    public function testCreateWithNotFilterableInGridAttribute(array $filterModifiers, ?string $filter): void
+    {
+        $componentFactoryArgument = [
+            'data' => [
+                'config' => [
+                    'label' => __(null),
+                    'dataType' => 'text',
+                    'add_field' => true,
+                    'visible' => null,
+                    'filter' => $filter,
+                    'component' => 'Magento_Ui/js/grid/columns/column',
+                ],
+            ],
+            'context' => $this->context,
+        ];
+
+        $this->context->method('getRequestParam')
+            ->with(FilterModifier::FILTER_MODIFIER, [])
+            ->willReturn($filterModifiers);
+        $this->attribute->method('getIsFilterableInGrid')
+            ->willReturn(false);
+        $this->attribute->method('getAttributeCode')
+            ->willReturn('color');
+
+        $this->uiComponentFactory->expects($this->once())
+            ->method('create')
+            ->with($this->anything(), $this->anything(), $componentFactoryArgument);
+
+        $this->columnFactory->create($this->attribute, $this->context);
+    }
+
+    /**
+     * Filter modifiers data provider.
+     *
+     * @return array
+     */
+    public function filterModifiersProvider(): array
+    {
+        return [
+            'without' => [
+                'filter_modifiers' => [],
+                'filter' => null,
+            ],
+            'with' => [
+                'filter_modifiers' => [
+                    'color' => [
+                        'condition_type' => 'notnull',
+                    ],
+                ],
+                'filter' => 'text',
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
index 6d7c8814bd474..0e0cb676cdf3e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
@@ -54,7 +54,16 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->collectionMock = $this->getMockBuilder(AbstractCollection::class)
             ->disableOriginalConstructor()
-            ->setMethods(['load', 'getSelect', 'getTable', 'getIterator', 'isLoaded', 'toArray', 'getSize'])
+            ->setMethods([
+                'load',
+                'getSelect',
+                'getTable',
+                'getIterator',
+                'isLoaded',
+                'toArray',
+                'getSize',
+                'setStoreId'
+            ])
             ->getMockForAbstractClass();
         $this->dbSelectMock = $this->getMockBuilder(DbSelect::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
index 1903bcd144831..ea6b1fd47a0a5 100644
--- a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
+++ b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Ui\Component;
 
+use Magento\Ui\Component\Filters\FilterModifier;
+
 /**
  * Column Factory
  *
@@ -60,13 +62,15 @@ public function __construct(\Magento\Framework\View\Element\UiComponentFactory $
      */
     public function create($attribute, $context, array $config = [])
     {
+        $filterModifiers = $context->getRequestParam(FilterModifier::FILTER_MODIFIER, []);
+
         $columnName = $attribute->getAttributeCode();
         $config = array_merge([
             'label' => __($attribute->getDefaultFrontendLabel()),
             'dataType' => $this->getDataType($attribute),
             'add_field' => true,
             'visible' => $attribute->getIsVisibleInGrid(),
-            'filter' => ($attribute->getIsFilterableInGrid())
+            'filter' => ($attribute->getIsFilterableInGrid() || array_key_exists($columnName, $filterModifiers))
                 ? $this->getFilterType($attribute->getFrontendInput())
                 : null,
         ], $config);
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
index 5af0d71dc246c..494b77724e5b7 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -3,13 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Ui\Component\Listing\Columns;
 
-use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\DB\Helper;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
+ * Websites listing column component.
+ *
  * @api
  * @since 100.0.2
  */
@@ -20,6 +26,11 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
      */
     const NAME = 'websites';
 
+    /**
+     * Data for concatenated website names value.
+     */
+    private $websiteNames = 'website_names';
+
     /**
      * Store manager
      *
@@ -27,26 +38,36 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
      */
     protected $storeManager;
 
+    /**
+     * @var \Magento\Framework\DB\Helper
+     */
+    private $resourceHelper;
+
     /**
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param StoreManagerInterface $storeManager
      * @param array $components
      * @param array $data
+     * @param Helper $resourceHelper
      */
     public function __construct(
         ContextInterface $context,
         UiComponentFactory $uiComponentFactory,
         StoreManagerInterface $storeManager,
         array $components = [],
-        array $data = []
+        array $data = [],
+        Helper $resourceHelper = null
     ) {
         parent::__construct($context, $uiComponentFactory, $components, $data);
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         $this->storeManager = $storeManager;
+        $this->resourceHelper = $resourceHelper ?: $objectManager->get(Helper::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @deprecated 101.0.0
      */
     public function prepareDataSource(array $dataSource)
@@ -71,9 +92,10 @@ public function prepareDataSource(array $dataSource)
 
         return $dataSource;
     }
-    
+
     /**
-     * Prepare component configuration
+     * Prepare component configuration.
+     *
      * @return void
      */
     public function prepare()
@@ -83,4 +105,46 @@ public function prepare()
             $this->_data['config']['componentDisabled'] = true;
         }
     }
+
+    /**
+     * Apply sorting.
+     *
+     * @return void
+     */
+    protected function applySorting()
+    {
+        $sorting = $this->getContext()->getRequestParam('sorting');
+        $isSortable = $this->getData('config/sortable');
+        if ($isSortable !== false
+            && !empty($sorting['field'])
+            && !empty($sorting['direction'])
+            && $sorting['field'] === $this->getName()
+        ) {
+            $collection = $this->getContext()->getDataProvider()->getCollection();
+            $collection
+                 ->joinField(
+                     'websites_ids',
+                     'catalog_product_website',
+                     'website_id',
+                     'product_id=entity_id',
+                     null,
+                     'left'
+                 )
+                 ->joinTable(
+                     'store_website',
+                     'website_id = websites_ids',
+                     ['name'],
+                     null,
+                     'left'
+                 )
+                 ->groupByAttribute('entity_id');
+            $this->resourceHelper->addGroupConcatColumn(
+                $collection->getSelect(),
+                $this->websiteNames,
+                'name'
+            );
+
+            $collection->getSelect()->order($this->websiteNames . ' ' . $sorting['direction']);
+        }
+    }
 }
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
index 2a4d2ff52d479..00132c6ad89e8 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
@@ -389,6 +389,9 @@ private function addAdvancedPriceLink()
                 'componentType' => Container::NAME,
                 'component' => 'Magento_Ui/js/form/components/button',
                 'template' => 'ui/form/components/button/container',
+                'imports' => [
+                    'childError' => $this->scopeName . '.advanced_pricing_modal.advanced-pricing:error',
+                ],
                 'actions' => [
                     [
                         'targetName' => $this->scopeName . '.advanced_pricing_modal',
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
index f8f82511cc12f..af43c84501f65 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -871,6 +871,7 @@ protected function getPositionFieldConfig($sortOrder)
                         'formElement' => Hidden::NAME,
                         'dataScope' => static::FIELD_SORT_ORDER_NAME,
                         'dataType' => Number::NAME,
+                        'visible' => false,
                         'sortOrder' => $sortOrder,
                     ],
                 ],
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
index 200ecf89641fa..a518afc576d61 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\Store;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
 use Magento\Ui\DataProvider\Modifier\PoolInterface;
 
@@ -67,6 +68,7 @@ public function __construct(
         $this->addFieldStrategies = $addFieldStrategies;
         $this->addFilterStrategies = $addFilterStrategies;
         $this->modifiersPool = $modifiersPool ?: ObjectManager::getInstance()->get(PoolInterface::class);
+        $this->collection->setStoreId(Store::DEFAULT_STORE_ID);
     }
 
     /**
@@ -110,7 +112,7 @@ public function addField($field, $alias = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addFilter(\Magento\Framework\Api\Filter $filter)
     {
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 44d051933909b..5c3ee3da8ca81 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -7,6 +7,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-asynchronous-operations": "*",
         "magento/module-backend": "*",
         "magento/module-catalog-inventory": "*",
         "magento/module-catalog-rule": "*",
diff --git a/app/code/Magento/Catalog/etc/communication.xml b/app/code/Magento/Catalog/etc/communication.xml
new file mode 100644
index 0000000000000..1a957f6ac9fe5
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/communication.xml
@@ -0,0 +1,15 @@
+<?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:Communication/etc/communication.xsd">
+    <topic name="product_action_attribute.update" request="Magento\AsynchronousOperations\Api\Data\OperationInterface">
+        <handler name="product_action_attribute.update" type="Magento\Catalog\Model\Attribute\Backend\Consumer" method="process" />
+    </topic>
+    <topic name="product_action_attribute.website.update" request="Magento\AsynchronousOperations\Api\Data\OperationInterface">
+        <handler name="product_action_attribute.website.update" type="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign" method="process" />
+    </topic>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 7d2c3699ee2c2..49447447622f9 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -72,6 +72,7 @@
     <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\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
+    <preference for="Magento\Catalog\Api\Data\MassActionInterface" type="\Magento\Catalog\Model\MassAction" />
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
diff --git a/app/code/Magento/Catalog/etc/queue.xml b/app/code/Magento/Catalog/etc/queue.xml
new file mode 100644
index 0000000000000..137f34a5c1e25
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue.xml
@@ -0,0 +1,15 @@
+<?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-message-queue:etc/queue.xsd">
+    <broker topic="product_action_attribute.update" exchange="magento-db" type="db">
+        <queue name="product_action_attribute.update" consumer="product_action_attribute.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process"/>
+    </broker>
+    <broker topic="product_action_attribute.website.update" exchange="magento-db" type="db">
+        <queue name="product_action_attribute.website.update" consumer="product_action_attribute.website.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign::process"/>
+    </broker>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_consumer.xml b/app/code/Magento/Catalog/etc/queue_consumer.xml
new file mode 100644
index 0000000000000..d9e66ae69c10c
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue_consumer.xml
@@ -0,0 +1,11 @@
+<?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-message-queue:etc/consumer.xsd">
+    <consumer name="product_action_attribute.update" queue="product_action_attribute.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process" />
+    <consumer name="product_action_attribute.website.update" queue="product_action_attribute.website.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign::process" />
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_publisher.xml b/app/code/Magento/Catalog/etc/queue_publisher.xml
new file mode 100644
index 0000000000000..1606ea42ec0b3
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue_publisher.xml
@@ -0,0 +1,15 @@
+<?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-message-queue:etc/publisher.xsd">
+    <publisher topic="product_action_attribute.update">
+        <connection name="db" exchange="magento-db" />
+    </publisher>
+    <publisher topic="product_action_attribute.website.update">
+        <connection name="db" exchange="magento-db" />
+    </publisher>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_topology.xml b/app/code/Magento/Catalog/etc/queue_topology.xml
new file mode 100644
index 0000000000000..bdac891afbdb8
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue_topology.xml
@@ -0,0 +1,13 @@
+<?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-message-queue:etc/topology.xsd">
+    <exchange name="magento-db" type="topic" connection="db">
+        <binding id="updateBinding" topic="product_action_attribute.update" destinationType="queue" destination="product_action_attribute.update"/>
+        <binding id="updateBindingWebsite" topic="product_action_attribute.website.update" destinationType="queue" destination="product_action_attribute.website.update"/>
+    </exchange>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
index c930d2195a01b..1c4a37fedebe3 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
@@ -23,8 +23,8 @@
             <tbody>
             <?php foreach ($_additional as $_data): ?>
                 <tr>
-                    <th class="col label" scope="row"><?= $block->escapeHtml(__($_data['label'])) ?></th>
-                    <td class="col data" data-th="<?= $block->escapeHtml(__($_data['label'])) ?>"><?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
+                    <th class="col label" scope="row"><?= $block->escapeHtml($_data['label']) ?></th>
+                    <td class="col data" data-th="<?= $block->escapeHtml($_data['label']) ?>"><?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
                 </tr>
             <?php endforeach; ?>
             </tbody>
diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
index 5c97261d483d8..805be8a17765f 100644
--- a/app/code/Magento/CatalogAnalytics/composer.json
+++ b/app/code/Magento/CatalogAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-catalog": "*"
+        "magento/module-catalog": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
index 4e3a8403f3132..1783a5cd9a7e5 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
@@ -11,6 +11,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
 /**
@@ -72,11 +73,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $rootCategoryId = $this->getCategoryId($args);
         $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
-        if (!empty($categoriesTree)) {
-            $result = $this->extractDataFromCategoryTree->execute($categoriesTree);
-            return current($result);
-        } else {
-            return null;
+
+        if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
+            throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
         }
+
+        $result = $this->extractDataFromCategoryTree->execute($categoriesTree);
+        return current($result);
     }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
index e910a5c8be4cd..24c5e664831e4 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
@@ -7,7 +7,6 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Filter;
 use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search;
@@ -17,7 +16,6 @@
 use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\SearchFilter;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Catalog\Model\Layer\Resolver;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
 
 /**
  * Products field resolver, used for GraphQL request processing.
@@ -82,10 +80,10 @@ public function resolve(
         } elseif (isset($args['search'])) {
             $layerType = Resolver::CATALOG_LAYER_SEARCH;
             $this->searchFilter->add($args['search'], $searchCriteria);
-            $searchResult = $this->getSearchResult($this->searchQuery, $searchCriteria, $info);
+            $searchResult = $this->searchQuery->getResult($searchCriteria, $info);
         } else {
             $layerType = Resolver::CATALOG_LAYER_CATEGORY;
-            $searchResult = $this->getSearchResult($this->filterQuery, $searchCriteria, $info);
+            $searchResult = $this->filterQuery->getResult($searchCriteria, $info);
         }
         //possible division by 0
         if ($searchCriteria->getPageSize()) {
@@ -117,25 +115,4 @@ public function resolve(
 
         return $data;
     }
-
-    /**
-     * Get search result.
-     *
-     * @param Filter|Search $query
-     * @param SearchCriteriaInterface $searchCriteria
-     * @param ResolveInfo $info
-     *
-     * @return \Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult
-     * @throws GraphQlInputException
-     */
-    private function getSearchResult($query, SearchCriteriaInterface $searchCriteria, ResolveInfo $info)
-    {
-        try {
-            $searchResult = $query->getResult($searchCriteria, $info);
-        } catch (InputException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
-        }
-
-        return $searchResult;
-    }
 }
diff --git a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
index 7e18ac34f0fcc..b5622e948b7cd 100644
--- a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
@@ -38,11 +38,15 @@
                 </item>
                 <item name="customizable_options" xsi:type="array">
                     <item name="field" xsi:type="string">CustomizableFieldOption</item>
+                    <item name="date" xsi:type="string">CustomizableDateOption</item>
                     <item name="date_time" xsi:type="string">CustomizableDateOption</item>
+                    <item name="time" xsi:type="string">CustomizableDateOption</item>
                     <item name="file" xsi:type="string">CustomizableFileOption</item>
                     <item name="area" xsi:type="string">CustomizableAreaOption</item>
                     <item name="drop_down" xsi:type="string">CustomizableDropDownOption</item>
+                    <item name="multiple" xsi:type="string">CustomizableMultipleOption</item>
                     <item name="radio" xsi:type="string">CustomizableRadioOption</item>
+                    <item name="checkbox" xsi:type="string">CustomizableCheckboxOption</item>
                 </item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 45f3a4c83be7b..778d0783305b7 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -323,6 +323,19 @@ type CustomizableDropDownValue @doc(description: "CustomizableDropDownValue defi
     sort_order: Int @doc(description: "The order in which the option is displayed")
 }
 
+type CustomizableMultipleOption implements CustomizableOptionInterface @doc(description: "CustomizableMultipleOption contains information about a multiselect that is defined as part of a customizable option") {
+    value: [CustomizableMultipleValue] @doc(description: "An array that defines the set of options for a multiselect")
+}
+
+type CustomizableMultipleValue @doc(description: "CustomizableMultipleValue defines the price and sku of a product whose page contains a customized multiselect") {
+    option_type_id: Int @doc(description: "The ID assigned to the value")
+    price: Float @doc(description: "The price assigned to this option")
+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
+    sku: String @doc(description: "The Stock Keeping Unit for this option")
+    title: String @doc(description: "The display name for this option")
+    sort_order: Int @doc(description: "The order in which the option is displayed")
+}
+
 type CustomizableFieldOption implements CustomizableOptionInterface @doc(description: "CustomizableFieldOption contains information about a text field that is defined as part of a customizable option") {
     value: CustomizableFieldValue @doc(description: "An object that defines a text field")
     product_sku: String @doc(description: "The Stock Keeping Unit of the base product")
@@ -407,6 +420,19 @@ type CustomizableRadioValue  @doc(description: "CustomizableRadioValue defines t
     sort_order: Int @doc(description: "The order in which the radio button is displayed")
 }
 
+type CustomizableCheckboxOption implements CustomizableOptionInterface @doc(description: "CustomizableCheckbbixOption contains information about a set of checkbox values that are defined as part of a customizable option") {
+    value: [CustomizableCheckboxValue] @doc(description: "An array that defines a set of checkbox values")
+}
+
+type CustomizableCheckboxValue  @doc(description: "CustomizableCheckboxValue defines the price and sku of a product whose page contains a customized set of checkbox values") {
+    option_type_id: Int @doc(description: "The ID assigned to the value")
+    price: Float @doc(description: "The price assigned to this option")
+    price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC")
+    sku: String @doc(description: "The Stock Keeping Unit for this option")
+    title: String @doc(description: "The display name for this option")
+    sort_order: Int @doc(description: "The order in which the checkbox value is displayed")
+}
+
 type VirtualProduct implements ProductInterface, CustomizableProductInterface @doc(description: "A virtual product is non-tangible product that does not require shipping and is not kept in inventory") {
 }
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
new file mode 100644
index 0000000000000..b9eea2b114634
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
@@ -0,0 +1,65 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
+    <!-- Export products using filtering by attribute -->
+    <actionGroup name="exportProductsFilterByAttribute">
+        <arguments>
+            <argument name="attribute" type="string"/>
+            <argument name="attributeData" type="string"/>
+        </arguments>
+        <selectOption selector="{{AdminExportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminExportMainSection.entityAttributes}}" stepKey="waitForElementVisible"/>
+        <scrollTo selector="{{AdminExportAttributeSection.chooseAttribute('attribute')}}" stepKey="scrollToAttribute" />
+        <checkOption selector="{{AdminExportAttributeSection.chooseAttribute('attribute')}}" stepKey="selectAttribute"/>
+        <fillField selector="{{AdminExportAttributeSection.fillFilter('attribute')}}" userInput="{{attributeData}}" stepKey="setDataInField"/>
+        <waitForPageLoad stepKey="waitForUserInput"/>
+        <scrollTo selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="scrollToContinue" />
+        <click selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="clickContinueButton"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue, wait to get your file soon" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <!-- Export products without filtering -->
+    <actionGroup name="exportAllProducts">
+        <selectOption selector="{{AdminExportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminExportMainSection.entityAttributes}}" stepKey="waitForElementVisible" time="5"/>
+        <scrollTo selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="scrollToContinue"/>
+        <wait stepKey="waitForScroll" time="5"/>
+        <click selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="clickContinueButton"/>
+        <wait stepKey="waitForClick" time="5"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue, wait to get your file soon" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <!-- Download first file in the grid -->
+    <actionGroup name="downloadFileByRowIndex">
+        <arguments>
+            <argument name="rowIndex" type="string"/>
+        </arguments>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormReload"/>
+        <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex(rowIndex)}}"/>
+        <click stepKey="clickOnDownload" selector="{{AdminExportAttributeSection.download(rowIndex)}}" after="clickSelectBtn"/>
+    </actionGroup>
+
+    <!-- Delete exported file -->
+    <actionGroup name="deleteExportedFile">
+        <arguments>
+            <argument name="rowIndex" type="string"/>
+        </arguments>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormReload"/>
+        <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex(rowIndex)}}"/>
+        <click stepKey="clickOnDelete" selector="{{AdminExportAttributeSection.delete(rowIndex)}}" after="clickSelectBtn"/>
+        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForExportDataDeleted" />
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
new file mode 100644
index 0000000000000..1f5ae6b6905bc
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
@@ -0,0 +1,126 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminExportBundleProductTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export Bundle Product"/>
+            <description value="Admin should be able to export Bundle Product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14008"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!--Create bundle product with dynamic price with two simple products -->
+            <createData entity="SimpleProduct2" stepKey="firstSimpleProductForDynamic"/>
+            <createData entity="SimpleProduct2" stepKey="secondSimpleProductForDynamic"/>
+            <createData entity="ApiBundleProduct" stepKey="createDynamicBundleProduct"/>
+            <createData entity="DropDownBundleOption" stepKey="createFirstBundleOption">
+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="firstLinkOptionToDynamicProduct">
+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
+                <requiredEntity createDataKey="createFirstBundleOption"/>
+                <requiredEntity createDataKey="firstSimpleProductForDynamic"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="secondLinkOptionToDynamicProduct">
+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
+                <requiredEntity createDataKey="createFirstBundleOption"/>
+                <requiredEntity createDataKey="secondSimpleProductForDynamic"/>
+            </createData>
+
+            <!-- Create bundle product with fixed price with two simple products -->
+            <createData entity="SimpleProduct2" stepKey="firstSimpleProductForFixed"/>
+            <createData entity="SimpleProduct2" stepKey="secondSimpleProductForFixed"/>
+            <createData entity="ApiFixedBundleProduct" stepKey="createFixedBundleProduct"/>
+            <createData entity="DropDownBundleOption" stepKey="createSecondBundleOption">
+                <requiredEntity createDataKey="createFixedBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="firstLinkOptionToFixedProduct">
+                <requiredEntity createDataKey="createFixedBundleProduct"/>
+                <requiredEntity createDataKey="createSecondBundleOption"/>
+                <requiredEntity createDataKey="firstSimpleProductForFixed"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="secondLinkOptionToFixedProduct">
+                <requiredEntity createDataKey="createFixedBundleProduct"/>
+                <requiredEntity createDataKey="createSecondBundleOption"/>
+                <requiredEntity createDataKey="secondSimpleProductForFixed"/>
+            </createData>
+
+            <!-- Create bundle product with custom textarea attribute with two simple products -->
+            <createData entity="productAttributeWysiwyg" stepKey="createProductAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addToDefaultAttributeSet">
+                <requiredEntity createDataKey="createProductAttribute"/>
+            </createData>
+            <createData entity="ApiFixedBundleProduct" stepKey="createFixedBundleProductWithAttribute">
+                <requiredEntity createDataKey="addToDefaultAttributeSet"/>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="firstSimpleProductForFixedWithAttribute"/>
+            <createData entity="SimpleProduct2" stepKey="secondSimpleProductForFixedWithAttribute"/>
+            <createData entity="DropDownBundleOption" stepKey="createBundleOptionWithAttribute">
+                <requiredEntity createDataKey="createFixedBundleProductWithAttribute"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="firstLinkOptionToFixedProductWithAttribute">
+                <requiredEntity createDataKey="createFixedBundleProductWithAttribute"/>
+                <requiredEntity createDataKey="createBundleOptionWithAttribute"/>
+                <requiredEntity createDataKey="firstSimpleProductForFixedWithAttribute"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="secondLinkOptionToFixedProductWithAttribute">
+                <requiredEntity createDataKey="createFixedBundleProductWithAttribute"/>
+                <requiredEntity createDataKey="createBundleOptionWithAttribute"/>
+                <requiredEntity createDataKey="secondSimpleProductForFixedWithAttribute"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
+
+            <!-- Delete products creations -->
+            <deleteData createDataKey="createDynamicBundleProduct" stepKey="deleteDynamicBundleProduct"/>
+            <deleteData createDataKey="firstSimpleProductForDynamic" stepKey="deleteFirstSimpleProductForDynamic"/>
+            <deleteData createDataKey="secondSimpleProductForDynamic" stepKey="deleteSecondSimpleProductForDynamic"/>
+            <deleteData createDataKey="createFixedBundleProduct" stepKey="deleteFixedBundleProduct"/>
+            <deleteData createDataKey="firstSimpleProductForFixed" stepKey="deleteFirstSimpleProductForFixed"/>
+            <deleteData createDataKey="secondSimpleProductForFixed" stepKey="deleteSecondSimpleProductForFixed"/>
+            <deleteData createDataKey="createFixedBundleProductWithAttribute" stepKey="deleteFixedBundleProductWithAttribute"/>
+            <deleteData createDataKey="firstSimpleProductForFixedWithAttribute" stepKey="deleteFirstSimpleProductForFixedWithAttribute"/>
+            <deleteData createDataKey="secondSimpleProductForFixedWithAttribute" stepKey="deleteSecondSimpleProductForFixedWithAttribute"/>
+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+
+        <!-- Export created below products -->
+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
+
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
new file mode 100644
index 0000000000000..a587d71ba0e68
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
@@ -0,0 +1,91 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminExportGroupedProductWithSpecialPriceTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export grouped product with special price"/>
+            <description value="Admin should be able to export grouped product with special price"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14009"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create first simple product and add special price  -->
+            <createData entity="SimpleProduct2" stepKey="createFirstSimpleProduct"/>
+            <createData entity="specialProductPrice2" stepKey="specialPriceToFirstProduct">
+                <requiredEntity createDataKey="createFirstSimpleProduct"/>
+            </createData>
+
+             <!-- Create second simple product and add special price-->
+            <createData entity="SimpleProduct2" stepKey="createSecondSimpleProduct"/>
+            <createData entity="specialProductPrice2" stepKey="specialPriceToSecondProduct">
+                <requiredEntity createDataKey="createSecondSimpleProduct"/>
+            </createData>
+
+            <!-- Create category -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+
+            <!-- Create group product with created below simple products -->
+            <createData entity="ApiGroupedProduct2" stepKey="createGroupedProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="OneSimpleProductLink" stepKey="addFirstProduct">
+                <requiredEntity createDataKey="createGroupedProduct"/>
+                <requiredEntity createDataKey="createFirstSimpleProduct"/>
+            </createData>
+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addFirstProduct" stepKey="addSecondProduct">
+                <requiredEntity createDataKey="createGroupedProduct"/>
+                <requiredEntity createDataKey="createSecondSimpleProduct"/>
+            </updateData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
+
+            <!-- Deleted created products -->
+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
+            <deleteData createDataKey="createGroupedProduct" stepKey="deleteGroupedProduct"/>
+
+            <!-- Delete category -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
+
+        <!-- Export created below products -->
+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
+
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
new file mode 100644
index 0000000000000..6f64da4693692
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
@@ -0,0 +1,118 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export Simple and Configurable products with custom options"/>
+            <description value="Admin should be able to export Simple and Configurable products with custom options"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14005"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create category -->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+
+            <!-- Create configurable product with two attributes -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Add custom options to configurable product -->
+            <updateData createDataKey="createConfigProduct" entity="productWithOptions" stepKey="updateProductWithOptions"/>
+
+            <!-- Create two simple product which will be the part of configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigFirstChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigSecondChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+
+            <!-- Add created below children products to configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddFirstChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddSecondChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
+
+            <!-- Delete configurable product creation -->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigFirstChildProduct" stepKey="deleteConfigFirstChildProduct"/>
+            <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
+
+        <!-- Fill entity attributes data -->
+        <actionGroup ref="exportProductsFilterByAttribute" stepKey="exportProductBySku">
+            <argument name="attribute" value="sku"/>
+            <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
+
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
new file mode 100644
index 0000000000000..993f1c9cd9da2
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
@@ -0,0 +1,134 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export Simple product and Configurable products with assigned images"/>
+            <description value="Admin should be able to export Simple and Configurable products with assigned images"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14004"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create category -->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+
+            <!-- Create configurable product with two attributes -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create first simple product which will be the part of configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigFirstChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+            </createData>
+
+            <!-- Add image to first simple product -->
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigChildFirstProductImage">
+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
+            </createData>
+
+            <!-- Create second simple product which will be the part of configurable product -->
+            <createData entity="ApiSimpleTwo" stepKey="createConfigSecondChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+
+            <!-- Add image to second simple product -->
+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createConfigSecondChildProductImage">
+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
+            </createData>
+
+            <!-- Add two options to configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+
+            <!-- Add created below children products to configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddFirstChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddSecondChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
+            </createData>
+
+            <!-- Add image to configurable product -->
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigProductImage">
+                <requiredEntity createDataKey="createConfigProduct"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
+
+            <!-- Delete configurable product creation -->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigFirstChildProduct" stepKey="deleteConfigFirstChildProduct"/>
+            <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
+
+        <!-- Fill entity attributes data -->
+        <actionGroup ref="exportProductsFilterByAttribute" stepKey="exportProductBySku">
+            <argument name="attribute" value="sku"/>
+            <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
+
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
new file mode 100644
index 0000000000000..491d20604a08b
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
@@ -0,0 +1,116 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export Simple Product assigned to Main Website and Configurable Product assigned to Custom Website"/>
+            <description value="Admin should be able to export Simple Product assigned to Main Website and Configurable Product assigned to Custom Website"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14006"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create simple product -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Create configurable product -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create two simple product which will be the part of configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigFirstChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigSecondChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddFirstChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddSecondChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
+
+            <!-- Delete simple product -->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+
+            <!-- Delete configurable product creation -->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigFirstChildProduct" stepKey="deleteConfigFirstChildProduct"/>
+            <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
+
+        <!-- Export created below products -->
+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
+
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
new file mode 100644
index 0000000000000..f671b54803e35
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
@@ -0,0 +1,68 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminExportSimpleProductWithCustomAttributeTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export Simple Product with custom attribute"/>
+            <description value="Admin should be able to export Simple Product with custom attribute"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14007"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create simple product with custom attribute set -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
+            <createData entity="SimpleProductWithCustomAttributeSet" stepKey="createSimpleProductWithCustomAttributeSet">
+                <requiredEntity createDataKey="createCategory"/>
+                <requiredEntity createDataKey="createAttributeSet"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
+
+            <!-- Delete product creations -->
+            <deleteData createDataKey="createSimpleProductWithCustomAttributeSet" stepKey="deleteSimpleProductWithCustomAttributeSet"/>
+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
+
+        <!-- Export created below products -->
+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
+
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php b/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
index 2c52b49c1a039..0a02d4eb6a9a6 100644
--- a/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
+++ b/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
@@ -7,6 +7,8 @@
 namespace Magento\CatalogInventory\Model;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Search\Model\EngineResolver;
 
 /**
  * Catalog inventory module plugin
@@ -17,18 +19,27 @@ class AddStockStatusToCollection
      * @var \Magento\CatalogInventory\Helper\Stock
      */
     protected $stockHelper;
-    
+
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
     /**
-     * @param \Magento\CatalogInventory\Model\Configuration $configuration
      * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
+     * @param EngineResolverInterface $engineResolver
      */
     public function __construct(
-        \Magento\CatalogInventory\Helper\Stock $stockHelper
+        \Magento\CatalogInventory\Helper\Stock $stockHelper,
+        EngineResolverInterface $engineResolver
     ) {
         $this->stockHelper = $stockHelper;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
+     * Add stock filter to collection.
+     *
      * @param Collection $productCollection
      * @param bool $printQuery
      * @param bool $logQuery
@@ -36,7 +47,9 @@ public function __construct(
      */
     public function beforeLoad(Collection $productCollection, $printQuery = false, $logQuery = false)
     {
-        $this->stockHelper->addIsInStockFilterToCollection($productCollection);
+        if ($this->engineResolver->getCurrentSearchEngine() === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE) {
+            $this->stockHelper->addIsInStockFilterToCollection($productCollection);
+        }
         return [$printQuery, $logQuery];
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
index bc10d38173b4d..43a5aabee9779 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
@@ -6,12 +6,19 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\CatalogInventory\Model\Indexer\Stock\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement;
+use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock;
 use Magento\Framework\App\ResourceConnection;
 use Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory;
 use Magento\Catalog\Model\Product\Type as ProductType;
+use Magento\Framework\DB\Query\BatchIteratorInterface;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\Indexer\CacheContext;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -25,7 +32,6 @@
 /**
  * Class Full reindex action
  *
- * @package Magento\CatalogInventory\Model\Indexer\Stock\Action
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Full extends AbstractAction
@@ -60,6 +66,11 @@ class Full extends AbstractAction
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var QueryGenerator|null
+     */
+    private $batchQueryGenerator;
+
     /**
      * @param ResourceConnection $resource
      * @param StockFactory $indexerFactory
@@ -71,7 +82,7 @@ class Full extends AbstractAction
      * @param BatchProviderInterface|null $batchProvider
      * @param array $batchRowsCount
      * @param ActiveTableSwitcher|null $activeTableSwitcher
-     *
+     * @param QueryGenerator|null $batchQueryGenerator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -84,7 +95,8 @@ public function __construct(
         BatchSizeManagementInterface $batchSizeManagement = null,
         BatchProviderInterface $batchProvider = null,
         array $batchRowsCount = [],
-        ActiveTableSwitcher $activeTableSwitcher = null
+        ActiveTableSwitcher $activeTableSwitcher = null,
+        QueryGenerator $batchQueryGenerator = null
     ) {
         parent::__construct(
             $resource,
@@ -97,11 +109,12 @@ public function __construct(
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
         $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(BatchProviderInterface::class);
         $this->batchSizeManagement = $batchSizeManagement ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement::class
+            BatchSizeManagement::class
         );
         $this->batchRowsCount = $batchRowsCount;
         $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()
             ->get(ActiveTableSwitcher::class);
+        $this->batchQueryGenerator = $batchQueryGenerator ?: ObjectManager::getInstance()->get(QueryGenerator::class);
     }
 
     /**
@@ -109,22 +122,20 @@ public function __construct(
      *
      * @param null|array $ids
      * @throws LocalizedException
-     *
      * @return void
-     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute($ids = null)
+    public function execute($ids = null): void
     {
         try {
             $this->useIdxTable(false);
             $this->cleanIndexersTables($this->_getTypeIndexers());
 
-            $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+            $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
 
             $columns = array_keys($this->_getConnection()->describeTable($this->_getIdxTable()));
 
-            /** @var \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock $indexer */
+            /** @var DefaultStock $indexer */
             foreach ($this->_getTypeIndexers() as $indexer) {
                 $indexer->setActionType(self::ACTION_TYPE);
                 $connection = $indexer->getConnection();
@@ -135,22 +146,21 @@ public function execute($ids = null)
                     : $this->batchRowsCount['default'];
 
                 $this->batchSizeManagement->ensureBatchSize($connection, $batchRowCount);
-                $batches = $this->batchProvider->getBatches(
-                    $connection,
-                    $entityMetadata->getEntityTable(),
+
+                $select = $connection->select();
+                $select->distinct(true);
+                $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
+
+                $batchQueries = $this->batchQueryGenerator->generate(
                     $entityMetadata->getIdentifierField(),
-                    $batchRowCount
+                    $select,
+                    $batchRowCount,
+                    BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
                 );
 
-                foreach ($batches as $batch) {
+                foreach ($batchQueries as $query) {
                     $this->clearTemporaryIndexTable();
-                    // Get entity ids from batch
-                    $select = $connection->select();
-                    $select->distinct(true);
-                    $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-                    $select->where('type_id = ?', $indexer->getTypeId());
-
-                    $entityIds = $this->batchProvider->getBatchIds($connection, $select, $batch);
+                    $entityIds = $connection->fetchCol($query);
                     if (!empty($entityIds)) {
                         $indexer->reindexEntity($entityIds);
                         $select = $connection->select()->from($this->_getIdxTable(), $columns);
@@ -167,12 +177,13 @@ public function execute($ids = null)
 
     /**
      * Delete all records from index table
+     *
      * Used to clean table before re-indexation
      *
      * @param array $indexers
      * @return void
      */
-    private function cleanIndexersTables(array $indexers)
+    private function cleanIndexersTables(array $indexers): void
     {
         $tables = array_map(
             function (StockInterface $indexer) {
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
index b8e8e47bb1fb0..168e947b8fa57 100644
--- a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
@@ -3,8 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogInventory\Model\Plugin;
 
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Search\Model\EngineResolver;
+
+/**
+ * Catalog inventory plugin for layer.
+ */
 class Layer
 {
     /**
@@ -21,16 +28,24 @@ class Layer
      */
     protected $scopeConfig;
 
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
     /**
      * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param EngineResolverInterface $engineResolver
      */
     public function __construct(
         \Magento\CatalogInventory\Helper\Stock $stockHelper,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        EngineResolverInterface $engineResolver
     ) {
         $this->stockHelper = $stockHelper;
         $this->scopeConfig = $scopeConfig;
+        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -46,12 +61,22 @@ public function beforePrepareProductCollection(
         \Magento\Catalog\Model\Layer $subject,
         \Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection $collection
     ) {
-        if ($this->_isEnabledShowOutOfStock()) {
+        if (!$this->isCurrentEngineMysql() || $this->_isEnabledShowOutOfStock()) {
             return;
         }
         $this->stockHelper->addIsInStockFilterToCollection($collection);
     }
 
+    /**
+     * Check if current engine is MYSQL.
+     *
+     * @return bool
+     */
+    private function isCurrentEngineMysql()
+    {
+        return $this->engineResolver->getCurrentSearchEngine() === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE;
+    }
+
     /**
      * Get config value for 'display out of stock' option
      *
diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
index f711268bc7930..0fa4b919c40fa 100644
--- a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
@@ -7,16 +7,24 @@
 
 /**
  * Interface StockRegistryProviderInterface
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockRegistryProviderInterface
 {
     /**
+     * Get stock.
+     *
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
      */
     public function getStock($scopeId);
 
     /**
+     * Get stock item.
+     *
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
@@ -24,6 +32,8 @@ public function getStock($scopeId);
     public function getStockItem($productId, $scopeId);
 
     /**
+     * Get stock status.
+     *
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
index 89fb54e7e496b..30f703b5b928f 100644
--- a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
@@ -9,22 +9,32 @@
 
 /**
  * Interface StockStateProviderInterface
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockStateProviderInterface
 {
     /**
+     * Verify stock.
+     *
      * @param StockItemInterface $stockItem
      * @return bool
      */
     public function verifyStock(StockItemInterface $stockItem);
 
     /**
+     * Verify notification.
+     *
      * @param StockItemInterface $stockItem
      * @return bool
      */
     public function verifyNotification(StockItemInterface $stockItem);
 
     /**
+     * Validate quote qty.
+     *
      * @param StockItemInterface $stockItem
      * @param int|float $itemQty
      * @param int|float $qtyToCheck
@@ -44,8 +54,9 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $itemQty, $qtyT
     public function checkQty(StockItemInterface $stockItem, $qty);
 
     /**
-     * Returns suggested qty that satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions
-     * or original qty if such value does not exist
+     * Returns suggested qty or original qty if such value does not exist.
+     *
+     * Suggested qty satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions.
      *
      * @param StockItemInterface $stockItem
      * @param int|float $qty
@@ -54,6 +65,8 @@ public function checkQty(StockItemInterface $stockItem, $qty);
     public function suggestQty(StockItemInterface $stockItem, $qty);
 
     /**
+     * Check qty increments.
+     *
      * @param StockItemInterface $stockItem
      * @param int|float $qty
      * @return \Magento\Framework\DataObject
diff --git a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
new file mode 100644
index 0000000000000..334d2b22edbfa
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogInventory\Plugin;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+
+/**
+ * MassUpdate product attribute.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MassUpdateProductAttribute
+{
+    /**
+     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
+     */
+    private $stockIndexerProcessor;
+
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\StockRegistryInterface
+     */
+    private $stockRegistry;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface
+     */
+    private $stockItemRepository;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
+    /**
+     * @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute
+     */
+    private $attributeHelper;
+
+    /**
+     * @var \Magento\Framework\Message\ManagerInterface
+     */
+    private $messageManager;
+
+    /**
+     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
+     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
+     * @param \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository
+     * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
+     * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
+     * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
+        \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
+        \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository,
+        \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
+        \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper,
+        \Magento\Framework\Message\ManagerInterface $messageManager
+    ) {
+        $this->stockIndexerProcessor = $stockIndexerProcessor;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->stockRegistry = $stockRegistry;
+        $this->stockItemRepository = $stockItemRepository;
+        $this->stockConfiguration = $stockConfiguration;
+        $this->attributeHelper = $attributeHelper;
+        $this->messageManager = $messageManager;
+    }
+
+    /**
+     * Around execute plugin
+     *
+     * @param Save $subject
+     * @param callable $proceed
+     *
+     * @return \Magento\Framework\Controller\ResultInterface
+     */
+    public function aroundExecute(Save $subject, callable $proceed)
+    {
+        try {
+            /** @var \Magento\Framework\App\RequestInterface $request */
+            $request = $subject->getRequest();
+            $inventoryData = $request->getParam('inventory', []);
+            $inventoryData = $this->addConfigSettings($inventoryData);
+
+            $storeId = $this->attributeHelper->getSelectedStoreId();
+            $websiteId = $this->attributeHelper->getStoreWebsiteId($storeId);
+            $productIds = $this->attributeHelper->getProductIds();
+
+            if (!empty($inventoryData)) {
+                $this->updateInventoryInProducts($productIds, $websiteId, $inventoryData);
+            }
+
+            return $proceed();
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $this->messageManager->addErrorMessage($e->getMessage());
+            return $proceed();
+        } catch (\Exception $e) {
+            $this->messageManager->addExceptionMessage(
+                $e,
+                __('Something went wrong while updating the product(s) attributes.')
+            );
+            return $proceed();
+        }
+    }
+
+    /**
+     * Add config settings
+     *
+     * @param array $inventoryData
+     *
+     * @return array
+     */
+    private function addConfigSettings($inventoryData)
+    {
+        $options = $this->stockConfiguration->getConfigItemOptions();
+        foreach ($options as $option) {
+            $useConfig = 'use_config_' . $option;
+            if (isset($inventoryData[$option]) && !isset($inventoryData[$useConfig])) {
+                $inventoryData[$useConfig] = 0;
+            }
+        }
+        return $inventoryData;
+    }
+
+    /**
+     * Update inventory in products
+     *
+     * @param array $productIds
+     * @param int $websiteId
+     * @param array $inventoryData
+     *
+     * @return void
+     */
+    private function updateInventoryInProducts($productIds, $websiteId, $inventoryData): void
+    {
+        foreach ($productIds as $productId) {
+            $stockItemDo = $this->stockRegistry->getStockItem($productId, $websiteId);
+            if (!$stockItemDo->getProductId()) {
+                $inventoryData['product_id'] = $productId;
+            }
+            $stockItemId = $stockItemDo->getId();
+            $this->dataObjectHelper->populateWithArray($stockItemDo, $inventoryData, StockItemInterface::class);
+            $stockItemDo->setItemId($stockItemId);
+            $this->stockItemRepository->save($stockItemDo);
+        }
+        $this->stockIndexerProcessor->reindexList($productIds);
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/AddStockStatusToCollectionTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/AddStockStatusToCollectionTest.php
index af35666ced3e5..906df54732775 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/AddStockStatusToCollectionTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/AddStockStatusToCollectionTest.php
@@ -6,6 +6,7 @@
 namespace Magento\CatalogInventory\Test\Unit\Model;
 
 use Magento\CatalogInventory\Model\AddStockStatusToCollection;
+use Magento\Framework\Search\EngineResolverInterface;
 
 class AddStockStatusToCollectionTest extends \PHPUnit\Framework\TestCase
 {
@@ -19,13 +20,24 @@ class AddStockStatusToCollectionTest extends \PHPUnit\Framework\TestCase
      */
     protected $stockHelper;
 
+    /**
+     * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $engineResolver;
+
     protected function setUp()
     {
         $this->stockHelper = $this->createMock(\Magento\CatalogInventory\Helper\Stock::class);
+        $this->engineResolver = $this->getMockBuilder(EngineResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCurrentSearchEngine'])
+            ->getMockForAbstractClass();
+
         $this->plugin = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
             \Magento\CatalogInventory\Model\AddStockStatusToCollection::class,
             [
                 'stockHelper' => $this->stockHelper,
+                'engineResolver' => $this->engineResolver
             ]
         );
     }
@@ -36,6 +48,10 @@ public function testAddStockStatusToCollection()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->engineResolver->expects($this->any())
+            ->method('getCurrentSearchEngine')
+            ->willReturn('mysql');
+
         $this->stockHelper->expects($this->once())
             ->method('addIsInStockFilterToCollection')
             ->with($productCollection)
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/LayerTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/LayerTest.php
index 287459bd8cbc8..b64563a35176d 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/LayerTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/LayerTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\CatalogInventory\Test\Unit\Model\Plugin;
 
+use Magento\Framework\Search\EngineResolverInterface;
+
 class LayerTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -22,14 +24,24 @@ class LayerTest extends \PHPUnit\Framework\TestCase
      */
     protected $_stockHelperMock;
 
+    /**
+     * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $engineResolver;
+
     protected function setUp()
     {
         $this->_scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->_stockHelperMock = $this->createMock(\Magento\CatalogInventory\Helper\Stock::class);
+        $this->engineResolver = $this->getMockBuilder(EngineResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCurrentSearchEngine'])
+            ->getMockForAbstractClass();
 
         $this->_model = new \Magento\CatalogInventory\Model\Plugin\Layer(
             $this->_stockHelperMock,
-            $this->_scopeConfigMock
+            $this->_scopeConfigMock,
+            $this->engineResolver
         );
     }
 
@@ -38,6 +50,10 @@ protected function setUp()
      */
     public function testAddStockStatusDisabledShow()
     {
+        $this->engineResolver->expects($this->any())
+            ->method('getCurrentSearchEngine')
+            ->willReturn('mysql');
+
         $this->_scopeConfigMock->expects(
             $this->once()
         )->method(
@@ -60,6 +76,10 @@ public function testAddStockStatusDisabledShow()
      */
     public function testAddStockStatusEnabledShow()
     {
+        $this->engineResolver->expects($this->any())
+            ->method('getCurrentSearchEngine')
+            ->willReturn('mysql');
+
         $this->_scopeConfigMock->expects(
             $this->once()
         )->method(
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index 007d744b2296f..eb6239ea87ef0 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -8,6 +8,7 @@
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
         "magento/module-catalog": "*",
+        "magento/module-search": "*",
         "magento/module-config": "*",
         "magento/module-customer": "*",
         "magento/module-eav": "*",
diff --git a/app/code/Magento/CatalogInventory/etc/di.xml b/app/code/Magento/CatalogInventory/etc/di.xml
index 8d57fab843f4c..e7d79c593b8c7 100644
--- a/app/code/Magento/CatalogInventory/etc/di.xml
+++ b/app/code/Magento/CatalogInventory/etc/di.xml
@@ -44,7 +44,7 @@
     </type>
     <type name="Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver">
         <arguments>
-            <argument name="resourceStock" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy</argument>
+            <argument name="resourceStockItem" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Item\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Layer">
@@ -135,4 +135,7 @@
     <type name="Magento\CatalogInventory\Model\ResourceModel\Stock\Item">
         <plugin name="priceIndexUpdater" type="Magento\CatalogInventory\Model\Plugin\PriceIndexUpdater" />
     </type>
+    <type name="Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save">
+        <plugin name="massAction" type="Magento\CatalogInventory\Plugin\MassUpdateProductAttribute" />
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
index 184fd9cfd5b37..384132415a10e 100644
--- a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
+++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
@@ -60,15 +60,9 @@ public function execute()
     {
         try {
             $this->_catalogSearchAdvanced->addFilters($this->getRequest()->getQueryValue());
-            $size = $this->_catalogSearchAdvanced->getProductCollection()->getSize();
-
-            $handles = null;
-            if ($size == 0) {
-                $this->_view->getPage()->initLayout();
-                $handles = $this->_view->getLayout()->getUpdate()->getHandles();
-                $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
-            }
-
+            $this->_view->getPage()->initLayout();
+            $handles = $this->_view->getLayout()->getUpdate()->getHandles();
+            $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
             $this->_view->loadLayout($handles);
             $this->_view->renderLayout();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index af0e9ff5528cf..5b96a8c21cbea 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -6,6 +6,8 @@
 namespace Magento\CatalogSearch\Model;
 
 use Magento\Catalog\Model\Config;
+use Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyProvider;
+use Magento\CatalogSearch\Model\Search\ItemCollectionProviderInterface;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
@@ -19,6 +21,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Catalog advanced search model
@@ -64,6 +67,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
     /**
      * Initialize dependencies
      *
+     * @deprecated
      * @var Config
      */
     protected $_catalogConfig;
@@ -106,10 +110,22 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
     /**
      * Advanced Collection Factory
      *
+     * @deprecated
+     * @see $collectionProvider
      * @var ProductCollectionFactory
      */
     protected $productCollectionFactory;
 
+    /**
+     * @var ItemCollectionProviderInterface
+     */
+    private $collectionProvider;
+
+    /**
+     * @var ProductCollectionPrepareStrategyProvider|null
+     */
+    private $productCollectionPrepareStrategyProvider;
+
     /**
      * Construct
      *
@@ -124,7 +140,8 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * @param ProductCollectionFactory $productCollectionFactory
      * @param AdvancedFactory $advancedFactory
      * @param array $data
-     *
+     * @param ItemCollectionProviderInterface|null $collectionProvider
+     * @param ProductCollectionPrepareStrategyProvider|null $productCollectionPrepareStrategyProvider
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -138,7 +155,9 @@ public function __construct(
         StoreManagerInterface $storeManager,
         ProductCollectionFactory $productCollectionFactory,
         AdvancedFactory $advancedFactory,
-        array $data = []
+        array $data = [],
+        ItemCollectionProviderInterface $collectionProvider = null,
+        ProductCollectionPrepareStrategyProvider $productCollectionPrepareStrategyProvider = null
     ) {
         $this->_attributeCollectionFactory = $attributeCollectionFactory;
         $this->_catalogProductVisibility = $catalogProductVisibility;
@@ -147,11 +166,14 @@ public function __construct(
         $this->_productFactory = $productFactory;
         $this->_storeManager = $storeManager;
         $this->productCollectionFactory = $productCollectionFactory;
+        $this->collectionProvider = $collectionProvider;
+        $this->productCollectionPrepareStrategyProvider = $productCollectionPrepareStrategyProvider
+            ?: ObjectManager::getInstance()->get(ProductCollectionPrepareStrategyProvider::class);
         parent::__construct(
             $context,
             $registry,
             $advancedFactory->create(),
-            $this->productCollectionFactory->create(),
+            $this->resolveProductCollection(),
             $data
         );
     }
@@ -266,7 +288,7 @@ public function getAttributes()
     public function getProductCollection()
     {
         if ($this->_productCollection === null) {
-            $collection = $this->productCollectionFactory->create();
+            $collection = $this->resolveProductCollection();
             $this->prepareProductCollection($collection);
             if (!$collection) {
                 return $collection;
@@ -277,6 +299,18 @@ public function getProductCollection()
         return $this->_productCollection;
     }
 
+    /**
+     * Resolve product collection.
+     *
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection|\Magento\Framework\Data\Collection
+     */
+    private function resolveProductCollection()
+    {
+        return (null === $this->collectionProvider)
+            ? $this->productCollectionFactory->create()
+            : $this->collectionProvider->getCollection();
+    }
+
     /**
      * Prepare product collection
      *
@@ -285,13 +319,7 @@ public function getProductCollection()
      */
     public function prepareProductCollection($collection)
     {
-        $collection
-            ->addAttributeToSelect($this->_catalogConfig->getProductAttributes())
-            ->setStore($this->_storeManager->getStore())
-            ->addMinimalPrice()
-            ->addTaxPercents()
-            ->addStoreFilter()
-            ->setVisibility($this->_catalogProductVisibility->getVisibleInSearchIds());
+        $this->productCollectionPrepareStrategyProvider->getStrategy()->prepare($collection);
 
         return $this;
     }
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategy.php b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategy.php
new file mode 100644
index 0000000000000..e62de9c689fc2
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategy.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogSearch\Model\Advanced;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\Config;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Strategy interface for preparing product collection.
+ */
+class ProductCollectionPrepareStrategy implements ProductCollectionPrepareStrategyInterface
+{
+    /**
+     * @var Config
+     */
+    private $catalogConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Visibility
+     */
+    private $catalogProductVisibility;
+
+    /**
+     * @param Config $catalogConfig
+     * @param StoreManagerInterface $storeManager
+     * @param Visibility $catalogProductVisibility
+     */
+    public function __construct(
+        Config $catalogConfig,
+        StoreManagerInterface $storeManager,
+        Visibility $catalogProductVisibility
+    ) {
+        $this->catalogConfig = $catalogConfig;
+        $this->storeManager = $storeManager;
+        $this->catalogProductVisibility = $catalogProductVisibility;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function prepare(Collection $collection)
+    {
+        $collection
+            ->addAttributeToSelect($this->catalogConfig->getProductAttributes())
+            ->setStore($this->storeManager->getStore())
+            ->addMinimalPrice()
+            ->addTaxPercents()
+            ->addStoreFilter()
+            ->setVisibility($this->catalogProductVisibility->getVisibleInSearchIds());
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyInterface.php b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyInterface.php
new file mode 100644
index 0000000000000..23719a6713a32
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogSearch\Model\Advanced;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+
+/**
+ * Strategy interface for preparing product collection.
+ */
+interface ProductCollectionPrepareStrategyInterface
+{
+    /**
+     * Prepare product collection.
+     *
+     * @param Collection $collection
+     * @return void
+     */
+    public function prepare(Collection $collection);
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyProvider.php b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyProvider.php
new file mode 100644
index 0000000000000..6e963ea1aa8ac
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyProvider.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogSearch\Model\Advanced;
+
+use Magento\Framework\Search\EngineResolverInterface;
+
+/**
+ * Strategy provider for preparing product collection.
+ */
+class ProductCollectionPrepareStrategyProvider
+{
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
+    /**
+     * @var array
+     */
+    private $strategies;
+
+    /**
+     * @param EngineResolverInterface $engineResolver
+     * @param array $strategies
+     */
+    public function __construct(
+        EngineResolverInterface $engineResolver,
+        array $strategies
+    ) {
+        $this->engineResolver = $engineResolver;
+        $this->strategies = $strategies;
+    }
+
+    /**
+     * Get strategy provider for product collection prepare process.
+     *
+     * @return ProductCollectionPrepareStrategyInterface
+     */
+    public function getStrategy(): ProductCollectionPrepareStrategyInterface
+    {
+        if (!isset($this->strategies[$this->engineResolver->getCurrentSearchEngine()])) {
+            throw new \DomainException('Undefined strategy ' . $this->engineResolver->getCurrentSearchEngine());
+        }
+        return $this->strategies[$this->engineResolver->getCurrentSearchEngine()];
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
index 2d175f684b0f7..e3f61af771f8c 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -9,17 +9,27 @@
 use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Search\Model\EngineResolver;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
 use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
 use Magento\Framework\Api\Search\SearchResultFactory;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Indexer\DimensionFactory;
 use Magento\Framework\Model\ResourceModel\ResourceModelPoolInterface;
-use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
 use Magento\Framework\Search\Request\EmptyRequestDataException;
 use Magento\Framework\Search\Request\NonExistingRequestNameException;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Api\Search\SearchResultInterface;
 
 /**
  * Advanced search collection
@@ -65,6 +75,41 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     private $filterBuilder;
 
+    /**
+     * @var \Magento\Framework\Api\Search\SearchResultInterface
+     */
+    private $searchResult;
+
+    /**
+     * @var string
+     */
+    private $searchRequestName;
+
+    /**
+     * @var SearchCriteriaResolverFactory
+     */
+    private $searchCriteriaResolverFactory;
+
+    /**
+     * @var SearchResultApplierFactory
+     */
+    private $searchResultApplierFactory;
+
+    /**
+     * @var TotalRecordsResolverFactory
+     */
+    private $totalRecordsResolverFactory;
+
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
+    /**
+     * @var array
+     */
+    private $searchOrders;
+
     /**
      * Collection constructor
      *
@@ -93,11 +138,16 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
      * @param SearchResultFactory|null $searchResultFactory
      * @param ProductLimitationFactory|null $productLimitationFactory
-     * @param MetadataPool|null $metadataPool     *
+     * @param MetadataPool|null $metadataPool
      * @param TableMaintainer|null $tableMaintainer
      * @param PriceTableResolver|null $priceTableResolver
      * @param DimensionFactory|null $dimensionFactory
      * @param ResourceModelPoolInterface|null $resourceModelPool
+     * @param string $searchRequestName
+     * @param SearchCriteriaResolverFactory|null $searchCriteriaResolverFactory
+     * @param SearchResultApplierFactory|null $searchResultApplierFactory
+     * @param TotalRecordsResolverFactory|null $totalRecordsResolverFactory
+     * @param EngineResolverInterface|null $engineResolver
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -130,15 +180,29 @@ public function __construct(
         TableMaintainer $tableMaintainer = null,
         PriceTableResolver $priceTableResolver = null,
         DimensionFactory $dimensionFactory = null,
-        ResourceModelPoolInterface $resourceModelPool = null
+        ResourceModelPoolInterface $resourceModelPool = null,
+        $searchRequestName = 'advanced_search_container',
+        SearchCriteriaResolverFactory $searchCriteriaResolverFactory = null,
+        SearchResultApplierFactory $searchResultApplierFactory = null,
+        TotalRecordsResolverFactory $totalRecordsResolverFactory = null,
+        EngineResolverInterface $engineResolver = null
     ) {
         $this->requestBuilder = $requestBuilder;
         $this->searchEngine = $searchEngine;
         $this->temporaryStorageFactory = $temporaryStorageFactory;
+        $this->searchRequestName = $searchRequestName;
         if ($searchResultFactory === null) {
             $this->searchResultFactory = \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magento\Framework\Api\Search\SearchResultFactory::class);
         }
+        $this->searchCriteriaResolverFactory = $searchCriteriaResolverFactory ?: ObjectManager::getInstance()
+            ->get(SearchCriteriaResolverFactory::class);
+        $this->searchResultApplierFactory = $searchResultApplierFactory ?: ObjectManager::getInstance()
+            ->get(SearchResultApplierFactory::class);
+        $this->totalRecordsResolverFactory = $totalRecordsResolverFactory ?: ObjectManager::getInstance()
+            ->get(TotalRecordsResolverFactory::class);
+        $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()
+            ->get(EngineResolverInterface::class);
         parent::__construct(
             $entityFactory,
             $logger,
@@ -184,11 +248,89 @@ public function addFieldsToFilter($fields)
         return $this;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function setOrder($attribute, $dir = Select::SQL_DESC)
+    {
+        $this->setSearchOrder($attribute, $dir);
+        if ($this->isCurrentEngineMysql()) {
+            parent::setOrder($attribute, $dir);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
+    {
+        /**
+         * This changes need in backward compatible reasons for support dynamic improved algorithm
+         * for price aggregation process.
+         */
+        if ($this->isCurrentEngineMysql()) {
+            parent::addCategoryFilter($category);
+        } else {
+            $this->addFieldToFilter('category_ids', $category->getId());
+            $this->_productLimitationPrice();
+        }
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setVisibility($visibility)
+    {
+        /**
+         * This changes need in backward compatible reasons for support dynamic improved algorithm
+         * for price aggregation process.
+         */
+        if ($this->isCurrentEngineMysql()) {
+            parent::setVisibility($visibility);
+        } else {
+            $this->addFieldToFilter('visibility', $visibility);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set sort order for search query.
+     *
+     * @param string $field
+     * @param string $direction
+     * @return void
+     */
+    private function setSearchOrder($field, $direction)
+    {
+        $field = (string)$this->_getMappedField($field);
+        $direction = strtoupper($direction) == self::SORT_ORDER_ASC ? self::SORT_ORDER_ASC : self::SORT_ORDER_DESC;
+
+        $this->searchOrders[$field] = $direction;
+    }
+
+    /**
+     * Check if current engine is MYSQL.
+     *
+     * @return bool
+     */
+    private function isCurrentEngineMysql()
+    {
+        return $this->engineResolver->getCurrentSearchEngine() === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE;
+    }
+
     /**
      * @inheritdoc
      */
     protected function _renderFiltersBefore()
     {
+        if ($this->isLoaded()) {
+            return;
+        }
         if ($this->filters) {
             foreach ($this->filters as $attributes) {
                 foreach ($attributes as $attributeCode => $attributeValue) {
@@ -196,33 +338,70 @@ protected function _renderFiltersBefore()
                     $this->addAttributeToSearch($attributeCode, $attributeValue);
                 }
             }
-            $searchCriteria = $this->getSearchCriteriaBuilder()->create();
-            $searchCriteria->setRequestName('advanced_search_container');
+            $searchCriteria = $this->getSearchCriteriaResolver()->resolve();
             try {
-                $searchResult = $this->getSearch()->search($searchCriteria);
+                $this->searchResult = $this->getSearch()->search($searchCriteria);
+                $this->_totalRecords = $this->getTotalRecordsResolver($this->searchResult)->resolve();
             } catch (EmptyRequestDataException $e) {
                 /** @var \Magento\Framework\Api\Search\SearchResultInterface $searchResult */
-                $searchResult = $this->searchResultFactory->create()->setItems([]);
+                $this->searchResult = $this->searchResultFactory->create()->setItems([]);
             } catch (NonExistingRequestNameException $e) {
                 $this->_logger->error($e->getMessage());
                 throw new LocalizedException(
                     __('An error occurred. For details, see the error log.')
                 );
             }
-            $temporaryStorage = $this->temporaryStorageFactory->create();
-            $table = $temporaryStorage->storeApiDocuments($searchResult->getItems());
-
-            $this->getSelect()->joinInner(
-                [
-                    'search_result' => $table->getName(),
-                ],
-                'e.entity_id = search_result.' . TemporaryStorage::FIELD_ENTITY_ID,
-                []
-            );
+            $this->getSearchResultApplier($this->searchResult)->apply();
         }
         parent::_renderFiltersBefore();
     }
 
+    /**
+     * Get total records resolver.
+     *
+     * @param SearchResultInterface $searchResult
+     * @return TotalRecordsResolverInterface
+     */
+    private function getTotalRecordsResolver(SearchResultInterface $searchResult): TotalRecordsResolverInterface
+    {
+        return $this->totalRecordsResolverFactory->create([
+            'searchResult' => $searchResult,
+        ]);
+    }
+
+    /**
+     * Get search criteria resolver.
+     *
+     * @return SearchCriteriaResolverInterface
+     */
+    private function getSearchCriteriaResolver(): SearchCriteriaResolverInterface
+    {
+        return $this->searchCriteriaResolverFactory->create([
+            'builder' => $this->getSearchCriteriaBuilder(),
+            'collection' => $this,
+            'searchRequestName' => $this->searchRequestName,
+            'currentPage' => $this->_curPage,
+            'size' => $this->getPageSize(),
+            'orders' => $this->searchOrders,
+        ]);
+    }
+
+    /**
+     * Get search result applier.
+     *
+     * @param SearchResultInterface $searchResult
+     * @return SearchResultApplierInterface
+     */
+    private function getSearchResultApplier(SearchResultInterface $searchResult): SearchResultApplierInterface
+    {
+        return $this->searchResultApplierFactory->create([
+            'collection' => $this,
+            'searchResult' => $searchResult,
+            /** This variable sets by serOrder method, but doesn't have a getter method. */
+            'orders' => $this->_orders
+        ]);
+    }
+
     /**
      * Get attribute code.
      *
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
index 3ba77e77105ae..2c36b150fed07 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
@@ -8,20 +8,29 @@
 
 use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
-use Magento\CatalogSearch\Model\Search\RequestGenerator;
-use Magento\Framework\Api\Search\SearchResultFactory;
-use Magento\Framework\App\ObjectManager;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Framework\Data\Collection\Db\SizeResolverInterfaceFactory;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\CatalogSearch\Model\Search\RequestGenerator;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Indexer\DimensionFactory;
 use Magento\Framework\Model\ResourceModel\ResourceModelPoolInterface;
-use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
+use Magento\Framework\Search\Response\QueryResponse;
 use Magento\Framework\Search\Request\EmptyRequestDataException;
 use Magento\Framework\Search\Request\NonExistingRequestNameException;
-use Magento\Framework\Search\Response\QueryResponse;
+use Magento\Framework\Api\Search\SearchResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\Search\Model\EngineResolver;
 
 /**
  * Fulltext Collection
@@ -31,6 +40,7 @@
  * @api
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -65,11 +75,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     private $queryText;
 
-    /**
-     * @var string|null
-     */
-    private $relevanceOrderDirection = null;
-
     /**
      * @var string
      */
@@ -106,6 +111,31 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     private $filterBuilder;
 
+    /**
+     * @var SearchCriteriaResolverFactory
+     */
+    private $searchCriteriaResolverFactory;
+
+    /**
+     * @var SearchResultApplierFactory
+     */
+    private $searchResultApplierFactory;
+
+    /**
+     * @var TotalRecordsResolverFactory
+     */
+    private $totalRecordsResolverFactory;
+
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
+    /**
+     * @var array
+     */
+    private $searchOrders;
+
     /**
      * Collection constructor
      *
@@ -141,7 +171,15 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param PriceTableResolver|null $priceTableResolver
      * @param DimensionFactory|null $dimensionFactory
      * @param ResourceModelPoolInterface|null $resourceModelPool
+     * @param \Magento\Search\Api\SearchInterface|null $search
+     * @param \Magento\Framework\Api\Search\SearchCriteriaBuilder|null $searchCriteriaBuilder
+     * @param \Magento\Framework\Api\FilterBuilder|null $filterBuilder
+     * @param SearchCriteriaResolverFactory|null $searchCriteriaResolverFactory
+     * @param SearchResultApplierFactory|null $searchResultApplierFactory
+     * @param TotalRecordsResolverFactory|null $totalRecordsResolverFactory
+     * @param EngineResolverInterface|null $engineResolver
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -175,7 +213,14 @@ public function __construct(
         TableMaintainer $tableMaintainer = null,
         PriceTableResolver $priceTableResolver = null,
         DimensionFactory $dimensionFactory = null,
-        ResourceModelPoolInterface $resourceModelPool = null
+        ResourceModelPoolInterface $resourceModelPool = null,
+        \Magento\Search\Api\SearchInterface $search = null,
+        \Magento\Framework\Api\Search\SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        \Magento\Framework\Api\FilterBuilder $filterBuilder = null,
+        SearchCriteriaResolverFactory $searchCriteriaResolverFactory = null,
+        SearchResultApplierFactory $searchResultApplierFactory = null,
+        TotalRecordsResolverFactory $totalRecordsResolverFactory = null,
+        EngineResolverInterface $engineResolver = null
     ) {
         $this->queryFactory = $catalogSearchData;
         if ($searchResultFactory === null) {
@@ -214,6 +259,19 @@ public function __construct(
         $this->searchEngine = $searchEngine;
         $this->temporaryStorageFactory = $temporaryStorageFactory;
         $this->searchRequestName = $searchRequestName;
+        $this->search = $search ?: ObjectManager::getInstance()->get(\Magento\Search\Api\SearchInterface::class);
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Api\Search\SearchCriteriaBuilder::class);
+        $this->filterBuilder = $filterBuilder ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Api\FilterBuilder::class);
+        $this->searchCriteriaResolverFactory = $searchCriteriaResolverFactory ?: ObjectManager::getInstance()
+            ->get(SearchCriteriaResolverFactory::class);
+        $this->searchResultApplierFactory = $searchResultApplierFactory ?: ObjectManager::getInstance()
+            ->get(SearchResultApplierFactory::class);
+        $this->totalRecordsResolverFactory = $totalRecordsResolverFactory ?: ObjectManager::getInstance()
+            ->get(TotalRecordsResolverFactory::class);
+        $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()
+            ->get(EngineResolverInterface::class);
     }
 
     /**
@@ -347,32 +405,32 @@ public function addSearchFilter($query)
     /**
      * @inheritdoc
      */
-    protected function _renderFiltersBefore()
+    public function setOrder($attribute, $dir = Select::SQL_DESC)
     {
-        $this->getSearchCriteriaBuilder();
-        $this->getFilterBuilder();
-        $this->getSearch();
-
-        if ($this->queryText) {
-            $this->filterBuilder->setField('search_term');
-            $this->filterBuilder->setValue($this->queryText);
-            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+        $this->setSearchOrder($attribute, $dir);
+        if ($this->isCurrentEngineMysql()) {
+            parent::setOrder($attribute, $dir);
         }
 
-        $priceRangeCalculation = $this->_scopeConfig->getValue(
-            \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-        if ($priceRangeCalculation) {
-            $this->filterBuilder->setField('price_dynamic_algorithm');
-            $this->filterBuilder->setValue($priceRangeCalculation);
-            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _renderFiltersBefore()
+    {
+        if ($this->isLoaded()) {
+            return;
         }
 
-        $searchCriteria = $this->searchCriteriaBuilder->create();
-        $searchCriteria->setRequestName($this->searchRequestName);
+        $this->prepareSearchTermFilter();
+        $this->preparePriceAggregation();
+
+        $searchCriteria = $this->getSearchCriteriaResolver()->resolve();
         try {
             $this->searchResult = $this->getSearch()->search($searchCriteria);
+            $this->_totalRecords = $this->getTotalRecordsResolver($this->searchResult)->resolve();
         } catch (EmptyRequestDataException $e) {
             /** @var \Magento\Framework\Api\Search\SearchResultInterface $searchResult */
             $this->searchResult = $this->searchResultFactory->create()->setItems([]);
@@ -381,23 +439,79 @@ protected function _renderFiltersBefore()
             throw new LocalizedException(__('An error occurred. For details, see the error log.'));
         }
 
-        $temporaryStorage = $this->temporaryStorageFactory->create();
-        $table = $temporaryStorage->storeApiDocuments($this->searchResult->getItems());
+        $this->getSearchResultApplier($this->searchResult)->apply();
+        parent::_renderFiltersBefore();
+    }
 
-        $this->getSelect()->joinInner(
-            [
-                'search_result' => $table->getName(),
-            ],
-            'e.entity_id = search_result.' . TemporaryStorage::FIELD_ENTITY_ID,
-            []
-        );
+    /**
+     * Set sort order for search query.
+     *
+     * @param string $field
+     * @param string $direction
+     * @return void
+     */
+    private function setSearchOrder($field, $direction)
+    {
+        $field = (string)$this->_getMappedField($field);
+        $direction = strtoupper($direction) == self::SORT_ORDER_ASC ? self::SORT_ORDER_ASC : self::SORT_ORDER_DESC;
 
-        if ($this->relevanceOrderDirection) {
-            $this->getSelect()->order(
-                'search_result.' . TemporaryStorage::FIELD_SCORE . ' ' . $this->relevanceOrderDirection
-            );
-        }
-        return parent::_renderFiltersBefore();
+        $this->searchOrders[$field] = $direction;
+    }
+
+    /**
+     * Check if current engine is MYSQL.
+     *
+     * @return bool
+     */
+    private function isCurrentEngineMysql()
+    {
+        return $this->engineResolver->getCurrentSearchEngine() === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE;
+    }
+
+    /**
+     * Get total records resolver.
+     *
+     * @param SearchResultInterface $searchResult
+     * @return TotalRecordsResolverInterface
+     */
+    private function getTotalRecordsResolver(SearchResultInterface $searchResult): TotalRecordsResolverInterface
+    {
+        return $this->totalRecordsResolverFactory->create([
+            'searchResult' => $searchResult,
+        ]);
+    }
+
+    /**
+     * Get search criteria resolver.
+     *
+     * @return SearchCriteriaResolverInterface
+     */
+    private function getSearchCriteriaResolver(): SearchCriteriaResolverInterface
+    {
+        return $this->searchCriteriaResolverFactory->create([
+            'builder' => $this->getSearchCriteriaBuilder(),
+            'collection' => $this,
+            'searchRequestName' => $this->searchRequestName,
+            'currentPage' => $this->_curPage,
+            'size' => $this->getPageSize(),
+            'orders' => $this->searchOrders,
+        ]);
+    }
+
+    /**
+     * Get search result applier.
+     *
+     * @param SearchResultInterface $searchResult
+     * @return SearchResultApplierInterface
+     */
+    private function getSearchResultApplier(SearchResultInterface $searchResult): SearchResultApplierInterface
+    {
+        return $this->searchResultApplierFactory->create([
+            'collection' => $this,
+            'searchResult' => $searchResult,
+            /** This variable sets by serOrder method, but doesn't have a getter method. */
+            'orders' => $this->_orders,
+        ]);
     }
 
     /**
@@ -425,24 +539,6 @@ protected function _renderFilters()
         return parent::_renderFilters();
     }
 
-    /**
-     * Set Order field
-     *
-     * @param string $attribute
-     * @param string $dir
-     * @return $this
-     */
-    public function setOrder($attribute, $dir = Select::SQL_DESC)
-    {
-        if ($attribute === 'relevance') {
-            $this->relevanceOrderDirection = $dir;
-        } else {
-            parent::setOrder($attribute, $dir);
-        }
-
-        return $this;
-    }
-
     /**
      * Stub method for compatibility with other search engines
      *
@@ -489,7 +585,17 @@ public function getFacetedData($field)
     public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     {
         $this->addFieldToFilter('category_ids', $category->getId());
-        return parent::addCategoryFilter($category);
+        /**
+         * This changes need in backward compatible reasons for support dynamic improved algorithm
+         * for price aggregation process.
+         */
+        if ($this->isCurrentEngineMysql()) {
+            parent::addCategoryFilter($category);
+        } else {
+            $this->_productLimitationPrice();
+        }
+
+        return $this;
     }
 
     /**
@@ -501,6 +607,46 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     public function setVisibility($visibility)
     {
         $this->addFieldToFilter('visibility', $visibility);
-        return parent::setVisibility($visibility);
+        /**
+         * This changes need in backward compatible reasons for support dynamic improved algorithm
+         * for price aggregation process.
+         */
+        if ($this->isCurrentEngineMysql()) {
+            parent::setVisibility($visibility);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Prepare search term filter for text query.
+     *
+     * @return void
+     */
+    private function prepareSearchTermFilter(): void
+    {
+        if ($this->queryText) {
+            $this->filterBuilder->setField('search_term');
+            $this->filterBuilder->setValue($this->queryText);
+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+        }
+    }
+
+    /**
+     * Prepare price aggregation algorithm.
+     *
+     * @return void
+     */
+    private function preparePriceAggregation(): void
+    {
+        $priceRangeCalculation = $this->_scopeConfig->getValue(
+            \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        if ($priceRangeCalculation) {
+            $this->filterBuilder->setField('price_dynamic_algorithm');
+            $this->filterBuilder->setValue($priceRangeCalculation);
+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+        }
     }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php
new file mode 100644
index 0000000000000..632e1ab9270df
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
+
+use Magento\Framework\Data\Collection;
+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\Api\Search\SearchCriteria;
+
+/**
+ * Resolve specific attributes for search criteria.
+ */
+class SearchCriteriaResolver implements SearchCriteriaResolverInterface
+{
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $builder;
+
+    /**
+     * @var string
+     */
+    private $searchRequestName;
+
+    /**
+     * SearchCriteriaResolver constructor.
+     * @param SearchCriteriaBuilder $builder
+     * @param string $searchRequestName
+     */
+    public function __construct(
+        SearchCriteriaBuilder $builder,
+        string $searchRequestName
+    ) {
+        $this->builder = $builder;
+        $this->searchRequestName = $searchRequestName;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve() : SearchCriteria
+    {
+        $searchCriteria = $this->builder->create();
+        $searchCriteria->setRequestName($this->searchRequestName);
+
+        return $searchCriteria;
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolverInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolverInterface.php
new file mode 100644
index 0000000000000..047fa7f71e400
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolverInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
+
+use Magento\Framework\Api\Search\SearchCriteria;
+
+/**
+ * Resolve specific attributes for search criteria.
+ */
+interface SearchCriteriaResolverInterface
+{
+    /**
+     * Resolve specific attribute.
+     *
+     * @return SearchCriteria
+     */
+    public function resolve(): SearchCriteria;
+}
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
new file mode 100644
index 0000000000000..20c237646e524
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
+
+use Magento\Framework\Data\Collection;
+use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
+use Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory;
+use Magento\Framework\Api\Search\SearchResultInterface;
+
+/**
+ * Resolve specific attributes for search criteria.
+ */
+class SearchResultApplier implements SearchResultApplierInterface
+{
+    /**
+     * @var Collection
+     */
+    private $collection;
+
+    /**
+     * @var SearchResultInterface
+     */
+    private $searchResult;
+
+    /**
+     * @var TemporaryStorageFactory
+     */
+    private $temporaryStorageFactory;
+
+    /**
+     * @var array
+     */
+    private $orders;
+
+    /**
+     * @param Collection $collection
+     * @param SearchResultInterface $searchResult
+     * @param TemporaryStorageFactory $temporaryStorageFactory
+     * @param array $orders
+     */
+    public function __construct(
+        Collection $collection,
+        SearchResultInterface $searchResult,
+        TemporaryStorageFactory $temporaryStorageFactory,
+        array $orders
+    ) {
+        $this->collection = $collection;
+        $this->searchResult = $searchResult;
+        $this->temporaryStorageFactory = $temporaryStorageFactory;
+        $this->orders = $orders;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $temporaryStorage = $this->temporaryStorageFactory->create();
+        $table = $temporaryStorage->storeApiDocuments($this->searchResult->getItems());
+
+        $this->collection->getSelect()->joinInner(
+            [
+                'search_result' => $table->getName(),
+            ],
+            'e.entity_id = search_result.' . TemporaryStorage::FIELD_ENTITY_ID,
+            []
+        );
+
+        if (isset($this->orders['relevance'])) {
+            $this->collection->getSelect()->order(
+                'search_result.' . TemporaryStorage::FIELD_SCORE . ' ' . $this->orders['relevance']
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplierInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplierInterface.php
new file mode 100644
index 0000000000000..1b3e2a6bbac71
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplierInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
+
+/**
+ * Resolve specific attributes for search criteria.
+ */
+interface SearchResultApplierInterface
+{
+    /**
+     * Apply search results to collection.
+     *
+     * @return void
+     */
+    public function apply();
+}
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php
new file mode 100644
index 0000000000000..12b6f81313913
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
+
+/**
+ * Resolve total records count.
+ *
+ * For Mysql search engine we can't resolve total record count before full load of collection.
+ */
+class TotalRecordsResolver implements TotalRecordsResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(): ?int
+    {
+        return null;
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolverInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolverInterface.php
new file mode 100644
index 0000000000000..190450f9606bc
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolverInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
+
+/**
+ * Resolve total records count.
+ */
+interface TotalRecordsResolverInterface
+{
+    /**
+     * Resolve total records.
+     *
+     * @return int
+     */
+    public function resolve(): ?int;
+}
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Setup/PropertyMapper.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Setup/PropertyMapper.php
new file mode 100644
index 0000000000000..f72e1536f4710
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Setup/PropertyMapper.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\ResourceModel\Setup;
+
+use Magento\Eav\Model\Entity\Setup\PropertyMapperAbstract;
+
+/**
+ * Class PropertyMapper
+ *
+ * @package Magento\CatalogSearch\Model\ResourceModel\Setup
+ */
+class PropertyMapper extends PropertyMapperAbstract
+{
+    /**
+     * Map input attribute properties to storage representation
+     *
+     * @param array $input
+     * @param int $entityTypeId
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function map(array $input, $entityTypeId): array
+    {
+        return [
+            'search_weight' => $this->_getValue($input, 'search_weight', 1),
+        ];
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProvider.php b/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProvider.php
new file mode 100644
index 0000000000000..f621bcbf91835
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProvider.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\Search;
+
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Framework\Data\Collection;
+
+/**
+ * Search collection provider.
+ */
+class ItemCollectionProvider implements ItemCollectionProviderInterface
+{
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
+    /**
+     * @var array
+     */
+    private $factories;
+
+    /**
+     * ItemCollectionProvider constructor.
+     * @param EngineResolverInterface $engineResolver
+     * @param array $factories
+     */
+    public function __construct(
+        EngineResolverInterface $engineResolver,
+        array $factories
+    ) {
+        $this->engineResolver = $engineResolver;
+        $this->factories = $factories;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCollection(): Collection
+    {
+        if (!isset($this->factories[$this->engineResolver->getCurrentSearchEngine()])) {
+            throw new \DomainException('Undefined factory ' . $this->engineResolver->getCurrentSearchEngine());
+        }
+        return $this->factories[$this->engineResolver->getCurrentSearchEngine()]->create();
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProviderInterface.php b/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProviderInterface.php
new file mode 100644
index 0000000000000..db02d5ac5f519
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Search/ItemCollectionProviderInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\Search;
+
+use Magento\Framework\Data\Collection;
+
+/**
+ * Search collection provider.
+ */
+interface ItemCollectionProviderInterface
+{
+    /**
+     * Get collection.
+     *
+     * @return Collection
+     */
+    public function getCollection() : Collection;
+}
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml
new file mode 100644
index 0000000000000..33ffa4fe1b296
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml
@@ -0,0 +1,59 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertSearchTermSaveSuccessMessage">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+            <argument name="storeValue" type="string"/>
+            <argument name="redirectUrl" type="string"/>
+            <argument name="displayInSuggestedTerm" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.addNewSearchTermButton}}" stepKey="clickAddNewSearchTermButton"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermNewPageLoad"/>
+        <fillField selector="{{AdminCatalogSearchTermNewSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQueryTextBox"/>
+        <selectOption selector="{{AdminCatalogSearchTermNewSection.store}}" userInput="{{storeValue}}" stepKey="selectStoreValue"/>
+        <fillField selector="{{AdminCatalogSearchTermNewSection.redirectUrl}}" userInput="{{redirectUrl}}" stepKey="fillRedirectUrl"/>
+        <selectOption selector="{{AdminCatalogSearchTermNewSection.displayInSuggestedTerm}}" userInput="{{displayInSuggestedTerm}}" stepKey="selectDisplayInSuggestedTerm"/>
+        <click selector="{{AdminCatalogSearchTermNewSection.saveSearchButton}}" stepKey="clickSaveSearchButton"/>
+        <see selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" userInput="You saved the search term." stepKey="seeSaveSuccessMessage"/>
+    </actionGroup>
+    <actionGroup name="AssertSearchTermSuccessDeleteMessage">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openCatalogSearchIndexPage"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.resetFilterButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResultLoad"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.nthRow('1')}}" stepKey="checkFirstRow"/>
+        <selectOption selector="{{AdminCatalogSearchTermIndexSection.massActions}}" userInput="delete" stepKey="selectDeleteOption"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.submit}}" stepKey="clickSubmitButton"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.okButton}}" stepKey="clickOkButton"/>
+        <see selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" userInput="Total of 1 record(s) were deleted." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+    <actionGroup name="AssertSearchTermNotInGrid">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openCatalogSearchIndexPage"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.resetFilterButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResultToLoad"/>
+        <see selector="{{AdminCatalogSearchTermIndexSection.emptyRecords}}" userInput="We couldn't find any records." stepKey="seeEmptyRecordMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index 6b913e5b458e6..4b52b2c669edf 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -11,9 +11,9 @@
     <!-- Quick search the phrase and check if the result page contains correct information -->
     <actionGroup name="StorefrontCheckQuickSearchActionGroup">
         <arguments>
-            <argument name="phrase"/>
+            <argument name="phrase" />
         </arguments>
-        <submitForm selector="#search_mini_form" parameterArray="['q' => '{{phrase}}']" stepKey="fillQuickSearch" />
+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{phrase}}]" stepKey="fillQuickSearch" />
         <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
         <dontSeeInCurrentUrl url="form_key=" stepKey="checkUrlFormKey"/>
         <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
@@ -116,4 +116,9 @@
         <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
+
+    <!-- Asserts that search results do not contain any results-->
+    <actionGroup name="StorefrontCheckSearchIsEmpty">
+        <see stepKey="checkEmpty" selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="Your search returned no results"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
new file mode 100644
index 0000000000000..83e4ac50a74e6
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
@@ -0,0 +1,37 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Verify AssertSearchTermNotOnFrontend-->
+    <actionGroup name="AssertSearchTermNotOnFrontend">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+            <argument name="url_key" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontProductPage.url('url_key')}}" stepKey="goToMagentoStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <see selector="{{StorefrontMessagesSection.noticeMessage}}" userInput="Your search returned no results." stepKey="seeAssertSearchTermNotOnFrontendNoticeMessage"/>
+    </actionGroup>
+
+    <actionGroup name="AssertSearchTermOnFrontend">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+            <argument name="redirectUrl" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
+        <waitForPageLoad stepKey="waitForFillField"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <seeInCurrentUrl url="{{redirectUrl}}" stepKey="checkUrl"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.xml
new file mode 100644
index 0000000000000..995b860d107ca
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.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="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SimpleTerm" type="searchTerm">
+        <data key="search_query" unique="suffix">Query text</data>
+        <data key="store_id">Default Store View</data>
+        <data key="redirect" unique="suffix">http://example.com/</data>
+        <data key="display_in_terms">No</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermIndexPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermIndexPage.xml
new file mode 100644
index 0000000000000..bbafff8ad7739
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermIndexPage.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="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCatalogSearchTermIndexPage" url="/search/term/index/" area="admin" module="Magento_CatalogSearch">
+        <section name="AdminCatalogSearchTermIndexSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermNewPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermNewPage.xml
new file mode 100644
index 0000000000000..de7491471741c
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermNewPage.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="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCatalogSearchTermNewPage" url="/search/term/new/" area="admin" module="Magento_CatalogSearch">
+        <section name="AdminCatalogSearchTermNewSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
new file mode 100644
index 0000000000000..ac316d060f6e9
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
@@ -0,0 +1,23 @@
+<?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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCatalogSearchTermIndexSection">
+        <element name="addNewSearchTermButton" type="button" selector="//div[@class='page-actions-buttons']/button[@id='add']" timeout="30"/>
+        <element name="resetFilterButton" type="button" selector="//button[@class='action-default scalable action-reset action-tertiary']" timeout="30"/>
+        <element name="searchButton" type="button" selector="//button[@class='action-default scalable action-secondary']" timeout="30"/>
+        <element name="massActions" type="text" selector="//div[@class='admin__grid-massaction-form']//select[@id='search_term_grid_massaction-select']"/>
+        <element name="submit" type="button" selector="//button[@class='action-default scalable']/span" timeout="30"/>
+        <element name="searchQuery" type="text" selector="//tr[@class='data-grid-filters']//td/input[@name='search_query']"/>
+        <element name="nthRow" type="checkbox" selector="//tbody/tr['{{rowNum}}']//input[@name='search']" parameterized="true"/>
+        <element name="searchTermRowCheckboxBySearchQuery" type="checkbox" selector="//*[normalize-space()='{{var1}}']/preceding-sibling::td//input[@name='search']" parameterized="true" timeout="30"/>
+        <element name="okButton" type="button" selector="//button[@class='action-primary action-accept']/span" timeout="30"/>
+        <element name="emptyRecords" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermMessagesSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermMessagesSection.xml
new file mode 100644
index 0000000000000..5d19198a1b94c
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermMessagesSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCatalogSearchTermMessagesSection">
+        <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div[@data-ui-id='messages-message-success']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml
new file mode 100644
index 0000000000000..a7d577a7508c0
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml
@@ -0,0 +1,18 @@
+<?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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCatalogSearchTermNewSection">
+        <element name="searchQuery" type="text" selector="//div[@class='admin__field-control control']/input[@id='query_text']"/>
+        <element name="store" type="text" selector="//select[@id='store_id']"/>
+        <element name="redirectUrl" type="text" selector="//div[@class='admin__field-control control']/input[@id='redirect']"/>
+        <element name="displayInSuggestedTerm" type="select" selector="//select[@name='display_in_terms']"/>
+        <element name="saveSearchButton" type="button" selector="//button[@id='save']/span[@class='ui-button-text']" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminCreateSearchTermEntityTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminCreateSearchTermEntityTest.xml
new file mode 100644
index 0000000000000..2b425f34f8a5b
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminCreateSearchTermEntityTest.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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateSearchTermEntityTest">
+        <annotations>
+            <stories value="Search terms"/>
+            <title value="Create search term test"/>
+            <description value="Admin should be able to create search term"/>
+            <testCaseId value="MC-13989"/>
+            <severity value="CRITICAL"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Create simple product -->
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+        </before>
+        <after>
+            <!-- Delete created search term -->
+            <actionGroup ref="AssertSearchTermSuccessDeleteMessage" stepKey="deleteSearchTerm">
+                <argument name="searchQuery" value="$$createSimpleProduct.sku$$"/>
+            </actionGroup>
+
+            <!-- Delete created product -->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to the search terms page and create new search term -->
+        <actionGroup ref="AssertSearchTermSaveSuccessMessage" stepKey="createNewSearchTerm">
+            <argument name="searchQuery" value="$$createSimpleProduct.sku$$"/>
+            <argument name="storeValue" value="{{SimpleTerm.store_id}}"/>
+            <argument name="redirectUrl" value="{{SimpleTerm.redirect}}"/>
+            <argument name="displayInSuggestedTerm" value="{{SimpleTerm.display_in_terms}}"/>
+        </actionGroup>
+
+        <!-- Go to storefront -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!-- Assert created search term on storefront -->
+        <actionGroup ref="AssertSearchTermOnFrontend" stepKey="assertCreatedSearchTermOnFrontend">
+            <argument name="searchQuery" value="$$createSimpleProduct.sku$$"/>
+            <argument name="redirectUrl" value="{{SimpleTerm.redirect}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml
new file mode 100644
index 0000000000000..c72ed424ef307
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteSearchTermTest">
+        <annotations>
+            <stories value="Search terms"/>
+            <title value="Delete Search Term and Verify Storefront"/>
+            <description value="Test log in to SearchTerm and DeleteSearchTerm"/>
+            <testCaseId value="MC-13988"/>
+            <severity value="CRITICAL"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleProduct" createDataKey="simpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Add new search term-->
+        <actionGroup ref="AssertSearchTermSaveSuccessMessage" stepKey="addNewSearchTerm">
+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
+            <argument name="storeValue" value="{{SimpleTerm.store_id}}"/>
+            <argument name="redirectUrl" value="{{SimpleTerm.redirect}}"/>
+            <argument name="displayInSuggestedTerm" value="{{SimpleTerm.display_in_terms}}"/>
+        </actionGroup>
+
+        <!--Search and delete search term and AssertSearchTermSuccessDeleteMessage-->
+        <actionGroup ref="AssertSearchTermSuccessDeleteMessage" stepKey="deleteSearchTerm">
+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
+        </actionGroup>
+
+        <!--Verify deleted search term in grid and AssertSearchTermNotInGrid-->
+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="verifyDeletedSearchTermNotInGrid">
+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
+        </actionGroup>
+
+        <!--Go to storefront and Verify AssertSearchTermNotOnFrontend-->
+        <actionGroup ref="AssertSearchTermNotOnFrontend" stepKey="verifySearchTermNotOnFrontend">
+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
+            <argument name="url_key" value="$$simpleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
index 2faacea24262c..8d1dbbd6dd6df 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
@@ -20,7 +20,17 @@ public function testResultActionFiltersSetBeforeLoadLayout()
         $filters = null;
         $expectedQuery = 'filtersData';
 
-        $view = $this->createPartialMock(\Magento\Framework\App\View::class, ['loadLayout', 'renderLayout']);
+        $view = $this->createPartialMock(
+            \Magento\Framework\App\View::class,
+            ['loadLayout', 'renderLayout', 'getPage', 'getLayout']
+        );
+        $update = $this->createPartialMock(\Magento\Framework\View\Model\Layout\Merge::class, ['getHandles']);
+        $update->expects($this->once())->method('getHandles')->will($this->returnValue([]));
+        $layout = $this->createPartialMock(\Magento\Framework\View\Result\Layout::class, ['getUpdate']);
+        $layout->expects($this->once())->method('getUpdate')->will($this->returnValue($update));
+        $view->expects($this->once())->method('getLayout')->will($this->returnValue($layout));
+        $page = $this->createPartialMock(\Magento\Framework\View\Result\Page::class, ['initLayout']);
+        $view->expects($this->once())->method('getPage')->will($this->returnValue($page));
         $view->expects($this->once())->method('loadLayout')->will(
             $this->returnCallback(
                 function () use (&$filters, $expectedQuery) {
@@ -32,15 +42,9 @@ function () use (&$filters, $expectedQuery) {
         $request = $this->createPartialMock(\Magento\Framework\App\Console\Request::class, ['getQueryValue']);
         $request->expects($this->once())->method('getQueryValue')->will($this->returnValue($expectedQuery));
 
-        $collection = $this->createPartialMock(
-            \Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection::class,
-            ['getSize']
-        );
-        $collection->expects($this->once())->method('getSize')->will($this->returnValue(1));
-
         $catalogSearchAdvanced = $this->createPartialMock(
             \Magento\CatalogSearch\Model\Advanced::class,
-            ['addFilters', '__wakeup', 'getProductCollection']
+            ['addFilters', '__wakeup']
         );
         $catalogSearchAdvanced->expects($this->once())->method('addFilters')->will(
             $this->returnCallback(
@@ -49,8 +53,6 @@ function ($added) use (&$filters) {
                 }
             )
         );
-        $catalogSearchAdvanced->expects($this->once())->method('getProductCollection')
-            ->will($this->returnValue($collection));
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $context = $objectManager->getObject(
@@ -189,20 +191,11 @@ public function testNoResultsHandle()
         $request = $this->createPartialMock(\Magento\Framework\App\Console\Request::class, ['getQueryValue']);
         $request->expects($this->once())->method('getQueryValue')->will($this->returnValue($expectedQuery));
 
-        $collection = $this->createPartialMock(
-            \Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection::class,
-            ['getSize']
-        );
-        $collection->expects($this->once())->method('getSize')->will($this->returnValue(0));
-
         $catalogSearchAdvanced = $this->createPartialMock(
             \Magento\CatalogSearch\Model\Advanced::class,
             ['addFilters', '__wakeup', 'getProductCollection']
         );
 
-        $catalogSearchAdvanced->expects($this->once())->method('getProductCollection')
-            ->will($this->returnValue($collection));
-
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $context = $objectManager->getObject(
             \Magento\Framework\App\Action\Context::class,
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
index fc5915bb3cdff..a4f62ce83a1b8 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
@@ -250,6 +250,7 @@ public function testAddFiltersVerifyAddConditionsToRegistry(
                 'productCollectionFactory' => $productCollectionFactory,
                 'storeManager' => $this->storeManager,
                 'currencyFactory' => $currencyFactory,
+                'collectionProvider' => null
             ]
         );
         $instance->addFilters($values);
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
index b76f51a132c94..fe29fa1ece011 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
@@ -7,7 +7,13 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
 use Magento\CatalogSearch\Test\Unit\Model\ResourceModel\BaseCollection;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
 
 /**
  * Tests Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection
@@ -79,6 +85,42 @@ protected function setUp()
         $productLimitationFactoryMock->method('create')
             ->willReturn($productLimitationMock);
 
+        $searchCriteriaResolver = $this->getMockBuilder(SearchCriteriaResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['resolve'])
+            ->getMockForAbstractClass();
+        $searchCriteriaResolverFactory = $this->getMockBuilder(SearchCriteriaResolverFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $searchCriteriaResolverFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($searchCriteriaResolver);
+
+        $searchResultApplier = $this->getMockBuilder(SearchResultApplierInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['apply'])
+            ->getMockForAbstractClass();
+        $searchResultApplierFactory = $this->getMockBuilder(SearchResultApplierFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $searchResultApplierFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($searchResultApplier);
+
+        $totalRecordsResolver = $this->getMockBuilder(TotalRecordsResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['resolve'])
+            ->getMockForAbstractClass();
+        $totalRecordsResolverFactory = $this->getMockBuilder(TotalRecordsResolverFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $totalRecordsResolverFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($totalRecordsResolver);
+
         $this->advancedCollection = $this->objectManager->getObject(
             \Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection::class,
             [
@@ -90,6 +132,10 @@ protected function setUp()
                 'temporaryStorageFactory' => $this->temporaryStorageFactory,
                 'search' => $this->search,
                 'productLimitationFactory' => $productLimitationFactoryMock,
+                'collectionProvider' => null,
+                'searchCriteriaResolverFactory' => $searchCriteriaResolverFactory,
+                'searchResultApplierFactory' => $searchResultApplierFactory,
+                'totalRecordsResolverFactory' => $totalRecordsResolverFactory
             ]
         );
     }
@@ -117,18 +163,8 @@ public function testLike()
             ->willReturn($this->filterBuilder);
 
         $filter = $this->createMock(\Magento\Framework\Api\Filter::class);
-        $this->filterBuilder->expects($this->once())->method('create')->willReturn($filter);
-
-        $criteria = $this->createMock(\Magento\Framework\Api\Search\SearchCriteria::class);
-        $this->criteriaBuilder->expects($this->once())->method('create')->willReturn($criteria);
-        $criteria->expects($this->once())
-            ->method('setRequestName')
-            ->with('advanced_search_container');
-
-        $tempTable = $this->createMock(\Magento\Framework\DB\Ddl\Table::class);
-        $temporaryStorage = $this->createMock(\Magento\Framework\Search\Adapter\Mysql\TemporaryStorage::class);
-        $temporaryStorage->expects($this->once())->method('storeApiDocuments')->willReturn($tempTable);
-        $this->temporaryStorageFactory->expects($this->once())->method('create')->willReturn($temporaryStorage);
+        $this->filterBuilder->expects($this->any())->method('create')->willReturn($filter);
+
         $searchResult = $this->createMock(\Magento\Framework\Api\Search\SearchResultInterface::class);
         $this->search->expects($this->once())->method('search')->willReturn($searchResult);
 
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
index 82490ab6b6d8b..f1c2161a052e0 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
@@ -5,6 +5,12 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Model\ResourceModel\Fulltext;
 
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
 use Magento\CatalogSearch\Test\Unit\Model\ResourceModel\BaseCollection;
 use Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -97,6 +103,41 @@ protected function setUp()
         $temporaryStorageFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->temporaryStorage);
+        $searchCriteriaResolver = $this->getMockBuilder(SearchCriteriaResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['resolve'])
+            ->getMockForAbstractClass();
+        $searchCriteriaResolverFactory = $this->getMockBuilder(SearchCriteriaResolverFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $searchCriteriaResolverFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($searchCriteriaResolver);
+
+        $searchResultApplier = $this->getMockBuilder(SearchResultApplierInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['apply'])
+            ->getMockForAbstractClass();
+        $searchResultApplierFactory = $this->getMockBuilder(SearchResultApplierFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $searchResultApplierFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($searchResultApplier);
+
+        $totalRecordsResolver = $this->getMockBuilder(TotalRecordsResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['resolve'])
+            ->getMockForAbstractClass();
+        $totalRecordsResolverFactory = $this->getMockBuilder(TotalRecordsResolverFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $totalRecordsResolverFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($totalRecordsResolver);
 
         $this->model = $this->objectManager->getObject(
             \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection::class,
@@ -106,6 +147,9 @@ protected function setUp()
                 'scopeConfig' => $this->scopeConfig,
                 'temporaryStorageFactory' => $temporaryStorageFactory,
                 'productLimitationFactory' => $productLimitationFactoryMock,
+                'searchCriteriaResolverFactory' => $searchCriteriaResolverFactory,
+                'searchResultApplierFactory' => $searchResultApplierFactory,
+                'totalRecordsResolverFactory' => $totalRecordsResolverFactory,
             ]
         );
 
@@ -124,37 +168,10 @@ protected function tearDown()
         $reflectionProperty->setValue(null);
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionCode 333
-     * @expectedExceptionMessage setRequestName
-     */
-    public function testGetFacetedDataWithException()
-    {
-        $criteria = $this->createMock(\Magento\Framework\Api\Search\SearchCriteria::class);
-        $this->criteriaBuilder->expects($this->once())->method('create')->willReturn($criteria);
-        $criteria->expects($this->once())
-            ->method('setRequestName')
-            ->withConsecutive(['catalog_view_container'])
-            ->willThrowException(new \Exception('setRequestName', 333));
-        $this->model->getFacetedData('field');
-    }
-
     public function testGetFacetedDataWithEmptyAggregations()
     {
-        $criteria = $this->createMock(\Magento\Framework\Api\Search\SearchCriteria::class);
-        $this->criteriaBuilder->expects($this->once())->method('create')->willReturn($criteria);
-        $criteria->expects($this->once())
-            ->method('setRequestName')
-            ->withConsecutive(['catalog_view_container']);
         $searchResult = $this->getMockBuilder(\Magento\Framework\Api\Search\SearchResultInterface::class)
             ->getMockForAbstractClass();
-        $table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
-            ->setMethods(['getName'])
-            ->getMock();
-        $this->temporaryStorage->expects($this->once())
-            ->method('storeApiDocuments')
-            ->willReturn($table);
         $this->search->expects($this->once())
             ->method('search')
             ->willReturn($searchResult);
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Setup/PropertyMapperTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Setup/PropertyMapperTest.php
new file mode 100644
index 0000000000000..5c917b360f147
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Setup/PropertyMapperTest.php
@@ -0,0 +1,65 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Test\Unit\Model\ResourceModel\Setup;
+
+use Magento\CatalogSearch\Model\ResourceModel\Setup\PropertyMapper;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class PropertyMapperTest
+ *
+ * @package Magento\CatalogSearch\Test\Unit\Model\ResourceModel\Setup
+ */
+class PropertyMapperTest extends TestCase
+{
+    /**
+     * @var PropertyMapper
+     */
+    private $propertyMapper;
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->propertyMapper = new PropertyMapper();
+    }
+
+    /**
+     * @return array
+     */
+    public function caseProvider(): array
+    {
+        return [
+            [
+                ['search_weight' => 9, 'something_other' => '3'],
+                ['search_weight' => 9]
+            ],
+            [
+                ['something' => 3],
+                ['search_weight' => 1]
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider caseProvider
+     *
+     * @test
+     *
+     * @param array $input
+     * @param array $result
+     * @return void
+     */
+    public function testMapCorrectlyMapsValue(array $input, array $result): void
+    {
+        //Second parameter doesn't matter as it is not used
+        $this->assertSame($result, $this->propertyMapper->map($input, 4));
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
index cc07384d4c525..7359bd6b454b9 100644
--- a/app/code/Magento/CatalogSearch/etc/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/di.xml
@@ -14,6 +14,10 @@
     <preference for="Magento\CatalogSearch\Model\Search\FilterMapper\FilterStrategyInterface" type="Magento\CatalogSearch\Model\Search\FilterMapper\FilterContext"/>
     <preference for="Magento\CatalogSearch\Model\Indexer\IndexSwitcherInterface" type="Magento\CatalogSearch\Model\Indexer\IndexSwitcherProxy"/>
     <preference for="Magento\CatalogSearch\Model\Adapter\Aggregation\RequestCheckerInterface" type="Magento\CatalogSearch\Model\Adapter\Aggregation\RequestCheckerComposite"/>
+    <preference for="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolver"/>
+    <preference for="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplier"/>
+    <preference for="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolver"/>
+    <preference for="Magento\CatalogSearch\Model\Search\ItemCollectionProviderInterface" type="Magento\CatalogSearch\Model\Search\ItemCollectionProvider"/>
     <type name="Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory">
         <arguments>
             <argument name="handlers" xsi:type="array">
@@ -176,8 +180,13 @@
             <argument name="collectionFactory" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Fulltext\SearchCollectionFactory</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory"
-                 type="Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
+
+    <virtualType name="Magento\CatalogSearch\Model\Advanced\ItemCollectionProvider" type="Magento\Catalog\Model\Layer\Search\ItemCollectionProvider">
+        <arguments>
+            <argument name="collectionFactory" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory" type="Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
         <arguments>
             <argument name="instanceName" xsi:type="string">Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection</argument>
         </arguments>
@@ -185,6 +194,21 @@
     <type name="Magento\CatalogSearch\Model\Advanced">
         <arguments>
             <argument name="productCollectionFactory" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory</argument>
+            <argument name="collectionProvider" xsi:type="object">Magento\CatalogSearch\Model\Search\ItemCollectionProviderInterface</argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogSearch\Model\Search\ItemCollectionProvider">
+        <arguments>
+            <argument name="factories" xsi:type="array">
+                <item name="mysql" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyProvider">
+        <arguments>
+            <argument name="strategies" xsi:type="array">
+                <item name="mysql" xsi:type="object">Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategy</item>
+            </argument>
         </arguments>
     </type>
     <virtualType name="Magento\CatalogSearch\Model\Layer\Category\Context" type="Magento\Catalog\Model\Layer\Category\Context">
@@ -340,4 +364,11 @@
     <type name="Magento\Config\Model\Config">
         <plugin name="config_enable_eav_indexer" type="Magento\CatalogSearch\Plugin\EnableEavIndexer" />
     </type>
+    <type name="Magento\Eav\Model\Entity\Setup\PropertyMapper\Composite">
+        <arguments>
+            <argument name="propertyMappers" xsi:type="array">
+                <item name="catalog_search" xsi:type="string">Magento\CatalogSearch\Model\ResourceModel\Setup\PropertyMapper</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
index 83808df5b95e4..3f616ab791dfe 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
@@ -11,6 +11,8 @@
 /**
  * @var $block \Magento\CatalogSearch\Block\Advanced\Result
  */
+/** this changes need for valid apply filters and configuration before search process is started */
+$productList = $block->getProductListHtml();
 ?>
 <?php if ($results = $block->getResultCount()): ?>
     <div class="search found">
@@ -49,6 +51,6 @@
     </div>
 <?php endif; ?>
 <?php if ($block->getResultCount()): ?>
-    <div class="search results"><?= $block->getProductListHtml() ?></div>
+    <div class="search results"><?= /* @escapeNotVerified */ $productList ?></div>
 <?php endif; ?>
 <?php $block->getSearchCriterias(); ?>
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
index 9aaa384776855..7b60c85049767 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -263,6 +263,7 @@ protected function _populateForUrlGeneration($rowData)
         if ($this->isGlobalScope($product->getStoreId())) {
             $this->populateGlobalProduct($product);
         } else {
+            $this->storesCache[$product->getStoreId()] = true;
             $this->addProductToImport($product, $product->getStoreId());
         }
         return $this;
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
index cacc761dbee36..44b47faf3d4b8 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
@@ -13,6 +13,8 @@
 use Magento\Store\Model\Store;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Store\Api\StoreWebsiteRelationInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Observer to assign the products to website
@@ -39,22 +41,31 @@ class ProductToWebsiteChangeObserver implements ObserverInterface
      */
     protected $request;
 
+    /**
+     * @var StoreWebsiteRelationInterface
+     */
+    private $storeWebsiteRelation;
+
     /**
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
      * @param UrlPersistInterface $urlPersist
      * @param ProductRepositoryInterface $productRepository
      * @param RequestInterface $request
+     * @param StoreWebsiteRelationInterface $storeWebsiteRelation
      */
     public function __construct(
         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
         UrlPersistInterface $urlPersist,
         ProductRepositoryInterface $productRepository,
-        RequestInterface $request
+        RequestInterface $request,
+        StoreWebsiteRelationInterface $storeWebsiteRelation = null
     ) {
         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
         $this->urlPersist = $urlPersist;
         $this->productRepository = $productRepository;
         $this->request = $request;
+        $this->storeWebsiteRelation = $storeWebsiteRelation ?:
+            ObjectManager::getInstance()->get(StoreWebsiteRelationInterface::class);
     }
 
     /**
@@ -73,10 +84,17 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             );
 
             if (!empty($this->productUrlRewriteGenerator->generate($product))) {
-                $this->urlPersist->deleteByData([
-                    UrlRewrite::ENTITY_ID => $product->getId(),
-                    UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-                ]);
+                if ($this->request->getParam('remove_website_ids')) {
+                    foreach ($this->request->getParam('remove_website_ids') as $webId) {
+                        foreach ($this->storeWebsiteRelation->getStoreByWebsiteId($webId) as $storeId) {
+                            $this->urlPersist->deleteByData([
+                                UrlRewrite::ENTITY_ID => $product->getId(),
+                                UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+                                UrlRewrite::STORE_ID => $storeId
+                            ]);
+                        }
+                    }
+                }
                 if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
                     $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
                 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
index 593df1c5bc6e1..30a4290d882fb 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
@@ -67,7 +67,13 @@
         <waitForAjaxLoad stepKey="waitForLoadWebSiteTab"/>
         <click selector="{{AdminUpdateAttributesWebsiteSection.addProductToWebsite}}" stepKey="checkAddProductToWebsiteCheckbox"/>
         <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="clickSave"/>
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 1 record(s) were updated." stepKey="seeSaveSuccess"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeSaveSuccess"/>
+
+        <!-- Run cron twice -->
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
 
         <!--Got to Store front product page and check url-->
         <amOnPage url="{{StorefrontProductPage.url($$createProduct.sku$$-new)}}" stepKey="navigateToSimpleProductPage"/>
diff --git a/app/code/Magento/Checkout/Block/Cart/Totals.php b/app/code/Magento/Checkout/Block/Cart/Totals.php
index 375c564f29059..7ac5c1c149cc6 100644
--- a/app/code/Magento/Checkout/Block/Cart/Totals.php
+++ b/app/code/Magento/Checkout/Block/Cart/Totals.php
@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Block\Cart;
 
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
 
 /**
+ * Totals cart block.
+ *
  * @api
  */
 class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
@@ -62,6 +65,8 @@ public function __construct(
     }
 
     /**
+     * Retrieve encoded js layout.
+     *
      * @return string
      */
     public function getJsLayout()
@@ -74,6 +79,8 @@ public function getJsLayout()
     }
 
     /**
+     * Retrieve totals from cache.
+     *
      * @return array
      */
     public function getTotals()
@@ -85,6 +92,8 @@ public function getTotals()
     }
 
     /**
+     * Set totals to cache.
+     *
      * @param array $value
      * @return $this
      * @codeCoverageIgnore
@@ -96,6 +105,8 @@ public function setTotals($value)
     }
 
     /**
+     * Create totals block and set totals.
+     *
      * @param string $code
      * @return BlockInterface
      */
@@ -121,6 +132,8 @@ protected function _getTotalRenderer($code)
     }
 
     /**
+     * Get totals html.
+     *
      * @param mixed $total
      * @param int|null $area
      * @param int $colspan
@@ -177,7 +190,7 @@ public function needDisplayBaseGrandtotal()
     }
 
     /**
-     * Get formated in base currency base grand total value
+     * Get formatted in base currency base grand total value
      *
      * @return string
      */
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.xml
new file mode 100644
index 0000000000000..8c5c6f41fffa7
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.xml
@@ -0,0 +1,25 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertMiniShoppingCartSubTotalActionGroup">
+        <arguments>
+            <argument name="dataQuote" type="entity" />
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad" time="120"/>
+        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabMiniCartTotal" />
+        <assertContains stepKey="assertMiniCartTotal">
+            <actualResult type="variable">$grabMiniCartTotal</actualResult>
+            <expectedResult type="string">{{dataQuote.subtotal}}</expectedResult>
+        </assertContains>
+        <assertContains stepKey="assertMiniCartCurrency">
+            <actualResult type="variable">$grabMiniCartTotal</actualResult>
+            <expectedResult type="string">{{dataQuote.currency}}</expectedResult>
+        </assertContains>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
index 7a5c5e1d15872..e4a388d2c3a58 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
@@ -35,4 +35,11 @@
         <click selector="{{StoreFrontRemoveItemModalSection.ok}}" stepKey="confirmDelete"/>
         <waitForPageLoad stepKey="waitForDeleteToFinish"/>
     </actionGroup>
+
+    <!--Check that the minicart is empty-->
+    <actionGroup name="assertMiniCartEmpty">
+        <dontSeeElement selector="{{StorefrontMinicartSection.productCount}}" stepKey="dontSeeMinicartProductCount"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="expandMinicart"/>
+        <see selector="{{StorefrontMinicartSection.minicartContent}}" userInput="You have no items in your shopping cart." stepKey="seeEmptyCartMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml
new file mode 100644
index 0000000000000..ee8b761a452d4
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml
@@ -0,0 +1,28 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontUpdateProductQtyMiniShoppingCartActionGroup">
+        <arguments>
+            <argument name="product" type="entity" />
+            <argument name="quote" type="entity" />
+        </arguments>
+
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="goToMiniShoppingCart"/>
+
+        <!-- Clearing QTY field -->
+        <doubleClick selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" stepKey="doubleClickOnQtyInput" />
+        <pressKey selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" parameterArray="[\WebDriverKeys::DELETE]" stepKey="clearQty"/>
+        <!-- Clearing QTY field -->
+
+        <fillField selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}"  userInput="{{quote.qty}}" stepKey="changeQty"/>
+        <click selector="{{StorefrontMinicartSection.itemQuantityUpdateBySku(product.sku)}}" stepKey="clickUpdateButton"/>
+        <waitForPageLoad stepKey="waitForProductQtyUpdate" />
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
index 530157851191f..e7a5992ad8943 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
@@ -15,4 +15,26 @@
         <data key="total">495.00</data>
         <data key="shippingMethod">Flat Rate - Fixed</data>
     </entity>
+    <entity name="simpleOrderQty2" type="Quote">
+        <data key="price">560.00</data>
+        <data key="qty">2</data>
+        <data key="subtotal">1,120.00</data>
+        <data key="shipping">10.00</data>
+        <data key="total">1,130.00</data>
+        <data key="shippingMethod">Flat Rate - Fixed</data>
+        <data key="currency">$</data>
+    </entity>
+    <entity name="quoteQty3Price123" type="Quote">
+        <data key="price">123.00</data>
+        <data key="qty">3</data>
+        <data key="subtotal">369.00</data>
+        <data key="currency">$</data>
+    </entity>
+    <entity name="quoteQty11Subtotal1320" type="Quote">
+        <data key="price">100.00</data>
+        <data key="customOptionsPrice">20</data>
+        <data key="qty">11</data>
+        <data key="subtotal">1,320.00</data>
+        <data key="currency">$</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
index bdb02835c6276..38c88bf4f80bb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
@@ -25,6 +25,8 @@
         <element name="deleteMiniCartItem" type="button" selector=".action.delete" timeout="30"/>
         <element name="deleteMiniCartItemByName" type="button" selector="//ol[@id='mini-cart']//div[contains(., '{{var}}')]//a[contains(@class, 'delete')]" parameterized="true"/>
         <element name="miniCartSubtotalField" type="text" selector=".block-minicart .amount span.price"/>
+        <element name="itemQuantityBySku" type="input" selector="#minicart-content-wrapper input[data-cart-item-id='{{productSku}}']" parameterized="true"/>
+        <element name="itemQuantityUpdateBySku" type="button" selector="//div[@id='minicart-content-wrapper']//input[@data-cart-item-id='{{productSku}}']/../button[contains(@class, 'update-cart-item')]" parameterized="true"/>
         <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"/>
         <element name="itemDiscount" type="text" selector="//tr[@class='totals']//td[@class='amount']/span"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml
new file mode 100644
index 0000000000000..423f4049f6722
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml
@@ -0,0 +1,65 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontUpdateShoppingCartSimpleProductQtyTest">
+        <annotations>
+            <features value="Checkout"/>
+            <title value="Check updating shopping cart while updating items qty"/>
+            <description value="Check updating shopping cart while updating items qty"/>
+            <testCaseId value="MC-14731" />
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Add the newly created product to the shopping cart -->
+            <actionGroup ref="AddSimpleProductToCart" stepKey="addToCartFromStorefrontProductPage">
+                <argument name="product" value="$$createProduct$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Go to the shopping cart -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad1"/>
+
+        <!-- Change the product QTY -->
+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="{{quoteQty3Price123.qty}}" stepKey="changeCartQty"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="openShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad2"/>
+
+        <!-- The price and QTY values should be updated for the product -->
+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
+        <see userInput="{{quoteQty3Price123.currency}}{{quoteQty3Price123.subtotal}}" selector="{{CheckoutCartProductSection.productSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
+        <assertEquals stepKey="assertProductQtyInCart">
+            <actualResult type="variable">grabProductQtyInCart</actualResult>
+            <expectedResult type="string">{{quoteQty3Price123.qty}}</expectedResult>
+        </assertEquals>
+
+        <!-- Subtotal should be updated -->
+        <see userInput="{{quoteQty3Price123.currency}}{{quoteQty3Price123.subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertCartSubtotal"/>
+
+        <!-- Minicart product price and subtotal should be updated -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openMinicart"/>
+        <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="grabProductQtyInMinicart"/>
+        <assertEquals stepKey="assertProductQtyInMinicart">
+            <actualResult type="variable">grabProductQtyInMinicart</actualResult>
+            <expectedResult type="string">{{quoteQty3Price123.qty}}</expectedResult>
+        </assertEquals>
+        <see userInput="{{quoteQty3Price123.currency}}{{quoteQty3Price123.subtotal}}" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml
new file mode 100644
index 0000000000000..84080b04c80ee
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml
@@ -0,0 +1,70 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest">
+        <annotations>
+            <features value="Checkout"/>
+            <title value="Check updating shopping cart while updating qty of items with custom options"/>
+            <description value="Check updating shopping cart while updating qty of items with custom options"/>
+            <testCaseId value="MC-14732" />
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProductWithCustomPrice" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Add two custom options to the product: field and textarea -->
+            <updateData createDataKey="createProduct" entity="ProductWithTextFieldAndAreaOptions" stepKey="updateProductWithOption"/>
+
+            <!-- Go to the product page, fill the custom options values and add the product to the shopping cart -->
+            <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProductPage"/>
+            <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+            <fillField userInput="OptionField" selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(ProductOptionField.title)}}" stepKey="fillProductOptionInputField"/>
+            <fillField userInput="OptionArea" selector="{{StorefrontProductInfoMainSection.productOptionAreaInput(ProductOptionArea.title)}}" stepKey="fillProductOptionInputArea"/>
+            <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
+                <argument name="productName" value="$createProduct.name$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Go to the shopping cart -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
+
+        <!-- Change the product QTY -->
+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="{{quoteQty11Subtotal1320.qty}}" stepKey="changeCartQty"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="updateShoppingCart"/>
+        <waitForPageLoad stepKey="waitShoppingCartUpdated"/>
+
+        <!-- The price and QTY values should be updated for the product -->
+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
+        <see userInput="{{quoteQty11Subtotal1320.currency}}{{quoteQty11Subtotal1320.subtotal}}" selector="{{CheckoutCartProductSection.productSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
+        <assertEquals stepKey="assertProductQtyInCart">
+            <expectedResult type="string">{{quoteQty11Subtotal1320.qty}}</expectedResult>
+            <actualResult type="variable">grabProductQtyInCart</actualResult>
+        </assertEquals>
+        <see userInput="{{quoteQty11Subtotal1320.currency}}{{quoteQty11Subtotal1320.subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
+
+        <!-- Minicart product price and subtotal should be updated -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openMinicart"/>
+        <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="grabProductQtyInMinicart"/>
+        <assertEquals stepKey="assertProductQtyInMinicart">
+            <expectedResult type="string">{{quoteQty11Subtotal1320.qty}}</expectedResult>
+            <actualResult type="variable">grabProductQtyInMinicart</actualResult>
+        </assertEquals>
+        <see userInput="{{quoteQty11Subtotal1320.currency}}{{quoteQty11Subtotal1320.subtotal}}" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml
new file mode 100644
index 0000000000000..7318f865a0dc1
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml
@@ -0,0 +1,47 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="UpdateProductFromMiniShoppingCartEntityTest">
+        <annotations>
+            <stories value="Shopping Cart"/>
+            <title value="Check updating product from mini shopping cart"/>
+            <description value="Update Product Qty on Mini Shopping Cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-15068"/>
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <!--Create product according to dataset.-->
+            <createData entity="simpleProductWithoutCategory" stepKey="createProduct"/>
+
+            <!--Add product to cart-->
+            <actionGroup ref="AddSimpleProductToCart" stepKey="addToCartFromStorefrontProductPage">
+                <argument name="product" value="$$createProduct$$"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct" />
+        </after>
+
+        <actionGroup ref="StorefrontUpdateProductQtyMiniShoppingCartActionGroup" stepKey="updateProductQty">
+            <argument name="product" value="$$createProduct$$" />
+            <argument name="quote" value="simpleOrderQty2" />
+        </actionGroup>
+
+        <!-- Perform all assertions -->
+        <actionGroup ref="AssertMiniShoppingCartSubTotalActionGroup" stepKey="checkSummary">
+            <argument name="dataQuote" value="simpleOrderQty2"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
index 71dfd12bb4779..4ebd594a28562 100644
--- a/app/code/Magento/Checkout/etc/di.xml
+++ b/app/code/Magento/Checkout/etc/di.xml
@@ -49,7 +49,4 @@
             </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 00bcd2a27005a..8f35fe9f37abf 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -96,4 +96,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/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
index 3ea49cd981d90..eecfa65b189d1 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
@@ -14,7 +14,11 @@ define([
         _create: function () {
             var items, i, reload;
 
-            $(this.options.emptyCartButton).on('click', $.proxy(function () {
+            $(this.options.emptyCartButton).on('click', $.proxy(function (event) {
+                if (event.detail === 0) {
+                    return;
+                }
+
                 $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
                 $(this.options.updateCartActionContainer)
                     .attr('name', 'update_cart_action').attr('value', 'empty_cart');
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index 6f9a1a46826da..d68b0682eb511 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -202,6 +202,13 @@ function (
             }
         },
 
+        /**
+         * Manage cancel button visibility
+         */
+        canUseCancelBillingAddress: ko.computed(function () {
+            return quote.billingAddress() || lastSelectedBillingAddress;
+        }),
+
         /**
          * Restore billing address
          */
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
index 5f735fbb4daa9..63edb5057b933 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
@@ -22,7 +22,7 @@
                 <button class="action action-update" type="button" data-bind="click: updateAddress">
                     <span data-bind="i18n: 'Update'"></span>
                 </button>
-                <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit">
+                <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit, visible: canUseCancelBillingAddress()">
                     <span data-bind="i18n: 'Cancel'"></span>
                 </button>
             </div>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
index a448537d64e83..4b1a68624e547 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
@@ -5,17 +5,17 @@
  */
 -->
 <div data-role="checkout-agreements">
-    <div class="checkout-agreements" data-bind="visible: isVisible">
+    <div class="checkout-agreements fieldset" data-bind="visible: isVisible">
         <!-- ko foreach: agreements -->
             <!-- ko if: ($parent.isAgreementRequired($data)) -->
-            <div class="checkout-agreement required">
+            <div class="checkout-agreement field choice required">
                 <input type="checkbox" class="required-entry"
                        data-bind="attr: {
                                     'id': $parent.getCheckboxId($parentContext, agreementId),
                                     'name': 'agreement[' + agreementId + ']',
                                     'value': agreementId
                                     }"/>
-                <label data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
+                <label class="label" data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
                     <button type="button"
                             class="action action-show"
                             data-bind="click: function(data, event) { return $parent.showContent(data, event) }"
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index b2ef78bab9909..ca563bd9d8f61 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -270,7 +270,8 @@ public function getDirsCollection($path)
         $collection = $this->getCollection($path)
             ->setCollectDirs(true)
             ->setCollectFiles(false)
-            ->setCollectRecursively(false);
+            ->setCollectRecursively(false)
+            ->setOrder('basename', \Magento\Framework\Data\Collection\Filesystem::SORT_ORDER_ASC);
 
         $conditions = $this->getConditionsForExcludeDirs();
 
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
index 05b7dfeeb3953..03edc69e6d625 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
@@ -16,7 +16,6 @@
             <description value="Admin should be able to add image to WYSIWYG content of Block"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84376"/>
-            <group value="WYSIWYGDisabled" />
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
index b4bcdaadf9a09..e6ab1c130606b 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -17,7 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-94229"/>
             <group value="Cms"/>
-            <group value="WYSIWYGDisabled"/>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml
index 65fabfe25e817..2c351a12af72e 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml
@@ -11,13 +11,12 @@
     <test name="StoreViewLanguageCorrectSwitchTest">
         <annotations>
             <features value="Cms"/>
-            <stories value="Store View (language) switch leads to 404"/>
-            <group value="Cms"/>
             <title value="Check that Store View(language) switches correct"/>
             <description value="Check that Store View(language) switches correct"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-96388"/>
             <useCaseId value="MAGETWO-57337"/>
+            <group value="Cms"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -37,7 +36,7 @@
 
         <!-- Create StoreView -->
         <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-        <argument name="customStore" value="NewStoreViewData"/>
+            <argument name="customStore" value="NewStoreViewData"/>
         </actionGroup>
 
         <!-- Add StoreView To Cms Page-->
@@ -51,10 +50,18 @@
         <see userInput="$$createFirstCmsPage.title$$" stepKey="seePageTitle"/>
 
         <!-- Switch StoreView and check that Cms Page is open -->
-        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
-        <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropDown"/>
-        <click selector="{{StorefrontHeaderSection.storeViewOption(NewStoreViewData.code)}}" stepKey="selectStoreView"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchToCustomStoreView">
+            <argument name="storeView" value="NewStoreViewData"/>
+        </actionGroup>
         <amOnPage url="{{StorefrontHomePage.url}}/$$createSecondCmsPage.identifier$$" stepKey="gotToSecondCmsPage"/>
         <see userInput="$$createSecondCmsPage.title$$" stepKey="seePageTitle1"/>
+
+        <!--Open first Cms page on custom store view-->
+        <amOnPage url="{{StorefrontHomePage.url}}/$$createFirstCmsPage.identifier$$" stepKey="gotToFirstCmsPage1"/>
+        <see userInput="Whoops, our bad..." stepKey="seePageError"/>
+
+        <!--Switch to default store view and check Cms page-->
+        <actionGroup ref="StorefrontSwitchDefaultStoreViewActionGroup" stepKey="switchToDefualtStoreView"/>
+        <see userInput="$$createFirstCmsPage.title$$" stepKey="seePageTitle2"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
index 309f08a54aab6..7bec1e3601461 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
@@ -417,6 +417,10 @@ protected function generalTestGetDirsCollection($path, $collectionArray = [], $e
             ->method('setCollectRecursively')
             ->with(false)
             ->willReturnSelf();
+        $storageCollectionMock->expects($this->once())
+            ->method('setOrder')
+            ->with('basename', \Magento\Framework\Data\Collection\Filesystem::SORT_ORDER_ASC)
+            ->willReturnSelf();
         $storageCollectionMock->expects($this->once())
             ->method('getIterator')
             ->willReturn(new \ArrayIterator($collectionArray));
diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
index 9f886f6f1345e..793fc7d26cb4a 100644
--- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
+++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
@@ -146,7 +146,6 @@
                 <editor>
                     <validation>
                         <rule name="required-entry" xsi:type="boolean">true</rule>
-                        <rule name="validate-xml-identifier" xsi:type="boolean">true</rule>
                     </validation>
                     <editorType>text</editorType>
                 </editor>
diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index 2c4b8a8dc48d2..c63ccae871657 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\App\Config\Type;
 
 use Magento\Framework\App\Config\ConfigSourceInterface;
@@ -13,11 +14,12 @@
 use Magento\Config\App\Config\Type\System\Reader;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Cache\LockGuardedCacheLoader;
 use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Store\Model\Config\Processor\Fallback;
-use Magento\Store\Model\ScopeInterface as StoreScope;
 use Magento\Framework\Encryption\Encryptor;
+use Magento\Store\Model\ScopeInterface as StoreScope;
 
 /**
  * System configuration type
@@ -25,6 +27,7 @@
  * @api
  * @since 100.1.2
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
  */
 class System implements ConfigTypeInterface
 {
@@ -42,22 +45,6 @@ class System implements ConfigTypeInterface
      * @var string
      */
     private static $lockName = 'SYSTEM_CONFIG';
-    /**
-     * Timeout between retrieves to load the configuration from the cache.
-     *
-     * Value of the variable in microseconds.
-     *
-     * @var int
-     */
-    private static $delayTimeout = 100000;
-    /**
-     * Lifetime of the lock for write in cache.
-     *
-     * Value of the variable in seconds.
-     *
-     * @var int
-     */
-    private static $lockTimeout = 42;
 
     /**
      * @var array
@@ -106,9 +93,9 @@ class System implements ConfigTypeInterface
     private $encryptor;
 
     /**
-     * @var LockManagerInterface
+     * @var LockGuardedCacheLoader
      */
-    private $locker;
+    private $lockQuery;
 
     /**
      * @param ConfigSourceInterface $source
@@ -122,6 +109,7 @@ class System implements ConfigTypeInterface
      * @param Reader|null $reader
      * @param Encryptor|null $encryptor
      * @param LockManagerInterface|null $locker
+     * @param LockGuardedCacheLoader|null $lockQuery
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -136,7 +124,8 @@ public function __construct(
         $configType = self::CONFIG_TYPE,
         Reader $reader = null,
         Encryptor $encryptor = null,
-        LockManagerInterface $locker = null
+        LockManagerInterface $locker = null,
+        LockGuardedCacheLoader $lockQuery = null
     ) {
         $this->postProcessor = $postProcessor;
         $this->cache = $cache;
@@ -145,8 +134,8 @@ public function __construct(
         $this->reader = $reader ?: ObjectManager::getInstance()->get(Reader::class);
         $this->encryptor = $encryptor
             ?: ObjectManager::getInstance()->get(Encryptor::class);
-        $this->locker = $locker
-            ?: ObjectManager::getInstance()->get(LockManagerInterface::class);
+        $this->lockQuery = $lockQuery
+            ?: ObjectManager::getInstance()->get(LockGuardedCacheLoader::class);
     }
 
     /**
@@ -225,83 +214,56 @@ private function getWithParts($path)
     }
 
     /**
-     * Make lock on data load.
-     *
-     * @param callable $dataLoader
-     * @param bool $flush
-     * @return array
-     */
-    private function lockedLoadData(callable $dataLoader, bool $flush = false): array
-    {
-        $cachedData = $dataLoader(); //optimistic read
-
-        while ($cachedData === false && $this->locker->isLocked(self::$lockName)) {
-            usleep(self::$delayTimeout);
-            $cachedData = $dataLoader();
-        }
-
-        while ($cachedData === false) {
-            try {
-                if ($this->locker->lock(self::$lockName, self::$lockTimeout)) {
-                    if (!$flush) {
-                        $data = $this->readData();
-                        $this->cacheData($data);
-                        $cachedData = $data;
-                    } else {
-                        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
-                        $cachedData = [];
-                    }
-                }
-            } finally {
-                $this->locker->unlock(self::$lockName);
-            }
-
-            if ($cachedData === false) {
-                usleep(self::$delayTimeout);
-                $cachedData = $dataLoader();
-            }
-        }
-
-        return $cachedData;
-    }
-
-    /**
-     * Load configuration data for all scopes
+     * Load configuration data for all scopes.
      *
      * @return array
      */
     private function loadAllData()
     {
-        return $this->lockedLoadData(function () {
+        $loadAction = function () {
             $cachedData = $this->cache->load($this->configType);
             $data = false;
             if ($cachedData !== false) {
                 $data = $this->serializer->unserialize($this->encryptor->decrypt($cachedData));
             }
             return $data;
-        });
+        };
+
+        return $this->lockQuery->lockedLoadData(
+            self::$lockName,
+            $loadAction,
+            \Closure::fromCallable([$this, 'readData']),
+            \Closure::fromCallable([$this, 'cacheData'])
+        );
     }
 
     /**
-     * Load configuration data for default scope
+     * Load configuration data for default scope.
      *
      * @param string $scopeType
      * @return array
      */
     private function loadDefaultScopeData($scopeType)
     {
-        return $this->lockedLoadData(function () use ($scopeType) {
+        $loadAction = function () use ($scopeType) {
             $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
             $scopeData = false;
             if ($cachedData !== false) {
                 $scopeData = [$scopeType => $this->serializer->unserialize($this->encryptor->decrypt($cachedData))];
             }
             return $scopeData;
-        });
+        };
+
+        return $this->lockQuery->lockedLoadData(
+            self::$lockName,
+            $loadAction,
+            \Closure::fromCallable([$this, 'readData']),
+            \Closure::fromCallable([$this, 'cacheData'])
+        );
     }
 
     /**
-     * Load configuration data for a specified scope
+     * Load configuration data for a specified scope.
      *
      * @param string $scopeType
      * @param string $scopeId
@@ -309,7 +271,7 @@ private function loadDefaultScopeData($scopeType)
      */
     private function loadScopeData($scopeType, $scopeId)
     {
-        return $this->lockedLoadData(function () use ($scopeType, $scopeId) {
+        $loadAction = function () use ($scopeType, $scopeId) {
             $cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
             $scopeData = false;
             if ($cachedData === false) {
@@ -329,7 +291,14 @@ private function loadScopeData($scopeType, $scopeId)
             }
 
             return $scopeData;
-        });
+        };
+
+        return $this->lockQuery->lockedLoadData(
+            self::$lockName,
+            $loadAction,
+            \Closure::fromCallable([$this, 'readData']),
+            \Closure::fromCallable([$this, 'cacheData'])
+        );
     }
 
     /**
@@ -371,7 +340,7 @@ private function cacheData(array $data)
     }
 
     /**
-     * Walk nested hash map by keys from $pathParts
+     * Walk nested hash map by keys from $pathParts.
      *
      * @param array $data to walk in
      * @param array $pathParts keys path
@@ -408,7 +377,7 @@ private function readData(): array
     }
 
     /**
-     * Clean cache and global variables cache
+     * Clean cache and global variables cache.
      *
      * Next items cleared:
      * - Internal property intended to store already loaded configuration data
@@ -420,11 +389,13 @@ private function readData(): array
     public function clean()
     {
         $this->data = [];
-        $this->lockedLoadData(
-            function () {
-                return false;
-            },
-            true
+        $cleanAction = function () {
+            $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
+        };
+
+        $this->lockQuery->lockedCleanData(
+            self::$lockName,
+            $cleanAction
         );
     }
 }
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index bec44e9d55757..bd38d1451e1b6 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -114,6 +114,11 @@ class Config extends \Magento\Framework\DataObject
      */
     private $scopeTypeNormalizer;
 
+    /**
+     * @var \Magento\MessageQueue\Api\PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -126,6 +131,7 @@ class Config extends \Magento\Framework\DataObject
      * @param array $data
      * @param ScopeResolverPool|null $scopeResolverPool
      * @param ScopeTypeNormalizer|null $scopeTypeNormalizer
+     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface|null $pillPut
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -139,7 +145,8 @@ public function __construct(
         SettingChecker $settingChecker = null,
         array $data = [],
         ScopeResolverPool $scopeResolverPool = null,
-        ScopeTypeNormalizer $scopeTypeNormalizer = null
+        ScopeTypeNormalizer $scopeTypeNormalizer = null,
+        \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut = null
     ) {
         parent::__construct($data);
         $this->_eventManager = $eventManager;
@@ -155,6 +162,8 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
         $this->scopeTypeNormalizer = $scopeTypeNormalizer
             ?? ObjectManager::getInstance()->get(ScopeTypeNormalizer::class);
+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\MessageQueue\Api\PoisonPillPutInterface::class);
     }
 
     /**
@@ -224,6 +233,8 @@ public function save()
             throw $e;
         }
 
+        $this->pillPut->put();
+
         return $this;
     }
 
@@ -525,24 +536,29 @@ public function setDataByPath($path, $value)
         if ($path === '') {
             throw new \UnexpectedValueException('Path must not be empty');
         }
+
         $pathParts = explode('/', $path);
         $keyDepth = count($pathParts);
-        if ($keyDepth !== 3) {
+        if ($keyDepth < 3) {
             throw new \UnexpectedValueException(
-                "Allowed depth of configuration is 3 (<section>/<group>/<field>). Your configuration depth is "
-                . $keyDepth . " for path '$path'"
+                'Minimal depth of configuration is 3. Your configuration depth is ' . $keyDepth
             );
         }
+
+        $section = array_shift($pathParts);
         $data = [
-            'section' => $pathParts[0],
-            'groups' => [
-                $pathParts[1] => [
-                    'fields' => [
-                        $pathParts[2] => ['value' => $value],
-                    ],
-                ],
+            'fields' => [
+                array_pop($pathParts) => ['value' => $value],
             ],
         ];
+        while ($pathParts) {
+            $data = [
+                'groups' => [
+                    array_pop($pathParts) => $data,
+                ],
+            ];
+        }
+        $data['section'] = $section;
         $this->addData($data);
     }
 
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
index bdcb44b756bb2..66163e354cc06 100644
--- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -330,22 +330,59 @@ public function testSaveToCheckScopeDataSet()
         $this->model->save();
     }
 
-    public function testSetDataByPath()
+    /**
+     * @param string $path
+     * @param string $value
+     * @param string $section
+     * @param array $groups
+     * @dataProvider setDataByPathDataProvider
+     */
+    public function testSetDataByPath(string $path, string $value, string $section, array $groups)
     {
-        $value = 'value';
-        $path = '<section>/<group>/<field>';
         $this->model->setDataByPath($path, $value);
-        $expected = [
-            'section' => '<section>',
-            'groups' => [
-                '<group>' => [
-                    'fields' => [
-                        '<field>' => ['value' => $value],
+        $this->assertEquals($section, $this->model->getData('section'));
+        $this->assertEquals($groups, $this->model->getData('groups'));
+    }
+
+    /**
+     * @return array
+     */
+    public function setDataByPathDataProvider(): array
+    {
+        return [
+            'depth 3' => [
+                'a/b/c',
+                'value1',
+                'a',
+                [
+                    'b' => [
+                        'fields' => [
+                            'c' => ['value' => 'value1'],
+                        ],
+                    ],
+                ],
+            ],
+            'depth 5' => [
+                'a/b/c/d/e',
+                'value1',
+                'a',
+                [
+                    'b' => [
+                        'groups' => [
+                            'c' => [
+                                'groups' => [
+                                    'd' => [
+                                        'fields' => [
+                                            'e' => ['value' => 'value1'],
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
                     ],
                 ],
             ],
         ];
-        $this->assertSame($expected, $this->model->getData());
     }
 
     /**
@@ -359,14 +396,13 @@ public function testSetDataByPathEmpty()
 
     /**
      * @param string $path
-     * @param string $expectedException
-     *
      * @dataProvider setDataByPathWrongDepthDataProvider
      */
-    public function testSetDataByPathWrongDepth($path, $expectedException)
+    public function testSetDataByPathWrongDepth(string $path)
     {
-        $expectedException = 'Allowed depth of configuration is 3 (<section>/<group>/<field>). ' . $expectedException;
-        $this->expectException('\UnexpectedValueException');
+        $currentDepth = count(explode('/', $path));
+        $expectedException = 'Minimal depth of configuration is 3. Your configuration depth is ' . $currentDepth;
+        $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionMessage($expectedException);
         $value = 'value';
         $this->model->setDataByPath($path, $value);
@@ -375,13 +411,11 @@ public function testSetDataByPathWrongDepth($path, $expectedException)
     /**
      * @return array
      */
-    public function setDataByPathWrongDepthDataProvider()
+    public function setDataByPathWrongDepthDataProvider(): array
     {
         return [
-            'depth 2' => ['section/group', "Your configuration depth is 2 for path 'section/group'"],
-            'depth 1' => ['section', "Your configuration depth is 1 for path 'section'"],
-            'depth 4' => ['section/group/field/sub-field', "Your configuration depth is 4 for path"
-                . " 'section/group/field/sub-field'", ],
+            'depth 2' => ['section/group'],
+            'depth 1' => ['section'],
         ];
     }
 }
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index 57c067d2cae27..3312fb630ccda 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -7,6 +7,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
+        "magento/module-message-queue": "*",
         "magento/module-backend": "*",
         "magento/module-cron": "*",
         "magento/module-deploy": "*",
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index 87a0e666d2d7b..920cac382fcbf 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -90,9 +90,18 @@
             <argument name="preProcessor" xsi:type="object">Magento\Framework\App\Config\PreProcessorComposite</argument>
             <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\Serialize</argument>
             <argument name="reader" xsi:type="object">Magento\Config\App\Config\Type\System\Reader\Proxy</argument>
-            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
+            <argument name="lockQuery" xsi:type="object">systemConfigQueryLocker</argument>
         </arguments>
     </type>
+
+    <virtualType name="systemConfigQueryLocker" type="Magento\Framework\Cache\LockGuardedCacheLoader">
+        <arguments>
+            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
+            <argument name="lockTimeout" xsi:type="number">42000</argument>
+            <argument name="delayTimeout" xsi:type="number">100</argument>
+        </arguments>
+    </virtualType>
+
     <type name="Magento\Config\App\Config\Type\System\Reader">
         <arguments>
             <argument name="source" xsi:type="object">systemConfigSourceAggregated</argument>
diff --git a/app/code/Magento/ConfigurableImportExport/etc/module.xml b/app/code/Magento/ConfigurableImportExport/etc/module.xml
index 7ff81f8d63443..b59234ca0e7da 100644
--- a/app/code/Magento/ConfigurableImportExport/etc/module.xml
+++ b/app/code/Magento/ConfigurableImportExport/etc/module.xml
@@ -6,6 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_ConfigurableImportExport" >
+    <module name="Magento_ConfigurableImportExport">
+        <sequence>
+            <module name="Magento_ConfigurableProduct"/>
+        </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
index bee334596e990..f2bf3116af9e4 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
@@ -7,14 +7,15 @@
  */
 namespace Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
+use Magento\Catalog\Model\Product;
+
+/**
+ * Class Price for configurable product
+ */
 class Price extends \Magento\Catalog\Model\Product\Type\Price
 {
     /**
-     * Get product final price
-     *
-     * @param   float $qty
-     * @param   \Magento\Catalog\Model\Product $product
-     * @return  float
+     * @inheritdoc
      */
     public function getFinalPrice($qty, $product)
     {
@@ -22,7 +23,10 @@ public function getFinalPrice($qty, $product)
             return $product->getCalculatedFinalPrice();
         }
         if ($product->getCustomOption('simple_product') && $product->getCustomOption('simple_product')->getProduct()) {
-            $finalPrice = parent::getFinalPrice($qty, $product->getCustomOption('simple_product')->getProduct());
+            /** @var Product $simpleProduct */
+            $simpleProduct = $product->getCustomOption('simple_product')->getProduct();
+            $simpleProduct->setCustomerGroupId($product->getCustomerGroupId());
+            $finalPrice = parent::getFinalPrice($qty, $simpleProduct);
         } else {
             $priceInfo = $product->getPriceInfo();
             $finalPrice = $priceInfo->getPrice('final_price')->getAmount()->getValue();
@@ -35,7 +39,7 @@ public function getFinalPrice($qty, $product)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPrice($product)
     {
@@ -48,6 +52,7 @@ public function getPrice($product)
                 }
             }
         }
+
         return 0;
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
index d6e7221ec1cab..43dae2d70d416 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -145,8 +145,8 @@
         <click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="clickOnSecondAttributeCheckbox" after="clickOnFirstAttributeCheckbox"/>
         <grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(attributeCode)}}" stepKey="grabFirstAttributeDefaultLabel" after="clickOnSecondAttributeCheckbox"/>
         <grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(secondAttributeCode)}}" stepKey="grabSecondAttributeDefaultLabel" after="grabFirstAttributeDefaultLabel"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFistAttribute" after="clickOnNextButton1"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="clickOnSelectAllForFistAttribute"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFirstAttribute" after="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="clickOnSelectAllForFirstAttribute"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
     </actionGroup>
@@ -156,4 +156,124 @@
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
     </actionGroup>
+
+    <actionGroup name="addNewProductConfigurationAttribute">
+        <arguments>
+            <argument name="attribute" type="entity"/>
+            <argument name="firstOption" type="entity"/>
+            <argument name="secondOption" type="entity"/>
+        </arguments>
+        <!-- Create new attribute -->
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
+        <waitForPageLoad stepKey="waitForIFrame"/>
+        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{attribute.default_label}}" stepKey="fillDefaultLabel"/>
+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+        <waitForPageLoad stepKey="waitForFilters"/>
+        <!-- Find created below attribute and add option; save attribute -->
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
+        <fillField userInput="{{attribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateFirstNewValue"/>
+        <fillField userInput="{{firstOption.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewFirstOption"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateSecondNewValue"/>
+        <fillField userInput="{{secondOption.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewSecondOption"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnSecondNextButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnThirdNextButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnFourthNextButton"/>
+    </actionGroup>
+
+    <actionGroup name="changeProductConfigurationsInGrid">
+        <arguments>
+            <argument name="firstOption" type="entity"/>
+            <argument name="secondOption" type="entity"/>
+        </arguments>
+        <fillField userInput="{{firstOption.name}}" selector="{{AdminProductFormConfigurationsSection.confProductNameCell(firstOption.name)}}" stepKey="fillFieldNameForFirstAttributeOption"/>
+        <fillField userInput="{{secondOption.name}}" selector="{{AdminProductFormConfigurationsSection.confProductNameCell(secondOption.name)}}" stepKey="fillFieldNameForSecondAttributeOption"/>
+        <fillField userInput="{{firstOption.sku}}" selector="{{AdminProductFormConfigurationsSection.confProductSkuCell(firstOption.name)}}" stepKey="fillFieldSkuForFirstAttributeOption"/>
+        <fillField userInput="{{secondOption.sku}}" selector="{{AdminProductFormConfigurationsSection.confProductSkuCell(secondOption.name)}}" stepKey="fillFieldSkuForSecondAttributeOption"/>
+        <fillField userInput="{{firstOption.price}}" selector="{{AdminProductFormConfigurationsSection.confProductPriceCell(firstOption.name)}}" stepKey="fillFieldPriceForFirstAttributeOption"/>
+        <fillField userInput="{{secondOption.price}}" selector="{{AdminProductFormConfigurationsSection.confProductPriceCell(secondOption.name)}}" stepKey="fillFieldPriceForSecondAttributeOption"/>
+        <fillField userInput="{{firstOption.quantity}}" selector="{{AdminProductFormConfigurationsSection.confProductQuantityCell(firstOption.name)}}" stepKey="fillFieldQuantityForFirstAttributeOption"/>
+        <fillField userInput="{{secondOption.quantity}}" selector="{{AdminProductFormConfigurationsSection.confProductQuantityCell(secondOption.name)}}" stepKey="fillFieldQuantityForSecondAttributeOption"/>
+        <fillField userInput="{{firstOption.weight}}" selector="{{AdminProductFormConfigurationsSection.confProductWeightCell(firstOption.name)}}" stepKey="fillFieldWeightForFirstAttributeOption"/>
+        <fillField userInput="{{secondOption.weight}}" selector="{{AdminProductFormConfigurationsSection.confProductWeightCell(secondOption.name)}}" stepKey="fillFieldWeightForSecondAttributeOption"/>
+    </actionGroup>
+
+    <actionGroup name="changeProductConfigurationsInGridExceptSku" extends="changeProductConfigurationsInGrid">
+        <remove keyForRemoval="fillFieldSkuForFirstAttributeOption"/>
+        <remove keyForRemoval="fillFieldSkuForSecondAttributeOption"/>
+    </actionGroup>
+
+    <actionGroup name="addProductToConfigurationsGrid">
+        <arguments>
+            <argument name="sku" type="string"/>
+            <argument name="name" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtnByProductName(name)}}" stepKey="clickToExpandFirstActions"/>
+        <click selector="{{AdminProductFormConfigurationsSection.addProduct(name)}}" stepKey="clickChooseFirstDifferentProduct"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+        <waitForPageLoad stepKey="waitForFilters"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <click selector="{{AdminProductGridFilterSection.firstRowBySku(sku)}}" stepKey="clickOnFirstRow"/>
+    </actionGroup>
+
+    <actionGroup name="addUniqueImageToConfigurableProductOption">
+        <arguments>
+            <argument name="image" defaultValue="ProductImage"/>
+            <argument name="frontend_label" type="string"/>
+            <argument name="label" type="string"/>
+        </arguments>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniqueImagesToEachSkus}}" stepKey="clickOnApplyUniqueImagesToEachSku"/>
+        <selectOption userInput="{{frontend_label}}" selector="{{AdminCreateProductConfigurationsPanel.selectImagesButton}}" stepKey="selectOption"/>
+        <attachFile selector="{{AdminCreateProductConfigurationsPanel.uploadImagesButton(label)}}" userInput="{{image.file}}" stepKey="uploadFile"/>
+        <waitForElementNotVisible selector="{{AdminCreateProductConfigurationsPanel.uploadProgressBar}}" stepKey="waitForUpload"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.imageFile(image.fileName)}}" stepKey="waitForThumbnail"/>
+    </actionGroup>
+
+    <actionGroup name="addUniquePriceToConfigurableProductOption">
+        <arguments>
+            <argument name="frontend_label" type="string"/>
+            <argument name="label" type="string"/>
+            <argument name="price" type="string"/>
+        </arguments>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesToEachSkus}}" stepKey="clickOnApplyUniquePricesToEachSku"/>
+        <selectOption userInput="{{frontend_label}}" selector="{{AdminCreateProductConfigurationsPanel.selectPriceButton}}" stepKey="selectOption"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.price(label)}}" userInput="{{price}}" stepKey="enterAttributeQuantity"/>
+    </actionGroup>
+
+    <actionGroup name="saveConfigurableProductWithNewAttributeSet">
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveConfigurableProduct"/>
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" time="30" stepKey="waitForAttributeSetConfirmation"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.addNewAttrSet}}" stepKey="clickAddNewAttributeSet"/>
+        <fillField selector="{{AdminChooseAffectedAttributeSetPopup.createNewAttrSetName}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillFieldNewAttrSetName"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickConfirmAttributeSet"/>
+        <see selector="You saved the product" stepKey="seeConfigurableSaveConfirmation" after="clickConfirmAttributeSet"/>
+    </actionGroup>
+
+    <actionGroup name="saveConfigurableProductAddToCurrentAttributeSet">
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveBtnVisible"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductAgain"/>
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
+    </actionGroup>
+
+    <actionGroup name="assertConfigurableProductOnAdminProductPage">
+        <arguments>
+            <argument name="product" type="entity"/>
+        </arguments>
+        <seeInField userInput="{{ApiConfigurableProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="seeNameRequired"/>
+        <seeInField userInput="{{ApiConfigurableProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="seeSkuRequired"/>
+        <dontSeeInField userInput="{{ApiConfigurableProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="dontSeePriceRequired"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
index 39c206e365a2d..e2759fc0fd23d 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -21,4 +21,15 @@
         <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
         <seeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
     </actionGroup>
+
+    <!-- Check configurable product out of stock on the category page -->
+    <actionGroup name="StorefrontCheckCategoryOutOfStockConfigurableProduct">
+        <arguments>
+            <argument name="product" type="entity"/>
+        </arguments>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName(product.name)}}" stepKey="assertProductName"/>
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductStockUnavailable}}" stepKey="AssertOutOfStock"/>
+        <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
index 9be600c239c79..51bb041b66089 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
@@ -33,4 +33,49 @@
         </arguments>
         <seeElement selector="{{StorefrontProductInfoMainSection.attributeOptionByAttributeID(attributeCode, optionName)}}" stepKey="verifyOptionExists"/>
     </actionGroup>
+
+    <!-- Verify configurable product options in storefront product view -->
+    <actionGroup name="storefrontCheckConfigurableProductOptions">
+        <arguments>
+            <argument name="product" type="entity"/>
+            <argument name="firstOption" type="entity"/>
+            <argument name="secondOption" type="entity"/>
+        </arguments>
+        <selectOption userInput="{{firstOption.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="seeConfigurableProductName"/>
+        <see userInput="{{firstOption.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPricePresent"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="seeConfigurableProductSku"/>
+        <see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="assertInStock"/>
+        <see userInput="{{colorProductAttribute.default_label}}" selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" stepKey="seeColorAttributeName"/>
+        <dontSee userInput="As low as" selector="{{StorefrontProductInfoMainSection.productPriceLabel}}" stepKey="dontSeeProductPriceLabel1"/>
+        <selectOption userInput="{{secondOption.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption2"/>
+        <dontSee userInput="As low as" selector="{{StorefrontProductInfoMainSection.productPriceLabel}}" stepKey="dontSeeProductPriceLabel2"/>
+        <see userInput="{{secondOption.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeProductPrice2"/>
+    </actionGroup>
+
+    <!-- Assert option image in storefront product page -->
+    <actionGroup name="assertOptionImageInStorefrontProductPage">
+        <arguments>
+            <argument name="product" type="entity"/>
+            <argument name="label" type="string"/>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <selectOption userInput="{{label}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeFirstImage"/>
+    </actionGroup>
+
+    <!-- Assert configurable product with special price in storefront product page -->
+    <actionGroup name="assertConfigurableProductWithSpecialPriceOnStorefrontProductPage">
+        <arguments>
+            <argument name="option" type="string"/>
+            <argument name="price" type="string"/>
+            <argument name="specialPrice" defaultValue="specialProductPrice"/>
+        </arguments>
+        <selectOption userInput="{{option}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOptionWithSpecialPrice"/>
+        <see userInput="{{specialProductPrice.price}}" selector="{{StorefrontProductInfoMainSection.productSpecialPrice}}" stepKey="seeSpecialProductPrice"/>
+        <see userInput="Regular Price" selector="{{StorefrontProductInfoMainSection.specialProductText}}" stepKey="seeText"/>
+        <see userInput="{{price}}" selector="{{StorefrontProductInfoMainSection.oldProductPrice}}" stepKey="seeOldProductPrice"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
new file mode 100644
index 0000000000000..f3b0786236062
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
@@ -0,0 +1,14 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="VerifyProductTypeOrder">
+        <seeElement stepKey="seeConfigurableInOrder" selector="{{AdminProductDropdownOrderSection.configurableProduct}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
index 9342172f7d4df..4c5f83ecebecf 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
@@ -42,4 +42,22 @@
         <data key="name">Black</data>
         <data key="price">5.00</data>
     </entity>
+    <entity name="colorConfigurableProductAttribute1" type="product_attribute">
+        <data key="name" unique="suffix">Green</data>
+        <data key="sku" unique="suffix">sku-green</data>
+        <data key="type_id">simple</data>
+        <data key="price">1</data>
+        <data key="visibility">1</data>
+        <data key="quantity">1</data>
+        <data key="weight">1</data>
+    </entity>
+    <entity name="colorConfigurableProductAttribute2" type="product_attribute">
+        <data key="name" unique="suffix">Red</data>
+        <data key="sku" unique="suffix">sku-red</data>
+        <data key="type_id">simple</data>
+        <data key="price">2</data>
+        <data key="visibility">1</data>
+        <data key="quantity">10</data>
+        <data key="weight">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
index 6e8303e6baead..78e4c7bced8e2 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
@@ -10,6 +10,8 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminChooseAffectedAttributeSetPopup">
         <element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
+        <element name="addNewAttrSet" type="radio" selector="//input[@data-index='affectedAttributeSetNew']" timeout="30"/>
+        <element name="createNewAttrSetName" type="input" selector="//input[@name='configurableNewAttributeSetName']" timeout="30"/>
         <element name="closePopUp" type="button" selector="//*[contains(@class,'product_form_product_form_configurable_attribute_set')]//button[@data-role='closeBtn']" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
index 9b4798c95ec72..eccff2830d2a5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
@@ -35,9 +35,18 @@
         <element name="attribute3" type="input" selector="#apply-single-price-input-2"/>
 
         <element name="applySingleQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
+        <element name="applyUniqueImagesToEachSkus" type="radio" selector=".admin__field-label[for='apply-unique-images-radio']" timeout="30"/>
+        <element name="applyUniquePricesToEachSkus" type="radio" selector=".admin__field-label[for='apply-unique-prices-radio']" timeout="30"/>
+        <element name="selectImagesButton" type="select" selector="#apply-images-attributes" timeout="30"/>
+        <element name="uploadImagesButton" type="file" selector="//*[text()='{{option}}']/../../div[@data-role='gallery']//input[@type='file']" timeout="30" parameterized="true"/>
+        <element name="uploadProgressBar" type="text" selector=".uploader .file-row"/>
+        <element name="imageFile" type="text" selector="//*[@data-role='gallery']//img[contains(@src, '{{url}}')]" parameterized="true"/>
+        <element name="selectPriceButton" type="select" selector="#select-each-price" timeout="30"/>
+        <element name="price" type="input" selector="//*[text()='{{option}}']/../..//input[contains(@id, 'apply-single-price-input')]" parameterized="true"/>
         <element name="quantity" type="input" selector="#apply-single-inventory-input"/>
         <element name="gridLoadingMask" type="text" selector="[data-role='spinner'][data-component*='product_attributes_listing']"/>
         <element name="attributeCheckboxByName" type="input" selector="//*[contains(@data-attribute-option-title,'{{arg}}')]//input[@type='checkbox']" parameterized="true"/>
         <element name="attributeColorCheckbox" type="select" selector="//div[contains(text(),'color') and @class='data-grid-cell-content']/../preceding-sibling::td/label/input"/>
+        <element name="attributeRowByAttributeCode" type="block" selector="//td[count(../../..//th[./*[.='Attribute Code']]/preceding-sibling::th) + 1][./*[.='{{attribute_code}}']]/../td//input[@data-action='select-row']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
new file mode 100644
index 0000000000000..6056e7f3cbd09
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductDropdownOrderSection">
+        <element name="configurableProduct" type="text" selector="//li[not(preceding-sibling::li[span[@title='Virtual Product']]) and not(preceding-sibling::li[span[@title='Grouped Product']]) and not(preceding-sibling::li[span[@title='Bundle Product']]) and not(preceding-sibling::li[span[@title='Downloadable Product']]) and not(following-sibling::li[span[@title='Simple Product']])]/span[@title='Configurable Product']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
index 73ae71adfaaf0..d1b16cb8f5ce3 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductFormConfigurationsSection">
         <element name="sectionHeader" type="text" selector=".admin__collapsible-block-wrapper[data-index='configurable']"/>
+        <element name="createdConfigurationsBlock" type="text" selector="div.admin__field.admin__field-wide"/>
         <element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="30"/>
         <element name="currentVariationsRows" type="button" selector=".data-row"/>
         <element name="currentVariationsNameCells" type="textarea" selector=".admin__control-fields[data-index='name_container']"/>
@@ -20,10 +21,17 @@
         <element name="currentVariationsStatusCells" type="textarea" selector="._no-header[data-index='status']"/>
         <element name="firstSKUInConfigurableProductsGrid" type="input" selector="//input[@name='configurable-matrix[0][sku]']"/>
         <element name="actionsBtn" type="button" selector="(//button[@class='action-select']/span[contains(text(), 'Select')])[{{var1}}]" parameterized="true"/>
+        <element name="actionsBtnByProductName" type="textarea" selector="//*[.='Attributes']/ancestor::tr/td[@data-index='attributes']//span[contains(text(), '{{var}}')]/ancestor::tr//button[@class='action-select']" parameterized="true"/>
+        <element name="addProduct" type="button" selector="//*[.='Attributes']/ancestor::tr/td[@data-index='attributes']//span[contains(text(), '{{var}}')]/ancestor::tr//a[text()='Choose a different Product']" parameterized="true"/>
         <element name="removeProductBtn" type="button" selector="//a[text()='Remove Product']"/>
         <element name="disableProductBtn" type="button" selector="//a[text()='Disable Product']"/>
         <element name="enableProductBtn" type="button" selector="//a[text()='Enable Product']"/>
         <element name="confProductSku" type="input" selector="//*[@name='configurable-matrix[{{arg}}][sku]']" parameterized="true"/>
+        <element name="confProductNameCell" type="input" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{var}}')]/ancestor::tr/td[@data-index='name_container']//input" parameterized="true"/>
+        <element name="confProductSkuCell" type="input" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{var}}')]/ancestor::tr/td[@data-index='sku_container']//input" parameterized="true"/>
+        <element name="confProductPriceCell" type="input" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{var}}')]/ancestor::tr/td[@data-index='price_container']//input" parameterized="true"/>
+        <element name="confProductQuantityCell" type="input" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{var}}')]/ancestor::tr/td[@data-index='quantity_container']//input" parameterized="true"/>
+        <element name="confProductWeightCell" type="input" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{var}}')]/ancestor::tr/td[@data-index='price_weight']//input" parameterized="true"/>
         <element name="confProductSkuMessage" type="text" selector="//*[@name='configurable-matrix[{{arg}}][sku]']/following-sibling::label" parameterized="true"/>
         <element name="variationsSkuInputByRow" selector="[data-index='configurable-matrix'] table > tbody > tr:nth-of-type({{row}}) input[name*='sku']" type="input" parameterized="true"/>
         <element name="variationsSkuInputErrorByRow" selector="[data-index='configurable-matrix'] table > tbody > tr:nth-of-type({{row}}) .admin__field-error" type="text" parameterized="true"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index b64a52d7cea41..09de3cc302903 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -11,6 +11,7 @@
     <section name="StorefrontProductInfoMainSection">
         <element name="optionByAttributeId" type="input" selector="#attribute{{var1}}" parameterized="true"/>
         <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
+        <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
         <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
         <element name="productAttributeOptionsSelectButton" type="select" selector="#product-options-wrapper .super-attribute-select"/>
         <element name="productAttributeOptionsError" type="text" selector="//div[@class='mage-error']"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
new file mode 100644
index 0000000000000..68bf703ecdab4
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
@@ -0,0 +1,75 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Assert notice that existing sku automatically changed when saving product with same sku"/>
+            <description value="Admin should not be able to create configurable product and two new options with the same sku"/>
+            <testCaseId value="MC-13693"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="ApiConfigurableProduct"/>
+            </actionGroup>
+
+            <!-- Delete product attribute -->
+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
+                <argument name="ProductAttribute" value="colorProductAttribute"/>
+            </actionGroup>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create configurable product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Fill configurable product values -->
+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!--Create product configurations-->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="fillConfigurableProductValues"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
+
+        <!--Create new attribute with two option -->
+        <actionGroup ref="addNewProductConfigurationAttribute" stepKey="createProductConfigurationAttribute">
+            <argument name="attribute" value="colorProductAttribute"/>
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Change products sku configurations in grid -->
+        <fillField userInput="{{ApiConfigurableProduct.sku}}" selector="{{AdminProductFormConfigurationsSection.confProductSkuCell(colorConfigurableProductAttribute1.name)}}" stepKey="fillFieldSkuForFirstAttributeOption"/>
+        <fillField userInput="{{ApiConfigurableProduct.sku}}" selector="{{AdminProductFormConfigurationsSection.confProductSkuCell(colorConfigurableProductAttribute2.name)}}" stepKey="fillFieldSkuForSecondAttributeOption"/>
+
+        <!-- Save product -->
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveBtnVisible"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductAgain"/>
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
+
+        <!-- Assert product auto incremented sku notice message; see success message -->
+        <see selector="{{AdminMessagesSection.noticeMessage}}" stepKey="seeNoticeMessage" userInput="SKU for product {{ApiConfigurableProduct.name}} has been changed to {{ApiConfigurableProduct.sku}}-2."/>
+        <see selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage" userInput="You saved the product."/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
index af12f49bf86ea..39aa516077c56 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
@@ -57,7 +57,13 @@
         <click selector="{{AdminUpdateAttributesSection.toggleDescription}}" stepKey="clickToggleDescription"/>
         <fillField selector="{{AdminUpdateAttributesSection.description}}" userInput="MFTF automation!" stepKey="fillDescription"/>
         <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="clickSave"/>
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 3 record(s) were updated." stepKey="seeSaveSuccess"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeSaveSuccess"/>
+
+        <!-- Run cron twice -->
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
 
         <!-- Check storefront for description -->
         <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoProduct1"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
new file mode 100644
index 0000000000000..f4f607e9119b6
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
@@ -0,0 +1,82 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateConfigurableProductBasedOnParentSkuTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Configurable product variation's sku should be based on parent SKU"/>
+            <description value="Admin should be able to create configurable product with two new options based on parent SKU, without assigned to category and attribute set"/>
+            <testCaseId value="MC-13689"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete configurable product with children products -->
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProducts">
+                <argument name="sku" value="{{ApiConfigurableProduct.sku}}"/>
+            </actionGroup>
+
+            <!-- Delete product attribute -->
+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
+                <argument name="ProductAttribute" value="colorProductAttribute"/>
+            </actionGroup>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create configurable product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Fill configurable product values -->
+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!--Create product configurations-->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="fillConfigurableProductValues"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
+
+        <!--Create new attribute with two option -->
+        <actionGroup ref="addNewProductConfigurationAttribute" stepKey="createProductConfigurationAttribute">
+            <argument name="attribute" value="colorProductAttribute"/>
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Change product configurations except sku -->
+        <actionGroup ref="changeProductConfigurationsInGridExceptSku" stepKey="changeProductConfigurationsInGridExceptSku">
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Save product -->
+        <actionGroup ref="saveConfigurableProductAddToCurrentAttributeSet" stepKey="saveProduct"/>
+
+        <!-- Assert child products generated sku in grid -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageLoad"/>
+        <actionGroup ref="filterProductGridByName2" stepKey="filterFirstProductByNameInGrid">
+            <argument name="name" value="{{colorConfigurableProductAttribute1.name}}"/>
+        </actionGroup>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{ApiConfigurableProduct.sku}}-{{colorConfigurableProductAttribute1.name}}"  stepKey="seeFirstProductSkuInGrid"/>
+        <actionGroup ref="filterProductGridByName2" stepKey="filterSecondProductByNameInGrid">
+            <argument name="name" value="{{colorConfigurableProductAttribute2.name}}"/>
+        </actionGroup>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{ApiConfigurableProduct.sku}}-{{colorConfigurableProductAttribute2.name}}"  stepKey="seeSecondProductSkuInGrid"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
new file mode 100644
index 0000000000000..a7242b43c2b5f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
@@ -0,0 +1,124 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Create configurable product with creating new category and new attribute (required fields only)"/>
+            <description value="Admin should be able to create configurable product with creating new category and new attribute (required fields only)"/>
+            <testCaseId value="MC-13687"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="ApiConfigurableProduct"/>
+            </actionGroup>
+
+            <!-- Delete children products -->
+            <actionGroup ref="deleteProductBySku" stepKey="deleteFirstChildProduct">
+                <argument name="sku" value="{{colorConfigurableProductAttribute1.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteSecondChildProduct">
+                <argument name="sku" value="{{colorConfigurableProductAttribute2.sku}}"/>
+            </actionGroup>
+
+            <!-- Delete product attribute -->
+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
+                <argument name="ProductAttribute" value="colorProductAttribute"/>
+            </actionGroup>
+
+            <!-- Delete attribute set -->
+            <actionGroup ref="deleteAttributeSetByLabel" stepKey="deleteAttributeSet">
+                <argument name="label" value="{{ProductAttributeFrontendLabel.label}}"/>
+            </actionGroup>
+
+            <!-- Delete category -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create configurable product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Fill configurable product required fields only-->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{ApiConfigurableProduct.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{ApiConfigurableProduct.price}}" stepKey="fillProductPrice"/>
+
+        <!-- Add configurable product in category -->
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
+
+        <!--Create product configurations-->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
+
+        <!--Create new attribute with two option -->
+        <actionGroup ref="addNewProductConfigurationAttribute" stepKey="createProductConfigurationAttribute">
+            <argument name="attribute" value="colorProductAttribute"/>
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Change product configurations in grid -->
+        <actionGroup ref="changeProductConfigurationsInGrid" stepKey="changeProductConfigurationsInGrid">
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Save configurable product; add product to new attribute set -->
+        <actionGroup ref="saveConfigurableProductWithNewAttributeSet" stepKey="saveConfigurableProduct"/>
+
+        <!-- Find configurable product in grid -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Assert configurable product on admin product page -->
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="assertConfigurableProductOnAdminProductPage" stepKey="assertConfigurableProductOnAdminProductPage">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Flash cache -->
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!--Assert configurable product in category -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="assertConfigurableProductInCategory">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="optionProduct" value="colorConfigurableProductAttribute1"/>
+        </actionGroup>
+
+        <!--Assert configurable product on product page -->
+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="storefrontCheckConfigurableProductOptions" stepKey="checkConfigurableProductOptions">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
new file mode 100644
index 0000000000000..49f3f8b5ea931
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
@@ -0,0 +1,123 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateConfigurableProductWithDisabledChildrenProductsTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Create configurable product with disabled children products"/>
+            <description value="Admin should be able to create configurable product with disabled children products, assigned to category"/>
+            <testCaseId value="MC-13711"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create attribute with one options -->
+            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the child that will be a part of the configurable product -->
+            <createData entity="SimpleProductOffline" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Don't display out of stock product -->
+            <actionGroup ref="noDisplayOutOfStockProduct" stepKey="revertDisplayOutOfStockProduct"/>
+
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="ApiConfigurableProduct"/>
+            </actionGroup>
+
+            <!-- Delete created data -->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create configurable product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Fill configurable product values -->
+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Create product configurations and add attribute and select all options -->
+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="generateConfigurationsByAttributeCode" after="fillConfigurableProductValues">
+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+        </actionGroup>
+
+        <!-- Add configurable product to category -->
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
+
+        <!-- Add child product to configurations grid -->
+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addSimpleProduct">
+            <argument name="sku" value="$$createSimpleProduct.sku$$"/>
+            <argument name="name" value="$$createConfigProductAttributeOption.option[store_labels][1][label]$$"/>
+        </actionGroup>
+
+        <!-- Save configurable product -->
+        <actionGroup ref="saveProductForm" stepKey="saveConfigurableProduct"/>
+
+        <!-- Find configurable product in grid -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Assert configurable product on admin product page -->
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="assertConfigurableProductOnAdminProductPage" stepKey="assertConfigurableProductOnAdminProductPage">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+         <!--Assert configurable attributes block is present on product page -->
+        <scrollTo selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" stepKey="scrollToSearchEngineTab" />
+        <seeElement selector="{{AdminProductFormConfigurationsSection.createdConfigurationsBlock}}" stepKey="seeCreatedConfigurations"/>
+        <see userInput="$$createSimpleProduct.name$$" selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" stepKey="seeProductNameInConfigurations"/>
+
+        <!-- Display out of stock product -->
+        <actionGroup ref="displayOutOfStockProduct" stepKey="displayOutOfStockProduct"/>
+
+        <!-- Flash cache -->
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!-- Assert configurable product is not present in category -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+
+        <!-- Assert configurable product is out of stock-->
+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see stepKey="checkForOutOfStock" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="OUT OF STOCK"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
new file mode 100644
index 0000000000000..925e7a890cead
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
@@ -0,0 +1,159 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateConfigurableProductWithImagesTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Create configurable product with images"/>
+            <description value="Admin should be able to create configurable product with images"/>
+            <testCaseId value="MC-13713"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create first attribute with 2 options -->
+            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createFirstConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOptionOne">
+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOptionTwo">
+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
+            </createData>
+
+            <!-- Create second attribute with 2 options -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createSecondConfigProductAttribute"/>
+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOptionThree">
+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption4" stepKey="createConfigProductAttributeOptionFour">
+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
+            </createData>
+
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createFirstConfigProductAttribute"/>
+                <requiredEntity createDataKey="createSecondConfigProductAttribute"/>
+            </createData>
+
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="ApiConfigurableProduct"/>
+            </actionGroup>
+
+            <!-- Delete created data -->
+            <deleteData createDataKey="createFirstConfigProductAttribute" stepKey="deleteFirstConfigProductAttribute"/>
+            <deleteData createDataKey="createSecondConfigProductAttribute" stepKey="deleteSecondConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create configurable product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Fill configurable product values -->
+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Add configurable product to category -->
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Create product configurations -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="addImageForProduct"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
+
+         <!-- Show 100 attributes per page -->
+        <actionGroup ref="adminDataGridSelectPerPage" stepKey="selectNumberOfAttributesPerPage">
+            <argument name="perPage" value="100"/>
+        </actionGroup>
+
+        <!--Add attributes and select all options -->
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeRowByAttributeCode($$createFirstConfigProductAttribute.attribute_code$$)}}" stepKey="clickOnFirstAttributeCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeRowByAttributeCode($$createSecondConfigProductAttribute.attribute_code$$)}}" stepKey="clickOnSecondAttributeCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute($$createFirstConfigProductAttribute.default_frontend_label$$)}}" stepKey="clickOnSelectAllInFirstAttribute"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute($$createSecondConfigProductAttribute.default_frontend_label$$)}}" stepKey="clickOnSelectAllInSecondAttribute"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+
+        <!-- Add images to first product attribute options -->
+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImageToConfigurableProductOptionOne">
+            <argument name="image" value="MagentoLogo"/>
+            <argument name="frontend_label" value="$$createFirstConfigProductAttribute.default_frontend_label$$"/>
+            <argument name="label" value="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$"/>
+        </actionGroup>
+        <actionGroup ref="addUniqueImageToConfigurableProductOption" stepKey="addImageToConfigurableProductOptionTwo">
+            <argument name="image" value="TestImageNew"/>
+            <argument name="frontend_label" value="$$createFirstConfigProductAttribute.default_frontend_label$$"/>
+            <argument name="label" value="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$"/>
+        </actionGroup>
+
+        <!-- Add price to second product attribute options -->
+        <actionGroup ref="addUniquePriceToConfigurableProductOption" stepKey="addPriceToConfigurableProductOptionThree">
+            <argument name="frontend_label" value="$$createSecondConfigProductAttribute.default_frontend_label$$"/>
+            <argument name="label" value="$$createConfigProductAttributeOptionThree.option[store_labels][1][label]$$"/>
+            <argument name="price" value="{{virtualProductWithRequiredFields.price}}"/>
+        </actionGroup>
+        <actionGroup ref="addUniquePriceToConfigurableProductOption" stepKey="addPriceToConfigurableProductOptionFour">
+            <argument name="frontend_label" value="$$createSecondConfigProductAttribute.default_frontend_label$$"/>
+            <argument name="label" value="$$createConfigProductAttributeOptionFour.option[store_labels][1][label]$$"/>
+            <argument name="price" value="{{virtualProductWithRequiredFields.price}}"/>
+        </actionGroup>
+
+        <!-- Add quantity to product attribute options -->
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="100" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+
+        <!-- Save product -->
+        <actionGroup ref="saveConfigurableProductAddToCurrentAttributeSet" stepKey="saveProduct"/>
+
+        <!-- Assert configurable product in category -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="assertConfigurableProductInCategory">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="optionProduct" value="virtualProductWithRequiredFields"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Assert product options images in storefront product page -->
+        <actionGroup ref="assertOptionImageInStorefrontProductPage" stepKey="assertFirstOptionImageInStorefrontProductPage">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="label" value="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="assertOptionImageInStorefrontProductPage" stepKey="assertSecondOptionImageInStorefrontProductPage">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="label" value="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$"/>
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml
new file mode 100644
index 0000000000000..0b83fdc1788d3
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml
@@ -0,0 +1,140 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Create Configurable Product with three product, display out of stock products"/>
+            <description value="Admin should be able to create Configurable Product with one out of stock and several in stock options, display out of stock products"/>
+            <testCaseId value="MC-13714"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create attribute with 3 options to be used in children products -->
+            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOptionOne">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOptionTwo">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOptionThree">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOptionOne">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOptionTwo">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOptionThree">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the 3 children that will be a part of the configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createFirstSimpleProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOptionOne"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createSecondSimpleProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOptionTwo"/>
+            </createData>
+            <createData entity="ApiSimpleOutOfStock" stepKey="createSimpleOutOfStockProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOptionThree"/>
+            </createData>
+
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Don't display out of stock product -->
+            <actionGroup ref="noDisplayOutOfStockProduct" stepKey="revertDisplayOutOfStockProduct"/>
+
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="ApiConfigurableProduct"/>
+            </actionGroup>
+
+            <!-- Delete created data -->
+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
+            <deleteData createDataKey="createSimpleOutOfStockProduct" stepKey="deleteSimpleOutOfStockProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create configurable product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!--Fill configurable product values -->
+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Create product configurations and add attribute and select all options -->
+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="generateConfigurationsByAttributeCode" after="fillConfigurableProductValues">
+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+        </actionGroup>
+
+        <!-- Add configurable product to category -->
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
+
+        <!-- Add child products to configurations grid -->
+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addFirstSimpleProduct">
+            <argument name="sku" value="$$createFirstSimpleProduct.sku$$"/>
+            <argument name="name" value="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$"/>
+        </actionGroup>
+
+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addSecondSimpleProduct">
+            <argument name="sku" value="$$createSecondSimpleProduct.sku$$"/>
+            <argument name="name" value="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$"/>
+        </actionGroup>
+
+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addOutOfStockProduct">
+            <argument name="sku" value="$$createSimpleOutOfStockProduct.sku$$"/>
+            <argument name="name" value="$$createConfigProductAttributeOptionThree.option[store_labels][1][label]$$"/>
+        </actionGroup>
+
+        <!-- Save configurable product -->
+        <actionGroup ref="saveProductForm" stepKey="saveConfigurableProduct"/>
+
+        <!-- Display out of stock product -->
+        <actionGroup ref="displayOutOfStockProduct" stepKey="displayOutOfStockProduct"/>
+
+        <!-- Flash cache -->
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!--Assert configurable product in category -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="assertConfigurableProductInCategory">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="optionProduct" value="$$createFirstSimpleProduct$$"/>
+        </actionGroup>
+
+        <!-- Assert out of stock option is absent on product page -->
+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <dontSee userInput="$$createConfigProductAttributeOptionThree.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="assertOptionNotAvailable" />
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
new file mode 100644
index 0000000000000..e24ac07c30d1e
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
@@ -0,0 +1,134 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Create Configurable Product with three product, don't display out of stock products"/>
+            <description value="Admin should be able to create Configurable Product with one out of stock and several in stock options, don't display out of stock products"/>
+            <testCaseId value="MC-13715"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create attribute with 3 options to be used in children products -->
+            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOptionOne">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOptionTwo">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOptionThree">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOptionOne">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOptionTwo">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOptionThree">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the 3 children that will be a part of the configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createFirstSimpleProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOptionOne"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createSecondSimpleProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOptionTwo"/>
+            </createData>
+            <createData entity="ApiSimpleOutOfStock" stepKey="createSimpleOutOfStockProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOptionThree"/>
+            </createData>
+
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="ApiConfigurableProduct"/>
+            </actionGroup>
+
+            <!-- Delete created data -->
+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
+            <deleteData createDataKey="createSimpleOutOfStockProduct" stepKey="deleteSimpleOutOfStockProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create configurable product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!--Fill configurable product values -->
+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Create product configurations and add attribute and select all options -->
+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="generateConfigurationsByAttributeCode" after="fillConfigurableProductValues">
+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+        </actionGroup>
+
+        <!-- Add configurable product to category -->
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
+
+        <!-- Add child products to configurations grid -->
+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addFirstSimpleProduct">
+            <argument name="sku" value="$$createFirstSimpleProduct.sku$$"/>
+            <argument name="name" value="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$"/>
+        </actionGroup>
+
+       <actionGroup ref="addProductToConfigurationsGrid" stepKey="addSecondSimpleProduct">
+            <argument name="sku" value="$$createSecondSimpleProduct.sku$$"/>
+            <argument name="name" value="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$"/>
+        </actionGroup>
+
+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addOutOfStockProduct">
+            <argument name="sku" value="$$createSimpleOutOfStockProduct.sku$$"/>
+            <argument name="name" value="$createConfigProductAttributeOptionThree.option[store_labels][1][label]$$"/>
+        </actionGroup>
+
+        <!-- Save configurable product -->
+        <actionGroup ref="saveProductForm" stepKey="saveConfigurableProduct"/>
+
+        <!-- Flash cache -->
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!--Assert configurable product in category -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="assertConfigurableProductInCategory">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="optionProduct" value="$$createFirstSimpleProduct$$"/>
+        </actionGroup>
+
+        <!-- Assert out of stock option is absent on product page -->
+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dontSee userInput="$$createConfigProductAttributeOptionThree.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="assertOptionNotAvailable"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml
new file mode 100644
index 0000000000000..51f4bf0279942
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml
@@ -0,0 +1,111 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateConfigurableProductWithTierPriceForOneItemTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Create configurable product with tier price for one item"/>
+            <description value="Admin should be able to create configurable product with tier price for one item"/>
+            <testCaseId value="MC-13695"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create attribute with 2 options to be used in children products -->
+            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOptionOne">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOptionTwo">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOptionOne">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOptionTwo">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the 2 children that will be a part of the configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createFirstSimpleProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOptionOne"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createSecondSimpleProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOptionTwo"/>
+            </createData>
+
+            <!--Add tier price in one product -->
+            <createData entity="tierProductPrice" stepKey="addTierPrice">
+            <requiredEntity createDataKey="createFirstSimpleProduct" />
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="ApiConfigurableProduct"/>
+            </actionGroup>
+
+            <!-- Delete created data -->
+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create configurable product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitProductGridPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!--Fill configurable product values -->
+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Create product configurations and add attribute and select all options -->
+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="generateConfigurationsByAttributeCode" after="fillConfigurableProductValues">
+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+        </actionGroup>
+
+         <!-- Add associated products to configurations grid -->
+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addFirstSimpleProduct">
+            <argument name="sku" value="$$createFirstSimpleProduct.sku$$"/>
+            <argument name="name" value="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$"/>
+        </actionGroup>
+
+        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addSecondSimpleProduct">
+            <argument name="sku" value="$$createSecondSimpleProduct.sku$$"/>
+            <argument name="name" value="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$"/>
+        </actionGroup>
+
+        <!-- Save configurable product -->
+        <actionGroup ref="saveProductForm" stepKey="saveConfigurableProduct"/>
+
+        <!-- Assert product tier price on product page -->
+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <selectOption userInput="$$createConfigProductAttributeOptionOne.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
+            <expectedResult type="string">Buy {{tierProductPrice.quantity}} for ${{tierProductPrice.price}} each and save 27%</expectedResult>
+            <actualResult type="variable">tierPriceText</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
new file mode 100644
index 0000000000000..1db9b3e5b79b2
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
@@ -0,0 +1,154 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Create configurable product with two new options assigned to category with not visible child products"/>
+            <description value="Admin should be able to create configurable product with two new options, assigned to category, child products are not visible individually"/>
+            <testCaseId value="MC-13685"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create category -->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="ApiConfigurableProduct"/>
+            </actionGroup>
+
+            <!-- Delete children products -->
+            <actionGroup ref="deleteProductBySku" stepKey="deleteFirstChildProduct">
+                <argument name="sku" value="{{colorConfigurableProductAttribute1.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteSecondChildProduct">
+                <argument name="sku" value="{{colorConfigurableProductAttribute2.sku}}"/>
+            </actionGroup>
+
+            <!-- Delete product attribute -->
+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
+                <argument name="ProductAttribute" value="colorProductAttribute"/>
+            </actionGroup>
+
+            <!-- Delete attribute set -->
+            <actionGroup ref="deleteAttributeSetByLabel" stepKey="deleteAttributeSet">
+                <argument name="label" value="{{ProductAttributeFrontendLabel.label}}"/>
+            </actionGroup>
+
+            <!-- Delete category -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create configurable product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Fill configurable product values -->
+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Create product configurations -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="fillConfigurableProductValues"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
+
+        <!--Create new attribute with two options -->
+        <actionGroup ref="addNewProductConfigurationAttribute" stepKey="createProductConfigurationAttribute">
+            <argument name="attribute" value="colorProductAttribute"/>
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Change product configurations in grid -->
+        <actionGroup ref="changeProductConfigurationsInGrid" stepKey="changeProductConfigurationsInGrid">
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Add configurable product to category -->
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
+
+        <!-- Save configurable product; add product to new attribute set -->
+        <actionGroup ref="saveConfigurableProductWithNewAttributeSet" stepKey="saveConfigurableProduct"/>
+
+        <!-- Assert child products in grid -->
+        <actionGroup ref="viewProductInAdminGrid" stepKey="viewFirstChildProductInAdminGrid">
+            <argument name="product" value="colorConfigurableProductAttribute1"/>
+        </actionGroup>
+        <actionGroup ref="viewProductInAdminGrid" stepKey="viewSecondChildProductInAdminGrid">
+            <argument name="product" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Assert configurable product in grid -->
+        <actionGroup ref="filterProductGridBySkuAndName" stepKey="findCreatedConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="{{ApiConfigurableProduct.type_id}}" stepKey="seeProductTypeInGrid"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
+
+        <!-- Flash cache -->
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!--Assert configurable product in category -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="assertConfigurableProductInCategory">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="optionProduct" value="colorConfigurableProductAttribute1"/>
+        </actionGroup>
+
+        <!--Assert configurable product on product page -->
+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage" after="assertConfigurableProductInCategory"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="storefrontCheckConfigurableProductOptions" stepKey="checkConfigurableProductOptions">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Add configurable product to the cart with selected first option -->
+        <selectOption userInput="{{colorConfigurableProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOptionForAddingToCart"/>
+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage"/>
+
+        <!-- Assert configurable product in cart -->
+        <amOnPage url="/checkout/cart/" stepKey="amOnShoppingCartPage"/>
+        <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
+        <actionGroup ref="StorefrontCheckCartConfigurableProductActionGroup" stepKey="storefrontCheckCartConfigurableProductActionGroup">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="optionProduct" value="colorConfigurableProductAttribute1"/>
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+
+        <!-- Assert child products are not displayed separately: two next step -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStoreFront"/>
+        <waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
+
+        <!-- Quick search the storefront for the first attribute option -->
+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute1.sku}}]" stepKey="searchStorefrontFirstChildProduct"/>
+        <dontSee selector="{{StorefrontCategoryProductSection.ProductTitleByName(colorConfigurableProductAttribute1.name)}}" stepKey="dontSeeConfigurableProductFirstChild"/>
+
+        <!-- Quick search the storefront for the second attribute option -->
+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute2.sku}}]" stepKey="searchStorefrontSecondChildProduct"/>
+        <dontSee selector="{{StorefrontCategoryProductSection.ProductTitleByName(colorConfigurableProductAttribute2.name)}}" stepKey="dontSeeConfigurableProductSecondChild"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
new file mode 100644
index 0000000000000..934a410d58a8a
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
@@ -0,0 +1,136 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create configurable product"/>
+            <title value="Create configurable product with two new options without assigned to category with not visible child products"/>
+            <description value="Admin should be able to create configurable product with two options without assigned to category, child products are not visible individually"/>
+            <testCaseId value="MC-13686"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete configurable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="ApiConfigurableProduct"/>
+            </actionGroup>
+
+            <!-- Delete children products -->
+            <actionGroup ref="deleteProductBySku" stepKey="deleteFirstChildProduct">
+                <argument name="sku" value="{{colorConfigurableProductAttribute1.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteSecondChildProduct">
+                <argument name="sku" value="{{colorConfigurableProductAttribute2.sku}}"/>
+            </actionGroup>
+
+            <!-- Delete product attribute -->
+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteProductAttribute">
+                <argument name="ProductAttribute" value="colorProductAttribute"/>
+            </actionGroup>
+
+            <!-- Delete attribute set -->
+            <actionGroup ref="deleteAttributeSetByLabel" stepKey="deleteAttributeSet">
+                <argument name="label" value="{{ProductAttributeFrontendLabel.label}}"/>
+            </actionGroup>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create configurable product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Fill configurable product values -->
+        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+
+        <!--Create product configurations-->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="fillConfigurableProductValues"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
+
+        <!--Create new attribute with two option -->
+        <actionGroup ref="addNewProductConfigurationAttribute" stepKey="createProductConfigurationAttribute">
+            <argument name="attribute" value="colorProductAttribute"/>
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Change product configurations in grid -->
+        <actionGroup ref="changeProductConfigurationsInGrid" stepKey="changeProductConfigurationsInGrid">
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Save configurable product; add product to new attribute set -->
+        <actionGroup ref="saveConfigurableProductWithNewAttributeSet" stepKey="saveConfigurableProduct"/>
+
+        <!-- Assert Child Products in grid -->
+        <actionGroup ref="viewProductInAdminGrid" stepKey="viewFirstChildProductInAdminGrid">
+            <argument name="product" value="colorConfigurableProductAttribute1"/>
+        </actionGroup>
+        <actionGroup ref="viewProductInAdminGrid" stepKey="viewSecondChildProductInAdminGrid">
+            <argument name="product" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Assert Configurable Product in grid -->
+        <actionGroup ref="filterProductGridBySkuAndName" stepKey="findCreatedConfigurableProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="{{ApiConfigurableProduct.type_id}}"  stepKey="seeProductTypeInGrid"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
+
+        <!-- Flash cache -->
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!-- Assert configurable product on product page -->
+        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="storefrontCheckConfigurableProductOptions" stepKey="checkConfigurableProductOptions">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="firstOption" value="colorConfigurableProductAttribute1"/>
+            <argument name="secondOption" value="colorConfigurableProductAttribute2"/>
+        </actionGroup>
+
+        <!-- Add configurable product to the cart with selected first option -->
+        <selectOption userInput="{{colorConfigurableProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOptionForAddingToCart"/>
+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage"/>
+
+        <!-- Assert configurable product in cart -->
+        <amOnPage url="/checkout/cart/" stepKey="amOnShoppingCartPage"/>
+        <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
+        <actionGroup ref="StorefrontCheckCartConfigurableProductActionGroup" stepKey="storefrontCheckCartConfigurableProductActionGroup">
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="optionProduct" value="colorConfigurableProductAttribute1"/>
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+
+        <!-- Assert child products are not displayed separately: two next step -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStoreFront"/>
+        <waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
+
+        <!-- Quick search the storefront for the first attribute option -->
+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute1.sku}}]" stepKey="searchStorefrontFirstChildProduct"/>
+        <dontSee selector="{{StorefrontCategoryProductSection.ProductTitleByName(colorConfigurableProductAttribute1.name)}}" stepKey="dontSeeConfigurableProductFirstChild"/>
+
+        <!-- Quick search the storefront for the second attribute option -->
+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute2.sku}}]" stepKey="searchStorefrontSecondChildProduct"/>
+        <dontSee selector="{{StorefrontCategoryProductSection.ProductTitleByName(colorConfigurableProductAttribute2.name)}}" stepKey="dontSeeConfigurableProductSecondChild"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
index 03e1d1b260ffd..456be43f80b8d 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
@@ -76,7 +76,6 @@
         <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQunatity"/>
         <waitForPageLoad stepKey="waitPageToBeLoaded"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForSuccessMessageLoad"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
         <waitForPageLoad stepKey="waitOrderDetailToLoad"/>
         <fillField selector="{{AdminShipmentItemsSection.itemQtyToShip('1')}}" userInput="1" stepKey="changeItemQtyToShip"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
index 64b9b3776442a..ab52d4eb86021 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
@@ -6,22 +6,47 @@
 
 namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Type\Configurable;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Configuration\Item\Option;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price as ConfigurablePrice;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\PriceInfo\Base as PriceInfoBase;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class PriceTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price */
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
+    /**
+     * @var ConfigurablePrice
+     */
     protected $model;
 
-    /** @var ObjectManagerHelper */
-    protected $objectManagerHelper;
+    /**
+     * @var ManagerInterface|MockObject
+     */
+    private $eventManagerMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
+        $this->eventManagerMock = $this->createPartialMock(
+            ManagerInterface::class,
+            ['dispatch']
+        );
         $this->model = $this->objectManagerHelper->getObject(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price::class
+            ConfigurablePrice::class,
+            ['eventManager' => $this->eventManagerMock]
         );
     }
 
@@ -29,29 +54,29 @@ public function testGetFinalPrice()
     {
         $finalPrice = 10;
         $qty = 1;
-        $configurableProduct = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getCustomOption', 'getPriceInfo', 'setFinalPrice', '__wakeUp'])
-            ->getMock();
-        $customOption = $this->getMockBuilder(\Magento\Catalog\Model\Product\Configuration\Item\Option::class)
+
+        /** @var Product|MockObject $configurableProduct */
+        $configurableProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getProduct'])
+            ->setMethods(['getCustomOption', 'getPriceInfo', 'setFinalPrice'])
             ->getMock();
-        $priceInfo = $this->getMockBuilder(\Magento\Framework\Pricing\PriceInfo\Base::class)
+        /** @var PriceInfoBase|MockObject $priceInfo */
+        $priceInfo = $this->getMockBuilder(PriceInfoBase::class)
             ->disableOriginalConstructor()
             ->setMethods(['getPrice'])
             ->getMock();
-        $price = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class)
+        /** @var PriceInterface|MockObject $price */
+        $price = $this->getMockBuilder(PriceInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $amount = $this->getMockBuilder(\Magento\Framework\Pricing\Amount\AmountInterface::class)
+        /** @var AmountInterface|MockObject $amount */
+        $amount = $this->getMockBuilder(AmountInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $configurableProduct->expects($this->any())
             ->method('getCustomOption')
             ->willReturnMap([['simple_product', false], ['option_ids', false]]);
-        $customOption->expects($this->never())->method('getProduct');
         $configurableProduct->expects($this->once())->method('getPriceInfo')->willReturn($priceInfo);
         $priceInfo->expects($this->once())->method('getPrice')->with('final_price')->willReturn($price);
         $price->expects($this->once())->method('getAmount')->willReturn($amount);
@@ -60,4 +85,60 @@ public function testGetFinalPrice()
 
         $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty, $configurableProduct));
     }
+
+    public function testGetFinalPriceWithSimpleProduct()
+    {
+        $finalPrice = 10;
+        $qty = 1;
+        $customerGroupId = 1;
+
+        /** @var Product|MockObject $configurableProduct */
+        $configurableProduct = $this->createPartialMock(
+            Product::class,
+            ['getCustomOption', 'setFinalPrice', 'getCustomerGroupId']
+        );
+        /** @var Option|MockObject $customOption */
+        $customOption = $this->createPartialMock(
+            Option::class,
+            ['getProduct']
+        );
+        /** @var Product|MockObject $simpleProduct */
+        $simpleProduct = $this->createPartialMock(
+            Product::class,
+            ['setCustomerGroupId', 'setFinalPrice', 'getPrice', 'getTierPrice', 'getData', 'getCustomOption']
+        );
+
+        $configurableProduct->method('getCustomOption')
+            ->willReturnMap([
+                ['simple_product', $customOption],
+                ['option_ids', false]
+            ]);
+        $configurableProduct->method('getCustomerGroupId')->willReturn($customerGroupId);
+        $configurableProduct->expects($this->atLeastOnce())
+            ->method('setFinalPrice')
+            ->with($finalPrice)
+            ->willReturnSelf();
+        $customOption->method('getProduct')->willReturn($simpleProduct);
+        $simpleProduct->expects($this->atLeastOnce())
+            ->method('setCustomerGroupId')
+            ->with($customerGroupId)
+            ->willReturnSelf();
+        $simpleProduct->method('getPrice')->willReturn($finalPrice);
+        $simpleProduct->method('getTierPrice')->with($qty)->willReturn($finalPrice);
+        $simpleProduct->expects($this->atLeastOnce())
+            ->method('setFinalPrice')
+            ->with($finalPrice)
+            ->willReturnSelf();
+        $simpleProduct->method('getData')->with('final_price')->willReturn($finalPrice);
+        $simpleProduct->method('getCustomOption')->with('option_ids')->willReturn(false);
+        $this->eventManagerMock->expects($this->once())
+            ->method('dispatch')
+            ->with('catalog_product_get_final_price', ['product' => $simpleProduct, 'qty' => $qty]);
+
+        $this->assertEquals(
+            $finalPrice,
+            $this->model->getFinalPrice($qty, $configurableProduct),
+            'The final price calculation is wrong'
+        );
+    }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
index fbab25ff1bea6..e0cc83922e03e 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Framework\UrlInterface;
 use Magento\Ui\Component\Container;
-use Magento\Ui\Component\Form;
 use Magento\Ui\Component\DynamicRows;
+use Magento\Ui\Component\Form;
 use Magento\Ui\Component\Modal;
-use Magento\Framework\UrlInterface;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 
 /**
  * Data provider for Configurable panel
@@ -90,7 +90,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -98,7 +98,7 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function modifyMeta(array $meta)
@@ -197,7 +197,7 @@ public function modifyMeta(array $meta)
                                         'autoRender' => false,
                                         'componentType' => 'insertListing',
                                         'component' => 'Magento_ConfigurableProduct/js'
-                                            .'/components/associated-product-insert-listing',
+                                            . '/components/associated-product-insert-listing',
                                         'dataScope' => $this->associatedListingPrefix
                                             . static::ASSOCIATED_PRODUCT_LISTING,
                                         'externalProvider' => $this->associatedListingPrefix
@@ -328,14 +328,12 @@ protected function getButtonSet()
                                 'component' => 'Magento_Ui/js/form/components/button',
                                 'actions' => [
                                     [
-                                        'targetName' =>
-                                            $this->dataScopeName . '.configurableModal',
+                                        'targetName' => $this->dataScopeName . '.configurableModal',
                                         'actionName' => 'trigger',
                                         'params' => ['active', true],
                                     ],
                                     [
-                                        'targetName' =>
-                                            $this->dataScopeName . '.configurableModal',
+                                        'targetName' => $this->dataScopeName . '.configurableModal',
                                         'actionName' => 'openModal',
                                     ],
                                 ],
@@ -471,8 +469,7 @@ protected function getRows()
                         'sku',
                         __('SKU'),
                         [
-                            'validation' =>
-                                [
+                            'validation' => [
                                     'required-entry' => true,
                                     'max_text_length' => Sku::SKU_MAX_LENGTH,
                                 ],
@@ -577,6 +574,7 @@ protected function getColumn(
             'dataType' => Form\Element\DataType\Text::NAME,
             'dataScope' => $name,
             'visibleIfCanEdit' => false,
+            'labelVisible' => false,
             'imports' => [
                 'visible' => '!${$.provider}:${$.parentScope}.canEdit'
             ],
@@ -595,6 +593,7 @@ protected function getColumn(
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => $label,
             'dataScope' => '',
+            'showLabel' => false
         ];
         $container['children'] = [
             $name . '_edit' => $fieldEdit,
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index 06134fcbf09d8..c3ffe988b00d7 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -248,4 +248,11 @@
     <type name="Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector">
         <plugin name="apply_tax_class_id" type="Magento\ConfigurableProduct\Plugin\Tax\Model\Sales\Total\Quote\CommonTaxCollector" />
     </type>
+    <type name="Magento\Eav\Model\Entity\Attribute\Group">
+        <arguments>
+            <argument name="reservedSystemNames" xsi:type="array">
+                <item name="configurable" xsi:type="string">configurable</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
index 6bbab77a3a0ab..b2ef35546eea8 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
@@ -11,9 +11,6 @@ define([
 
     return Abstract.extend({
         defaults: {
-            listens: {
-                isConfigurable: 'handlePriceValue'
-            },
             imports: {
                 isConfigurable: '!ns = ${ $.ns }, index = configurable-matrix:isEmpty'
             },
@@ -22,12 +19,15 @@ define([
             }
         },
 
-        /**
-         * Invokes initialize method of parent class,
-         * contains initialization logic
-         */
+        /** @inheritdoc */
         initialize: function () {
             this._super();
+            // resolve initial disable state
+            this.handlePriceValue(this.isConfigurable);
+            // add listener to track "configurable" type
+            this.setListeners({
+                isConfigurable: 'handlePriceValue'
+            });
 
             return this;
         },
@@ -50,11 +50,10 @@ define([
          * @param {String} isConfigurable
          */
         handlePriceValue: function (isConfigurable) {
+            this.disabled(!!this.isUseDefault() || isConfigurable);
+
             if (isConfigurable) {
-                this.disable();
                 this.clear();
-            } else {
-                this.enable();
             }
         }
     });
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
index 9fda4ec0173ec..12571602878d1 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
@@ -90,14 +90,17 @@ public function __construct(
      */
     public function addParentProduct(Product $product) : void
     {
-        if (isset($this->parentProducts[$product->getId()])) {
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $productId = $product->getData($linkField);
+
+        if (isset($this->parentProducts[$productId])) {
             return;
         }
 
         if (!empty($this->childrenMap)) {
             $this->childrenMap = [];
         }
-        $this->parentProducts[$product->getId()] = $product;
+        $this->parentProducts[$productId] = $product;
     }
 
     /**
@@ -140,16 +143,12 @@ private function fetch() : array
             return $this->childrenMap;
         }
 
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         foreach ($this->parentProducts as $product) {
             $attributeData = $this->getAttributesCodes($product);
             /** @var ChildCollection $childCollection */
             $childCollection = $this->childCollectionFactory->create();
-            $childCollection->addAttributeToSelect($attributeData);
-
-            /** @var Product $product */
-            $product->setData($linkField, $product->getId());
             $childCollection->setProductFilter($product);
+            $childCollection->addAttributeToSelect($attributeData);
 
             /** @var Product $childProduct */
             foreach ($childCollection->getItems() as $childProduct) {
diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index de6767a0ef92a..963efc648d94b 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -1,9 +1,10 @@
 <?php
-declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Block\Address;
 
 use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
@@ -236,8 +237,12 @@ private function getAddressCollection(): \Magento\Customer\Model\ResourceModel\A
             }
             /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
             $collection = $this->addressCollectionFactory->create();
-            $collection->setOrder('entity_id', 'desc')
-                ->setCustomerFilter([$this->getCustomer()->getId()]);
+            $collection->setOrder('entity_id', 'desc');
+            $collection->addFieldToFilter(
+                'entity_id',
+                ['nin' => [$this->getDefaultBilling(), $this->getDefaultShipping()]]
+            );
+            $collection->setCustomerFilter([$this->getCustomer()->getId()]);
             $this->addressCollection = $collection;
         }
         return $this->addressCollection;
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
index f2b8133e352ad..2fb59ec767e8a 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
@@ -63,7 +63,8 @@ protected function _construct()
     {
         parent::_construct();
         $this->setId('customer_orders_grid');
-        $this->setDefaultSort('created_at', 'desc');
+        $this->setDefaultSort('created_at');
+        $this->setDefaultDir('desc');
         $this->setUseAjax(true);
     }
 
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
index 1bc6bb1da3680..e63c00ba18d29 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
@@ -77,7 +77,8 @@ protected function _construct()
     {
         parent::_construct();
         $this->setId('customer_view_cart_grid');
-        $this->setDefaultSort('added_at', 'desc');
+        $this->setDefaultSort('added_at');
+        $this->setDefaultDir('desc');
         $this->setSortable(false);
         $this->setPagerVisibility(false);
         $this->setFilterVisibility(false);
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index 322dd2cbfe915..59966768a2eda 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -86,17 +86,6 @@ public function getConfig($path)
         return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
-    /**
-     * Prepare layout
-     *
-     * @return $this
-     */
-    protected function _prepareLayout()
-    {
-        $this->pageConfig->getTitle()->set(__('Create New Customer Account'));
-        return parent::_prepareLayout();
-    }
-
     /**
      * Retrieve form posting url
      *
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
index 380b8a4d3446f..b1602e8ca1939 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model\Attribute\Data;
 
 use Magento\Directory\Helper\Data as DirectoryHelper;
@@ -13,7 +14,8 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface as MagentoTimezone;
 
 /**
- * Customer Address Postal/Zip Code Attribute Data Model
+ * Customer Address Postal/Zip Code Attribute Data Model.
+ *
  * This Data Model Has to Be Set Up in additional EAV attribute table
  */
 class Postcode extends \Magento\Eav\Model\Attribute\Data\AbstractData
@@ -40,7 +42,8 @@ public function __construct(
     }
 
     /**
-     * Validate postal/zip code
+     * Validate postal/zip code.
+     *
      * Return true and skip validation if country zip code is optional
      *
      * @param array|string $value
@@ -104,7 +107,7 @@ public function restoreValue($value)
     }
 
     /**
-     * Return formated attribute value from entity model
+     * Return formatted attribute value from entity model
      *
      * @param string $format
      * @return string|array
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index 9caa2988c5a94..4f129f05aa82c 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -14,6 +14,7 @@
  *
  * @package Magento\Customer\Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Visitor extends \Magento\Framework\Model\AbstractModel
 {
@@ -168,10 +169,6 @@ public function initByRequest($observer)
 
         $this->setLastVisitAt((new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT));
 
-        // prevent saving Visitor for safe methods, e.g. GET request
-        if ($this->requestSafety->isSafeMethod()) {
-            return $this;
-        }
         if (!$this->getId()) {
             $this->setSessionId($this->session->getSessionId());
             $this->save();
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertAddressInCustomersAddressGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertAddressInCustomersAddressGridActionGroup.xml
new file mode 100644
index 0000000000000..53dba774d6c43
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertAddressInCustomersAddressGridActionGroup.xml
@@ -0,0 +1,18 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Assert customer info in customers grid row -->
+    <actionGroup name="AdminAssertAddressInCustomersAddressGrid">
+        <arguments>
+            <argument name="text" type="string"/>
+        </arguments>
+        <see selector="{{AdminCustomerAddressesGridSection.rowsInGrid}}" userInput="{{text}}"  stepKey="seeTextInGrid"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerAccountInformationActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerAccountInformationActionGroup.xml
new file mode 100644
index 0000000000000..a908d042fcc59
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerAccountInformationActionGroup.xml
@@ -0,0 +1,22 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Assert Customer Account Information -->
+    <actionGroup name="AdminAssertCustomerAccountInformation" >
+        <arguments>
+            <argument name="firstName" type="string" defaultValue=""/>
+            <argument name="lastName" type="string" defaultValue=""/>
+            <argument name="email" type="string" defaultValue=""/>
+        </arguments>
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" stepKey="proceedToAccountInformation"/>
+        <seeInField userInput="{{firstName}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="firstName"/>
+        <seeInField userInput="{{lastName}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="lastName"/>
+        <seeInField userInput="{{email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="email"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultBillingAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultBillingAddressActionGroup.xml
new file mode 100644
index 0000000000000..32b624706102f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultBillingAddressActionGroup.xml
@@ -0,0 +1,30 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Assert Customer Default Billing Address -->
+    <actionGroup name="AdminAssertCustomerDefaultBillingAddress" >
+        <arguments>
+            <argument name="firstName" type="string" defaultValue=""/>
+            <argument name="lastName" type="string" defaultValue=""/>
+            <argument name="street1" type="string" defaultValue=""/>
+            <argument name="state" type="string" defaultValue=""/>
+            <argument name="postcode" type="string" defaultValue=""/>
+            <argument name="country" type="string" defaultValue=""/>
+            <argument name="telephone" type="string" defaultValue=""/>
+        </arguments>
+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
+        <see userInput="{{firstName}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="firstName"/>
+        <see userInput="{{lastName}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="lastName"/>
+        <see userInput="{{street1}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="street1"/>
+        <see userInput="{{state}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="state"/>
+        <see userInput="{{postcode}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="postcode"/>
+        <see userInput="{{country}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="country"/>
+        <see userInput="{{telephone}}" selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" stepKey="telephone"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultShippingAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultShippingAddressActionGroup.xml
new file mode 100644
index 0000000000000..9d7c209121fd6
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerDefaultShippingAddressActionGroup.xml
@@ -0,0 +1,30 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Assert Customer Default Shipping Address -->
+    <actionGroup name="AdminAssertCustomerDefaultShippingAddress" >
+        <arguments>
+            <argument name="firstName" type="string" defaultValue=""/>
+            <argument name="lastName" type="string" defaultValue=""/>
+            <argument name="street1" type="string" defaultValue=""/>
+            <argument name="state" type="string" defaultValue="" />
+            <argument name="postcode" type="string" defaultValue=""/>
+            <argument name="country" type="string" defaultValue=""/>
+            <argument name="telephone" type="string" defaultValue=""/>
+        </arguments>
+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
+        <see userInput="{{firstName}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="firstName"/>
+        <see userInput="{{lastName}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="lastName"/>
+        <see userInput="{{street1}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="street1"/>
+        <see userInput="{{state}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="state"/>
+        <see userInput="{{postcode}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="postcode"/>
+        <see userInput="{{country}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="country"/>
+        <see userInput="{{telephone}}" selector="{{AdminCustomerAddressesDefaultShippingSection.addressDetails}}" stepKey="telephone"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersGridActionGroup.xml
new file mode 100644
index 0000000000000..d7529b3bdd58e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersGridActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Assert customer info in customers grid row -->
+    <actionGroup name="AdminAssertCustomerInCustomersGrid">
+        <arguments>
+            <argument name="text" type="string"/>
+            <argument name="row" type="string"/>
+        </arguments>
+        <see selector="{{AdminCustomerGridSection.gridRow(row)}}" userInput="{{text}}"  stepKey="seeCustomerInGrid"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultBillingAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultBillingAddressActionGroup.xml
new file mode 100644
index 0000000000000..5557025c4b1de
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultBillingAddressActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Assert Customer Have No Default Billing Address -->
+    <actionGroup name="AdminAssertCustomerNoDefaultBillingAddress" >
+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
+        <see userInput="The customer does not have default billing address" selector="{{AdminCustomerAddressesDefaultBillingSection.address}}" stepKey="see"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultShippingAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultShippingAddressActionGroup.xml
new file mode 100644
index 0000000000000..e33ebbb96ee19
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerNoDefaultShippingAddressActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Assert Customer Have No Default Shipping Address -->
+    <actionGroup name="AdminAssertCustomerNoDefaultShippingAddress" >
+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
+        <see userInput="The customer does not have default shipping address" selector="{{AdminCustomerAddressesDefaultShippingSection.address}}" stepKey="see"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInCustomersAddressGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInCustomersAddressGridActionGroup.xml
new file mode 100644
index 0000000000000..390f723d91f17
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInCustomersAddressGridActionGroup.xml
@@ -0,0 +1,18 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Assert number of records in customer address grid -->
+    <actionGroup name="AdminAssertNumberOfRecordsInCustomersAddressGrid">
+        <arguments>
+            <argument name="number" type="string"/>
+        </arguments>
+        <see userInput="{{number}} records found" selector="{{AdminCustomerAddressesGridActionsSection.headerRow}}" stepKey="seeRecords"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerGridActionGroup.xml
new file mode 100644
index 0000000000000..86039056999b0
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerGridActionGroup.xml
@@ -0,0 +1,23 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFilterCustomerByEmail">
+        <arguments>
+            <argument name="email" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomerIndexPage"/>
+        <waitForPageLoad stepKey="waitToCustomerIndexPageToLoad"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerIndexPage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
+        <fillField userInput="{{email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
+        <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerSaveAndContinueActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerSaveAndContinueActionGroup.xml
new file mode 100644
index 0000000000000..03b950a6dbe6f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerSaveAndContinueActionGroup.xml
@@ -0,0 +1,14 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Save Customer and Assert Success Message -->
+    <actionGroup name="AdminCustomerSaveAndContinue" >
+        <click selector="{{AdminCustomerMainActionsSection.saveAndContinue}}" stepKey="saveAndContinue"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteAddressInCustomersAddressGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteAddressInCustomersAddressGridActionGroup.xml
new file mode 100644
index 0000000000000..b61b353714e19
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteAddressInCustomersAddressGridActionGroup.xml
@@ -0,0 +1,22 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Delete customer address from grid row, row starts at 0 -->
+    <actionGroup name="AdminDeleteAddressInCustomersAddressGrid">
+        <arguments>
+            <argument name="row" type="string"/>
+        </arguments>
+        <click selector="{{AdminCustomerAddressesGridSection.checkboxByRow(row)}}" stepKey="clickRowCustomerAddressCheckbox"/>
+        <click selector="{{AdminCustomerAddressesGridSection.selectLinkByRow(row)}}" stepKey="openActionsDropdown"/>
+        <click selector="{{AdminCustomerAddressesGridSection.deleteLinkByRow(row)}}" stepKey="chooseDeleteOption"/>
+        <waitForPageLoad stepKey="waitForCustomerAddressesGridPageLoad"/>
+        <click selector="{{AdminCustomerAddressesGridActionsSection.ok}}" stepKey="clickOkOnPopup"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressNoZipNoStateActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressNoZipNoStateActionGroup.xml
new file mode 100644
index 0000000000000..954b83bead1d3
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressNoZipNoStateActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminEditCustomerAddressNoZipNoState" extends="AdminEditCustomerAddressesFrom">
+        <remove keyForRemoval="selectState"/>
+        <remove keyForRemoval="fillZipCode"/>
+        <click selector="{{AdminEditCustomerAddressesSection.defaultBillingAddressButton}}" stepKey="setDefaultBilling" before="setDefaultShipping"/>
+        <click selector="{{AdminEditCustomerAddressesSection.defaultShippingAddressButton}}" stepKey="setDefaultShipping" before="fillPrefixName"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressSetDefaultShippingAndBillingActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressSetDefaultShippingAndBillingActionGroup.xml
new file mode 100644
index 0000000000000..0c1af1cb5b67c
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressSetDefaultShippingAndBillingActionGroup.xml
@@ -0,0 +1,14 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminEditCustomerAddressSetDefaultShippingAndBilling" extends="AdminEditCustomerAddressesFrom">
+        <click selector="{{AdminEditCustomerAddressesSection.defaultBillingAddressButton}}" stepKey="setDefaultBilling" before="setDefaultShipping"/>
+        <click selector="{{AdminEditCustomerAddressesSection.defaultShippingAddressButton}}" stepKey="setDefaultShipping" before="fillPrefixName"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressesFromActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressesFromActionGroup.xml
new file mode 100644
index 0000000000000..594337c1a6922
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressesFromActionGroup.xml
@@ -0,0 +1,42 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Same as "EditCustomerAddressesFromAdminActionGroup" but taking country and state from input "customerAddress" -->
+    <actionGroup name="AdminEditCustomerAddressesFrom" >
+        <arguments>
+            <argument name="customerAddress" type="entity"/>
+        </arguments>
+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="addNewAddresses"/>
+        <waitForPageLoad time="60" stepKey="wait5678" />
+        <fillField  stepKey="fillPrefixName" userInput="{{customerAddress.prefix}}" selector="{{AdminEditCustomerAddressesSection.prefixName}}"/>
+        <fillField  stepKey="fillMiddleName" userInput="{{customerAddress.middlename}}" selector="{{AdminEditCustomerAddressesSection.middleName}}"/>
+        <fillField  stepKey="fillSuffixName" userInput="{{customerAddress.suffix}}" selector="{{AdminEditCustomerAddressesSection.suffixName}}"/>
+        <fillField  stepKey="fillCompany" userInput="{{customerAddress.company}}" selector="{{AdminEditCustomerAddressesSection.company}}"/>
+        <fillField  stepKey="fillStreetAddress" userInput="{{customerAddress.street[0]}}" selector="{{AdminEditCustomerAddressesSection.streetAddress}}"/>
+        <fillField  stepKey="fillCity" userInput="{{customerAddress.city}}" selector="{{AdminEditCustomerAddressesSection.city}}"/>
+        <selectOption stepKey="selectCountry" selector="{{AdminEditCustomerAddressesSection.country}}" userInput="{{customerAddress.country_id}}"/>
+        <selectOption stepKey="selectState" selector="{{AdminEditCustomerAddressesSection.state}}" userInput="{{customerAddress.state}}"/>
+        <fillField  stepKey="fillZipCode" userInput="{{customerAddress.postcode}}" selector="{{AdminEditCustomerAddressesSection.zipCode}}"/>
+        <fillField  stepKey="fillPhone" userInput="{{customerAddress.telephone}}" selector="{{AdminEditCustomerAddressesSection.phone}}"/>
+        <fillField  stepKey="fillVAT" userInput="{{customerAddress.vat_id}}" selector="{{AdminEditCustomerAddressesSection.vat}}"/>
+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="saveAddress"/>
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+    </actionGroup>
+    <actionGroup name="AdminEditCustomerAddressSetDefaultShippingAndBilling" extends="AdminEditCustomerAddressesFrom">
+        <click selector="{{AdminEditCustomerAddressesSection.defaultBillingAddressButton}}" stepKey="setDefaultBilling" before="setDefaultShipping"/>
+        <click selector="{{AdminEditCustomerAddressesSection.defaultShippingAddressButton}}" stepKey="setDefaultShipping" before="fillPrefixName"/>
+    </actionGroup>
+    <actionGroup name="AdminEditCustomerAddressNoZipNoState" extends="AdminEditCustomerAddressesFrom">
+        <remove keyForRemoval="selectState"/>
+        <remove keyForRemoval="fillZipCode"/>
+        <click selector="{{AdminEditCustomerAddressesSection.defaultBillingAddressButton}}" stepKey="setDefaultBilling" before="setDefaultShipping"/>
+        <click selector="{{AdminEditCustomerAddressesSection.defaultShippingAddressButton}}" stepKey="setDefaultShipping" before="fillPrefixName"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerInformationFromActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerInformationFromActionGroup.xml
new file mode 100644
index 0000000000000..ddeefeb3c3742
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerInformationFromActionGroup.xml
@@ -0,0 +1,28 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Edit Customer Account Information Required Fields in Admin -->
+    <actionGroup name="AdminEditCustomerAccountInformationActionGroup" >
+        <arguments>
+            <argument name="firstName" type="string"/>
+            <argument name="lastName" type="string"/>
+            <argument name="email" type="string"/>
+        </arguments>
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" stepKey="goToAccountInformation"/>
+        <clearField stepKey="clearFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}"/>
+        <fillField  stepKey="fillFirstName" userInput="{{firstName}}" selector="{{AdminCustomerAccountInformationSection.firstName}}"/>
+        <clearField stepKey="clearLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}"/>
+        <fillField  stepKey="fillLastName" userInput="{{lastName}}" selector="{{AdminCustomerAccountInformationSection.lastName}}"/>
+        <clearField stepKey="clearEmail" selector="{{AdminCustomerAccountInformationSection.email}}"/>
+        <fillField  stepKey="fillEmail" userInput="{{email}}" selector="{{AdminCustomerAccountInformationSection.email}}"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveAndContinue}}" stepKey="saveAndContinue"/>
+        <waitForPageLoad stepKey="wait"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerAddressGridByPhoneNumberActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerAddressGridByPhoneNumberActionGroup.xml
new file mode 100644
index 0000000000000..2d0d44a4cc529
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerAddressGridByPhoneNumberActionGroup.xml
@@ -0,0 +1,21 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Filter customer address grid by phone number -->
+    <actionGroup name="AdminFilterCustomerAddressGridByPhoneNumber">
+        <arguments>
+            <argument name="phone" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminCustomerAddressFiltersSection.filtersButton}}" stepKey="openFilters"/>
+        <fillField selector="{{AdminCustomerAddressFiltersSection.telephoneInput}}" userInput="{{phone}}" stepKey="fill"/>
+        <click selector="{{AdminCustomerAddressFiltersSection.applyFilter}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGridByEmailActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGridByEmailActionGroup.xml
new file mode 100644
index 0000000000000..9cab8a790ff58
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGridByEmailActionGroup.xml
@@ -0,0 +1,21 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Filter customer grid by the email -->
+    <actionGroup name="AdminFilterCustomerGridByEmail">
+        <arguments>
+            <argument name="email" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminCustomerFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilters"/>
+        <fillField selector="{{AdminCustomerFiltersSection.emailInput}}" userInput="{{email}}" stepKey="fillEmail"/>
+        <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerAddressGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerAddressGridActionGroup.xml
new file mode 100644
index 0000000000000..135f010784199
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerAddressGridActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Reset customers grid filter and to default view -->
+    <actionGroup name="AdminResetFilterInCustomerAddressGrid">
+        <conditionalClick selector="{{AdminCustomerAddressFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerAddressFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminCustomerAddressFiltersSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
+        <click selector="{{AdminCustomerAddressFiltersSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
+        <waitForPageLoad stepKey="waitForGridLoad"/>
+        <see selector="{{AdminCustomerFiltersSection.viewDropdown}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerGridActionGroup.xml
new file mode 100644
index 0000000000000..5c6ff347d565a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminResetFilterInCustomerGridActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Reset customers grid filter and to default view -->
+    <actionGroup name="AdminResetFilterInCustomerGrid">
+        <conditionalClick selector="{{AdminCustomerFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminCustomerFiltersSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
+        <click selector="{{AdminCustomerFiltersSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
+        <waitForPageLoad stepKey="waitForGridLoad"/>
+        <see selector="{{AdminCustomerFiltersSection.viewDropdown}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAndAssertSuccessMessageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAndAssertSuccessMessageActionGroup.xml
new file mode 100644
index 0000000000000..d3907e96b0d77
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAndAssertSuccessMessageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Save Customer and Assert Success Message -->
+    <actionGroup name="AdminSaveCustomerAndAssertSuccessMessage" >
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+        <see userInput="You saved the customer" selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="seeMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerAccountPageTitleActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerAccountPageTitleActionGroup.xml
new file mode 100644
index 0000000000000..132b5ca81886f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerAccountPageTitleActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertCustomerAccountPageTitleActionGroup">
+        <arguments>
+            <argument name="pageTitle" type="string" />
+        </arguments>
+        <see selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="{{pageTitle}}" stepKey="assertPageTitle" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
index 7be36ffbd9bc4..703b9f542f81a 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
@@ -11,9 +11,12 @@
         <arguments>
             <argument name="Customer"/>
         </arguments>
-        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <fillField  stepKey="fillEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <waitForPageLoad time="30" stepKey="waitPageFullyLoaded"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="waitFormAppears"/>
+        <fillField userInput="{{Customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
+        <fillField userInput="{{Customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <waitForPageLoad stepKey="waitForCustomerLoggedIn" />
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontWithEmailAndPasswordActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontWithEmailAndPasswordActionGroup.xml
index 33852fcf80864..071450001051e 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontWithEmailAndPasswordActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontWithEmailAndPasswordActionGroup.xml
@@ -13,6 +13,7 @@
             <argument name="password" type="string"/>
         </arguments>
         <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
+        <waitForPageLoad stepKey="wait"/>
         <fillField  stepKey="fillEmail" userInput="{{email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
         <fillField  stepKey="fillPassword" userInput="{{password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
         <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateThroughCustomerTabsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateThroughCustomerTabsActionGroup.xml
new file mode 100644
index 0000000000000..5591bee529690
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateThroughCustomerTabsActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="NavigateThroughCustomerTabsActionGroup">
+        <arguments>
+            <argument name="navigationItemName" type="string" />
+        </arguments>
+        <click selector="{{StorefrontCustomerSidebarSection.sidebarTab(navigationItemName)}}" stepKey="clickOnDesiredNavItem" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
index af918e8208566..208f4f51e38e6 100755
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -12,13 +12,14 @@
             <argument name="customer"/>
         </arguments>
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
         <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
         <fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
         <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
         <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEdit"/>
-        <waitForPageLoad stepKey="waitForPageLoad2" />
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
     </actionGroup>
     <actionGroup name="OpenEditCustomerAddressFromAdminActionGroup">
         <arguments>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenMyAccountPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenMyAccountPageActionGroup.xml
new file mode 100644
index 0000000000000..6ca0f612deeaa
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenMyAccountPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="OpenMyAccountPageActionGroup">
+        <click selector="{{LoggedInCustomerHeaderLinksSection.customerDropdownMenu}}" stepKey="openCustomerDropdownMenu"/>
+        <click selector="{{LoggedInCustomerHeaderLinksSection.myAccount}}" stepKey="clickOnMyAccount"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertSuccessLoginToStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertSuccessLoginToStorefrontActionGroup.xml
new file mode 100644
index 0000000000000..475702ad69221
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertSuccessLoginToStorefrontActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertSuccessLoginToStorefront" extends="LoginToStorefrontActionGroup">
+        <arguments>
+            <argument name="Customer" type="entity"/>
+        </arguments>
+        <see stepKey="assertWelcome" userInput="{{Customer.firstname}}" selector="{{StorefrontPanelHeaderSection.customerWelcome}}" after="clickSignInAccountButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookContainsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookContainsActionGroup.xml
new file mode 100644
index 0000000000000..8385dc17ecf98
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookContainsActionGroup.xml
@@ -0,0 +1,18 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Go to Address Book -->
+    <actionGroup name="StorefrontCustomerAddressBookContains">
+        <arguments>
+            <argument name="text" type="string"/>
+        </arguments>
+        <see userInput="{{text}}" selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="containsText"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNotContainsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNotContainsActionGroup.xml
new file mode 100644
index 0000000000000..afef2d9a04e34
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNotContainsActionGroup.xml
@@ -0,0 +1,18 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Go to Address Book -->
+    <actionGroup name="StorefrontCustomerAddressBookNotContains">
+        <arguments>
+            <argument name="text" type="string"/>
+        </arguments>
+        <dontSee userInput="{{text}}" selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="doesNotContainsText"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNumberOfAddressesActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNumberOfAddressesActionGroup.xml
new file mode 100644
index 0000000000000..febc482d62e8b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAddressBookNumberOfAddressesActionGroup.xml
@@ -0,0 +1,18 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Go to Address Book -->
+    <actionGroup name="StorefrontCustomerAddressBookNumberOfAddresses">
+        <arguments>
+            <argument name="number" type="string"/>
+        </arguments>
+        <see userInput="{{number}} Item" selector="{{StorefrontCustomerAddressesSection.numberOfAddresses}}" stepKey="checkNumberOfAddresses"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerGoToSidebarMenuActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerGoToSidebarMenuActionGroup.xml
new file mode 100644
index 0000000000000..84d2f353b51d2
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerGoToSidebarMenuActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Go to Address Book -->
+    <actionGroup name="StorefrontCustomerGoToSidebarMenu">
+        <arguments>
+            <argument name="menu" type="string"/>
+        </arguments>
+        <click selector="{{StorefrontCustomerSidebarSection.sidebarTab(menu)}}" stepKey="goToAddressBook"/>
+        <waitForPageLoad stepKey="waitForPageLoad" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index e456ddbec5d4d..5d1a900167144 100755
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -191,6 +191,23 @@
         <data key="default_billing">true</data>
         <data key="default_shipping">false</data>
     </entity>
+    <entity name="addressNoZipNoState" type="address">
+        <data key="country_id">United Kingdom</data>
+        <array key="street">
+            <item>3962 Horner Street</item>
+        </array>
+        <data key="company">Magento</data>
+        <data key="telephone">334-200-4061</data>
+        <data key="city">London</data>
+        <data key="firstname">Fn</data>
+        <data key="lastname">Ln</data>
+        <data key="middlename">Mn</data>
+        <data key="prefix">Mr</data>
+        <data key="suffix">Sr</data>
+        <data key="vat_id">U1234567891</data>
+        <data key="default_shipping">true</data>
+        <data key="default_billing">true</data>
+    </entity>
     <entity name="updateCustomerUKAddress" type="address">
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>
@@ -237,4 +254,21 @@
         <data key="state">Colorado</data>
         <data key="postcode">12345</data>
     </entity>
-</entities>
\ No newline at end of file
+    <entity name="PolandAddress" type="address">
+        <data key="firstname">Mag</data>
+        <data key="lastname">Ento</data>
+        <data key="company">Magento</data>
+        <array key="street">
+            <item>Piwowarska 6</item>
+        </array>
+        <data key="city">Bielsko-Biała</data>
+        <data key="state"> Bielsko</data>
+        <data key="country_id">PL</data>
+        <data key="country">Poland</data>
+        <data key="postcode">43-310</data>
+        <data key="telephone">799885616</data>
+        <data key="default_billing">Yes</data>
+        <data key="default_shipping">Yes</data>
+        <requiredEntity type="region">RegionUT</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index 54644819e852b..06c23a2864984 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -46,6 +46,19 @@
         <data key="website_id">0</data>
         <requiredEntity type="address">US_Address_TX</requiredEntity>
     </entity>
+    <entity name="Simple_US_Customer_Incorrect_Name" type="customer">
+        <data key="group_id">1</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">LoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsum</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_TX</requiredEntity>
+    </entity>
     <entity name="Simple_Customer_Without_Address" type="customer">
         <data key="group_id">1</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>
@@ -190,4 +203,4 @@
         <data key="store_id">0</data>
         <data key="website_id">0</data>
     </entity>
-</entities>
\ No newline at end of file
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
index 6b4f3fc9d6b6e..28305d37cf77b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
@@ -8,6 +8,12 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="NotLoggedInCustomerGroup" type="customerGroup">
+        <data key="id">0</data>
+        <data key="code">NOT LOGGED IN</data>
+        <data key="tax_class_id">3</data>
+        <data key="tax_class_name">Retail Customer</data>
+    </entity>
     <entity name="GeneralCustomerGroup" type="customerGroup">
         <data key="code">General</data>
         <data key="tax_class_id">3</data>
@@ -23,4 +29,9 @@
             <item>General</item>
         </array>
     </entity>
+    <entity name="CustomCustomerGroup" type="customerGroup">
+        <data key="code" unique="suffix">Group </data>
+        <data key="tax_class_id">3</data>
+        <data key="tax_class_name">Retail Customer</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_group-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_group-meta.xml
new file mode 100644
index 0000000000000..3139ea278a0dd
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_group-meta.xml
@@ -0,0 +1,22 @@
+<?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="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateCustomerGroup" dataType="customerGroup" type="create" auth="adminOauth" url="/V1/customerGroups" method="POST">
+        <contentType>application/json</contentType>
+        <object dataType="customerGroup" key="group">
+            <field key="code">string</field>
+            <field key="tax_class_id">integer</field>
+            <field key="tax_class_name">string</field>
+        </object>
+    </operation>
+    <operation name="DeleteCustomerGroup" dataType="customerGroup" type="delete" auth="adminOauth" url="/V1/customerGroups/{id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
index 6a3687bb77c8f..71e3e673477d2 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerAccountInformationSection">
-        <element name="accountInformationTab" type="button" selector="#tab_customer"/>
+        <element name="accountInformationTab" type="button" selector="#tab_customer" timeout="30"/>
         <element name="statusInactive" type="button" selector=".admin__actions-switch-label"/>
         <element name="accountInformationTitle" type="text" selector=".admin__page-nav-title"/>
         <element name="accountInformationButton" type="text" selector="//a/span[text()='Account Information']"/>
@@ -18,10 +18,18 @@
         <element name="lastName" type="input" selector="input[name='customer[lastname]']"/>
         <element name="email" type="input" selector="input[name='customer[email]']"/>
         <element name="group" type="select" selector="[name='customer[group_id]']"/>
+        <element name="groupIdValue" type="text" selector="//*[@name='customer[group_id]']/option"/>
         <element name="groupValue" type="button" selector="//span[text()='{{groupValue}}']" parameterized="true"/>
         <element name="associateToWebsite" type="select" selector="//select[@name='customer[website_id]']"/>
         <element name="saveCustomer" type="button" selector="//button[@title='Save Customer']"/>
         <element name="saveCustomerAndContinueEdit" type="button" selector="//button[@title='Save and Continue Edit']"/>
         <element name="storeView" type="select" selector="//select[@name='customer[sendemail_store_id]']"/>
+        <element name="namePrefix" type="input" selector="//input[contains(@name, 'customer[prefix]')]"/>
+        <element name="nameSuffix" type="input" selector="//input[contains(@name, 'customer[suffix]')]"/>
+        <element name="dateOfBirth" type="input" selector="//input[contains(@name, 'customer[dob]')]"/>
+        <element name="gender" type="select" selector="//select[contains(@name, 'customer[gender]')]"/>
+        <element name="firstNameRequiredMessage" type="text" selector="//input[@name='customer[firstname]']/../label[contains(.,'This is a required field.')]"/>
+        <element name="lastNameRequiredMessage" type="text" selector="//input[@name='customer[lastname]']/../label[contains(.,'This is a required field.')]"/>
+        <element name="emailRequiredMessage" type="text" selector="//input[@name='customer[email]']/../label[contains(.,'This is a required field.')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml
index b9a3839ff9894..f3df6cc5e8c00 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml
@@ -20,5 +20,7 @@
         <element name="telephoneInput" type="input" selector="input[name=telephone]"/>
         <element name="applyFilter" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
         <element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear" timeout="30"/>
+        <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
+        <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml
index fb153a7c102a5..e639fca834b2b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridSection.xml
@@ -12,6 +12,5 @@
         <element name="customerGrid" type="text" selector="table[data-role='grid']"/>
         <element name="firstRowSelectActionLink" type="text" selector="tr[data-repeat-index='0'] .action-select" timeout="30"/>
         <element name="firstRowEditActionLink" type="text" selector="tr[data-repeat-index='0'] [data-action='item-edit']" timeout="30"/>
-
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml
index d8d93814333ca..e743c4af66d9f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml
@@ -12,9 +12,10 @@
         <element name="spinner" type="button" selector=".spinner"/>
         <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
         <element name="search" type="input" selector="#fulltext"/>
-        <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
+        <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']" timeout="30"/>
         <element name="actions" type="text" selector="//div[@class='admin__data-grid-header']//button[@class='action-select']"/>
         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
-        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']" timeout="30"/>
+        <element name="headerRow" type="text" selector=".admin__data-grid-header-row.row.row-gutter"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridSection.xml
index 85c086d01848b..5393d6c1ab9b9 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridSection.xml
@@ -19,5 +19,8 @@
         <element name="secondRowCheckbox" type="checkbox" selector="//tr[contains(@data-repeat-index, '1')]//input[contains(@data-action, 'select-row')]"/>
         <element name="checkboxByName" type="checkbox" selector="//div[contains(text(),'{{customer}}')]/ancestor::tr[contains(@class, 'data-row')]//input[@class='admin__control-checkbox']" parameterized="true" />
         <element name="rowsInGrid" type="text" selector="//tr[contains(@class,'data-row')]"/>
+        <element name="checkboxByRow" type="checkbox" selector="//tr[contains(@data-repeat-index, '{{row}}')]//input[contains(@data-action, 'select-row')]" parameterized="true"/>
+        <element name="selectLinkByRow" type="text" selector="//tr[contains(@data-repeat-index, '{{row}}')]//button[@class='action-select']" parameterized="true"/>
+        <element name="deleteLinkByRow" type="text" selector="//tr[contains(@data-repeat-index, '{{row}}')]//a[contains(@data-action,'item-delete')]" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
index 8068f94032730..26df107708c47 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
@@ -30,5 +30,10 @@
         <element name="customerAddressRow" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true"/>
         <element name="deleteButton" type="button" selector="//button[@id='delete']"/>
         <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
+        <element name="streetRequiredMessage" type="text" selector="//input[@name='street[0]']/../label[contains(.,'This is a required field.')]"/>
+        <element name="cityRequiredMessage" type="text" selector="//input[@name='city']/../label[contains(.,'This is a required field.')]"/>
+        <element name="countryRequiredMessage" type="text" selector="//select[@name='country_id']/../label[contains(.,'This is a required field.')]"/>
+        <element name="postcodeRequiredMessage" type="text" selector="//input[@name='postcode']/../label[contains(.,'This is a required field.')]"/>
+        <element name="phoneNumberRequiredMessage" type="text" selector="//input[@name='telephone']/../label[contains(.,'This is a required field.')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
index 02d9bc2eb5f12..25617ca05dd44 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
@@ -16,5 +16,7 @@
         <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
         <element name="clearAllFilters" type="text" selector=".admin__current-filters-actions-wrap.action-clear"/>
         <element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear" timeout="30"/>
+        <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
+        <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
index ad35f4bdfa28e..91363c614c1f8 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
@@ -11,9 +11,10 @@
     <section name="AdminCustomerGridSection">
         <element name="customerGrid" type="text" selector="table[data-role='grid']"/>
         <element name="firstRowEditLink" type="text" selector="tr[data-repeat-index='0'] .action-menu-item" timeout="30"/>
+        <element name="gridRow" type="text" selector="//*[@data-role='sticky-el-root']/parent::div/parent::div/following-sibling::div//tbody//*[@class='data-row'][{{row}}]" parameterized="true"/>
         <element name="selectFirstRow" type="checkbox" selector="//td[@class='data-grid-checkbox-cell']"/>
         <element name="customerCheckboxByEmail" type="checkbox" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//input[@type='checkbox']" parameterized="true" timeout="30"/>
         <element name="customerEditLinkByEmail" type="text" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//a[@class='action-menu-item']" parameterized="true" timeout="30"/>
         <element name="customerGroupByEmail" type="text" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//div[text()='{{customerGroup}}']" parameterized="true"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
index 1fdb15f189ace..4cb7f5e3f628e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
@@ -15,5 +15,6 @@
         <element name="selectFirstRow" type="button" selector="//button[@class='action-select']"/>
         <element name="deleteBtn" type="button" selector="//*[text()='Delete']"/>
         <element name="clearAllBtn" type="button" selector="//button[text()='Clear all']"/>
+        <element name="editButtonByCustomerGroupCode" type="button" selector="//tr[.//td[count(//th[./*[.='Group']]/preceding-sibling::th) + 1][./*[.='{{code}}']]]//a[contains(@href, '/edit/')]" parameterized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
index 0a56763b66704..304068d89b729 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerMainActionsSection">
         <element name="saveButton" type="button" selector="#save" timeout="30"/>
+        <element name="saveAndContinue" type="button" selector="#save_and_continue" timeout="30"/>
         <element name="resetPassword" type="button" selector="#resetPassword" timeout="30"/>
         <element name="manageShoppingCart" type="button" selector="#manage_quote" timeout="30"/>
     </section>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
index 04d6c4dc2a09d..ffddc6292ef5d 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
@@ -13,6 +13,8 @@
         <element name="addNewAddress" type="button" selector="//span[text()='Add New Address']"/>
         <element name="defaultBillingAddress" type="text" selector="input[name='default_billing']"/>
         <element name="defaultShippingAddress" type="text" selector="input[name='default_shipping']"/>
+        <element name="defaultBillingAddressButton" type="text" selector="//input[@name='default_billing']/following-sibling::label"/>
+        <element name="defaultShippingAddressButton" type="text" selector="//input[@name='default_shipping']/following-sibling::label"/>
         <element name="prefixName" type="text" selector="input[name='prefix']"/>
         <element name="firstName" type="text" selector="input[name='firstname']" />
         <element name="middleName" type="text" selector="input[name='middlename']" />
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
index 8ae4552860f59..1c5bbc76e4d6e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
@@ -13,5 +13,6 @@
         <element name="addresses" type="button" selector="//a[@id='tab_address']" timeout="30"/>
         <element name="newsLetter" type="button" selector="//a[@class='admin__page-nav-link' and @id='tab_newsletter_content']" timeout="30"/>
         <element name="group" type="text" selector="//th[text()='Customer Group:']/../td"/>
+        <element name="customerTitle" type="text" selector="h1.page-title"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/LoggedInCustomerHeaderLinksSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/LoggedInCustomerHeaderLinksSection.xml
new file mode 100644
index 0000000000000..907551e932fcf
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/LoggedInCustomerHeaderLinksSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="LoggedInCustomerHeaderLinksSection">
+        <element name="customerDropdownMenu" type="button" selector=".customer-name"/>
+        <element name="myAccount" type="button" selector="//*[contains(@class, 'page-header')]//*[contains(@class, 'customer-menu')]//a[contains(., 'My Account')]"/>
+        <element name="myWishList" type="button" selector=".page-header .customer-menu .wishlist"/>
+        <element name="signOut" type="button" selector=".page-header .customer-menu .authorization-link"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml
new file mode 100644
index 0000000000000..3a4329969ae2b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerAccountMainSection">
+        <element name="pageTitle" type="text" selector="#maincontent .column.main [data-ui-id='page-title-wrapper']" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
index 29a2f549274a7..aad9d02842271 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
@@ -17,5 +17,6 @@
         <element name="deleteAdditionalAddress" type="button" selector="//tbody//tr[{{var}}]//a[@class='action delete']" parameterized="true"/>
         <element name="editAdditionalAddress" type="button" selector="//tbody//tr[{{var}}]//a[@class='action edit']" parameterized="true" timeout="30"/>
         <element name="addNewAddress" type="button" selector="//span[text()='Add New Address']"/>
+        <element name="numberOfAddresses" type="text" selector=".toolbar-number"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml
index bed0c71ae7fad..407c6480e9dde 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSidebarSection">
-        <element name="sidebarTab" type="text" selector="//div[@id='block-collapsible-nav']//a[text()='{{var1}}']" parameterized="true"/>
+        <element name="sidebarTab" type="text" selector="//div[@id='block-collapsible-nav']//a[text()='{{tabName}}']" parameterized="true"/>
         <element name="sidebarCurrentTab" type="text" selector="//div[@id='block-collapsible-nav']//*[contains(text(), '{{var}}')]" parameterized="true"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
new file mode 100644
index 0000000000000..36592ab38e91d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
@@ -0,0 +1,63 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCustomerRetailerWithoutAddressTest">
+        <annotations>
+            <stories value="Create customer"/>
+            <title value="Create customer, retailer without address"/>
+            <description value="Login as admin and create customer retailer without address"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5310"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Filter the customer From grid-->
+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
+        <waitForPageLoad time="30" stepKey="waitToCustomerPageLoad"/>
+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="Retailer" stepKey="fillCustomerGroup"/>
+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
+        <reloadPage stepKey="reloadPage"/>
+
+        <!--Verify Customer in grid -->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail1">
+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForCustomerPageToLoad"/>
+        <see selector="{{AdminCustomerGridSection.customerGrid}}" userInput="Retailer" stepKey="assertGroup"/>
+        <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
+        <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
+        <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
+
+        <!--Assert Customer Form -->
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
+        <see selector="{{AdminCustomerAccountInformationSection.groupIdValue}}" userInput="Retailer" stepKey="seeCustomerGroup1"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeCustomerLastName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
new file mode 100644
index 0000000000000..cbc8b89d3f242
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
@@ -0,0 +1,92 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCustomerWithCountryPolandTest">
+        <annotations>
+            <stories value="Create customer"/>
+            <title value="Create customer, from Poland"/>
+            <description value="Login as admin and create customer with Poland address"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5311"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Filter the created customer From grid-->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
+            <argument name="email" value="$$createCustomer.email$$"/>
+        </actionGroup>
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
+
+        <!--Add the Address -->
+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>
+        <waitForPageLoad stepKey="waitForAddressPageToLoad"/>
+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="ClickOnAddNewAddressButton"/>
+        <waitForPageLoad stepKey="waitForNewAddressPageToLoad"/>
+        <checkOption selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}" stepKey="EnableDefaultBillingAddress"/>
+        <fillField selector="{{AdminEditCustomerAddressesSection.streetAddress}}" userInput="{{PolandAddress.street}}" stepKey="fillStreetAddress"/>
+        <fillField selector="{{AdminEditCustomerAddressesSection.city}}" userInput="{{PolandAddress.city}}" stepKey="fillCity"/>
+        <scrollTo selector="{{AdminEditCustomerAddressesSection.phone}}" x="0" y="-80" stepKey="scrollToPhone"/>
+        <selectOption selector="{{AdminEditCustomerAddressesSection.country}}" userInput="{{PolandAddress.country}}" stepKey="fillCountry"/>
+        <fillField selector="{{AdminEditCustomerAddressesSection.zipCode}}" userInput="{{PolandAddress.postcode}}" stepKey="fillPostCode"/>
+        <fillField selector="{{AdminEditCustomerAddressesSection.phone}}" userInput="{{PolandAddress.telephone}}" stepKey="fillPhoneNumber"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="clickOnSaveButton"/>
+        <waitForPageLoad stepKey="waitForPageToBeSaved"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
+
+        <!-- Assert Customer in grid -->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail1">
+            <argument name="email" value="$$createCustomer.email$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <see userInput="$$createCustomer.firstname$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
+        <see userInput="$$createCustomer.lastname$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
+        <see userInput="$$createCustomer.email$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
+        <see userInput="{{PolandAddress.country}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertCountry"/>
+        <see userInput="{{PolandAddress.postcode}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPostCode"/>
+        <see userInput="{{PolandAddress.telephone}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPhoneNumber"/>
+
+        <!--Assert Customer Form -->
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="$$createCustomer.firstname$$" stepKey="seeCustomerFirstName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="$$createCustomer.lastname$$" stepKey="seeCustomerLastName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="$$createCustomer.email$$" stepKey="seeCustomerEmail"/>
+        <click selector="{{AdminCustomerAccountInformationSection.addressesButton}}" stepKey="clickOnAddressButton"/>
+        <waitForPageLoad stepKey="waitForAddressGridToLoad"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="$$createCustomer.firstname$$" stepKey="seeAFirstNameInDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="$$createCustomer.lastname$$" stepKey="seeLastNameInDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{PolandAddress.street}}" stepKey="seeStreetInDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{PolandAddress.city}}" stepKey="seeLCityInDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{PolandAddress.country}}" stepKey="seeCountrynDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{PolandAddress.postcode}}" stepKey="seePostCodeInDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{PolandAddress.telephone}}" stepKey="seePhoneNumberInDefaultAddressSection"/>
+
+        <!--Assert Customer Address Grid -->
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.street}}" stepKey="seeStreetAddress"/>
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.city}}" stepKey="seeCity"/>
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.country}}" stepKey="seeCountry"/>
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.postcode}}" stepKey="seePostCode"/>
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.telephone}}" stepKey="seePhoneNumber"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
new file mode 100644
index 0000000000000..43f2aa7f8de95
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
@@ -0,0 +1,95 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCustomerWithCountryUSATest">
+        <annotations>
+            <stories value="Create customer"/>
+            <title value="Create customer, from USA"/>
+            <description value="Login as admin and create customer with USA address"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5309"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Filter the customer From grid-->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
+            <argument name="email" value="$$createCustomer.email$$"/>
+        </actionGroup>
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
+
+        <!-- Add the Address -->
+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>
+        <waitForPageLoad stepKey="waitForAddressPageToLoad"/>
+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="ClickOnAddNewAddressButton"/>
+        <waitForPageLoad stepKey="waitForNewAddressPageToLoad"/>
+        <checkOption selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}" stepKey="EnableDefaultBillingAddress"/>
+        <fillField selector="{{AdminEditCustomerAddressesSection.streetAddress}}" userInput="{{US_Address_CA.street}}" stepKey="fillStreetAddress"/>
+        <fillField selector="{{AdminEditCustomerAddressesSection.city}}" userInput="{{US_Address_CA.city}}" stepKey="fillCity"/>
+        <scrollTo selector="{{AdminEditCustomerAddressesSection.phone}}" x="0" y="-80" stepKey="scrollToPhone"/>
+        <selectOption selector="{{AdminEditCustomerAddressesSection.country}}" userInput="{{US_Address_CA.country}}" stepKey="fillCountry"/>
+        <selectOption selector="{{AdminEditCustomerAddressesSection.state}}" userInput="{{US_Address_CA.state}}" stepKey="fillState"/>
+        <fillField selector="{{AdminEditCustomerAddressesSection.zipCode}}" userInput="{{US_Address_CA.postcode}}" stepKey="fillPostCode"/>
+        <fillField selector="{{AdminEditCustomerAddressesSection.phone}}" userInput="{{US_Address_CA.telephone}}" stepKey="fillPhoneNumber"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="clickOnSaveButton"/>
+        <waitForPageLoad stepKey="waitForPageToBeSaved"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
+
+        <!-- Assert Customer in grid -->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail1">
+            <argument name="email" value="$$createCustomer.email$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <see userInput="$$createCustomer.firstname$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
+        <see userInput="$$createCustomer.lastname$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
+        <see userInput="$$createCustomer.email$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
+        <see userInput="{{US_Address_CA.state}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertState"/>
+        <see userInput="{{US_Address_CA.country}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertCountry"/>
+        <see userInput="{{US_Address_CA.postcode}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPostCode"/>
+        <see userInput="{{US_Address_CA.telephone}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPhoneNumber"/>
+
+        <!--Assert Customer Form -->
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="$$createCustomer.firstname$$" stepKey="seeCustomerFirstName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="$$createCustomer.lastname$$" stepKey="seeCustomerLastName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="$$createCustomer.email$$" stepKey="seeCustomerEmail"/>
+        <click selector="{{AdminCustomerAccountInformationSection.addressesButton}}" stepKey="clickOnAddressButton"/>
+        <waitForPageLoad stepKey="waitForAddressGridToLoad"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="$$createCustomer.firstname$$" stepKey="seeAFirstNameInDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="$$createCustomer.lastname$$" stepKey="seeLastNameInDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.street}}" stepKey="seeStreetInDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.city}}" stepKey="seeLCityInDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.country}}" stepKey="seeCountrynDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.postcode}}" stepKey="seePostCodeInDefaultAddressSection"/>
+        <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.telephone}}" stepKey="seePhoneNumberInDefaultAddressSection"/>
+
+        <!--Assert Customer Address Grid -->
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.street}}" stepKey="seeStreetAddress"/>
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.city}}" stepKey="seeCity"/>
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.country}}" stepKey="seeCountry"/>
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.state}}" stepKey="seeState"/>
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.postcode}}" stepKey="seePostCode"/>
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.telephone}}" stepKey="seePhoneNumber"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
new file mode 100644
index 0000000000000..872da149ed0b2
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
@@ -0,0 +1,65 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCustomerWithCustomGroupTest">
+        <annotations>
+            <stories value="Create customer"/>
+            <title value="Create customer, with custom group"/>
+            <description value="Login as admin and create customer with custom group"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5313"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="CustomCustomerGroup" stepKey="customerGroup" />
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
+                <argument name="email" value="{{CustomerEntityOne.email}}" />
+            </actionGroup>
+            <deleteData createDataKey="customerGroup" stepKey="deleteCustomerGroup"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open New Customer Page -->
+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
+        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="$$customerGroup.code$$" stepKey="fillCustomerGroup"/>
+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
+        <magentoCLI stepKey="flushMagentoCache" command="cache:flush" />
+        <reloadPage stepKey="reloadPage"/>
+
+        <!--Verify Customer in grid -->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail1">
+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForCustomerPageToLoad"/>
+        <see selector="{{AdminCustomerGridSection.customerGrid}}" userInput="$$customerGroup.code$$" stepKey="assertGroup"/>
+        <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
+        <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
+        <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
+
+        <!--Assert Customer Form -->
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
+        <see selector="{{AdminCustomerAccountInformationSection.groupIdValue}}" userInput="$$customerGroup.code$$" stepKey="seeCustomerGroup1"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeCustomerLastName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
new file mode 100644
index 0000000000000..1b901a7b3e1cd
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
@@ -0,0 +1,70 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCustomerWithPrefixTest">
+        <annotations>
+            <stories value="Create customer"/>
+            <title value="Create customer, with prefix"/>
+            <description value="Login as admin and create a customer with name prefix and suffix"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5308"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open New Customer Page  and create a customer with Prefix and Suffix-->
+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
+        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="Wholesale" stepKey="fillCustomerGroup"/>
+        <fillField selector="{{AdminCustomerAccountInformationSection.namePrefix}}" userInput="{{CustomerEntityOne.prefix}}" stepKey="fillNamePrefix"/>
+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
+        <fillField selector="{{AdminCustomerAccountInformationSection.nameSuffix}}" userInput="{{CustomerEntityOne.suffix}}" stepKey="fillNameSuffix"/>
+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
+        <fillField userInput="{{CustomerEntityOne.dob}}" selector="{{AdminCustomerAccountInformationSection.dateOfBirth}}" stepKey="fillDateOfBirth"/>
+        <selectOption userInput="Male" selector="{{AdminCustomerAccountInformationSection.gender}}" stepKey="fillGender"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
+        <reloadPage stepKey="reloadPage"/>
+
+        <!--Filter the customer From grid-->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+
+        <!-- Assert Customer in grid -->
+        <see userInput="{{CustomerEntityOne.prefix}} {{CustomerEntityOne.firstname}} {{CustomerEntityOne.lastname}} {{CustomerEntityOne.suffix}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
+        <see userInput="Wholesale" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertCustomerGroup"/>
+        <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
+        <see userInput="Jan 1, 1970" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertDateOfBirth"/>
+        <see userInput="Male" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertGender"/>
+
+        <!--Assert Customer Form -->
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.namePrefix}}" userInput="{{CustomerEntityOne.prefix}}" stepKey="seeCustomerNamePrefix"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeCustomerLastName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.nameSuffix}}" userInput="{{CustomerEntityOne.suffix}}" stepKey="seeCustomerNameSuffix"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
new file mode 100644
index 0000000000000..fe4bb3ee59e6e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
@@ -0,0 +1,61 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateCustomerWithoutAddressTest">
+        <annotations>
+            <stories value="Create customer"/>
+            <title value="Create customer, without address"/>
+            <description value="Login as admin and create a customer without address"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5307"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open New Customer Page -->
+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
+        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
+        <reloadPage stepKey="reloadPage"/>
+
+        <!--Filter the customer From grid-->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+
+        <!-- Assert Customer in grid -->
+        <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
+        <see userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
+        <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
+
+        <!--Assert Customer Form -->
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeCustomerLastName"/>
+        <seeInField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
new file mode 100644
index 0000000000000..de4ab9ffaa121
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
@@ -0,0 +1,54 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateNewCustomerTest">
+        <annotations>
+            <stories value="Create customer"/>
+            <title value="Create customer, new via backend"/>
+            <description value="Login as admin and create a new customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5312"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open New Customer Page -->
+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
+        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
+        <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
+        <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
+        <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
+        <reloadPage stepKey="reloadPage"/>
+
+        <!--Filter the customer From grid-->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
+
+        <!-- Assert Customer Title -->
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
+        <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
+        <see stepKey="seeCustomerTitle" selector="{{AdminEditCustomerInformationSection.customerTitle}}" userInput="{{CustomerEntityOne.firstname}} {{CustomerEntityOne.lastname}} "/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest.xml
new file mode 100644
index 0000000000000..f58f23dee4235
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest.xml
@@ -0,0 +1,308 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateCustomerInfoFromDefaultToNonDefaultTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Update Customer Information in Admin"/>
+            <title value="Update Customer Info from Default to Non-Default in Admin"/>
+            <description value="Update Customer Info from Default to Non-Default in Admin"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13619"/>
+            <group value="Customer"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData stepKey="customer" entity="Simple_Customer_Without_Address"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
+            <!-- Reset customer grid filter -->
+            <amOnPage stepKey="goToCustomersGridPage" url="{{AdminCustomerPage.url}}"/>
+            <waitForPageLoad stepKey="waitForCustomersGrid"/>
+            <actionGroup stepKey="resetFilter" ref="AdminResetFilterInCustomerGrid"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{AdminCustomerPage.url}}edit/id/$$customer.id$$/" stepKey="openCustomerEditPage"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPage"/>
+        <!-- Update Customer Account Information -->
+        <actionGroup stepKey="editCustomerInformation" ref="AdminEditCustomerAccountInformationActionGroup">
+            <argument name="firstName" value="$$customer.firstname$$updated"/>
+            <argument name="lastName" value="$$customer.lastname$$updated"/>
+            <argument name="email" value="updated$$customer.email$$"/>
+        </actionGroup>
+        <!--Update Customer Addresses -->
+        <actionGroup stepKey="editCustomerAddress" ref="AdminEditCustomerAddressSetDefaultShippingAndBilling">
+            <argument name="customerAddress" value="CustomerAddressSimple"/>
+        </actionGroup>
+        <actionGroup stepKey="saveAndCheckSuccessMessage" ref="AdminSaveCustomerAndAssertSuccessMessage"/>
+        <!-- Assert Customer in Customer grid -->
+        <amOnPage stepKey="goToCustomersGridPage" url="{{AdminCustomerPage.url}}"/>
+        <waitForPageLoad stepKey="waitForCustomersGrid"/>
+        <actionGroup stepKey="resetFilter" ref="AdminResetFilterInCustomerGrid"/>
+        <actionGroup stepKey="filterByEamil" ref="AdminFilterCustomerGridByEmail">
+            <argument name="email" value="updated$$customer.email$$"/>
+        </actionGroup>
+        <actionGroup stepKey="checkCustomerInGrid" ref="AdminAssertCustomerInCustomersGrid">
+            <argument name="text" value="updated$$customer.email$$"/>
+            <argument name="row" value="1"/>
+        </actionGroup>
+        <!-- Assert Customer in Customer Form -->
+        <amOnPage url="{{AdminCustomerPage.url}}edit/id/$$customer.id$$/" stepKey="openCustomerEditPageAfterSave"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPageAfterSave"/>
+        <!-- Assert Customer Account Information -->
+        <actionGroup stepKey="checkCustomerAccountInformation" ref="AdminAssertCustomerAccountInformation">
+            <argument name="firstName" value="$$customer.firstname$$updated"/>
+            <argument name="lastName" value="$$customer.lastname$$updated"/>
+            <argument name="email" value="updated$$customer.email$$"/>
+        </actionGroup>
+        <!-- Assert Customer Default Billing Address -->
+        <actionGroup stepKey="checkDefaultBilling" ref="AdminAssertCustomerDefaultBillingAddress">
+            <argument name="firstName" value="$$customer.firstname$$updated"/>
+            <argument name="lastName" value="$$customer.lastname$$updated"/>
+            <argument name="street1" value="{{CustomerAddressSimple.street[0]}}"/>
+            <argument name="state" value="{{CustomerAddressSimple.state}}"/>
+            <argument name="postcode" value="{{CustomerAddressSimple.postcode}}"/>
+            <argument name="country" value="{{CustomerAddressSimple.country_id}}"/>
+            <argument name="telephone" value="{{CustomerAddressSimple.telephone}}"/>
+        </actionGroup>
+        <!-- Assert Customer Default Shipping Address -->
+        <actionGroup stepKey="checkDefaultShipping" ref="AdminAssertCustomerDefaultShippingAddress">
+            <argument name="firstName" value="$$customer.firstname$$updated"/>
+            <argument name="lastName" value="$$customer.lastname$$updated"/>
+            <argument name="street1" value="{{CustomerAddressSimple.street[0]}}"/>
+            <argument name="state" value="{{CustomerAddressSimple.state}}"/>
+            <argument name="postcode" value="{{CustomerAddressSimple.postcode}}"/>
+            <argument name="country" value="{{CustomerAddressSimple.country_id}}"/>
+            <argument name="telephone" value="{{CustomerAddressSimple.telephone}}"/>
+        </actionGroup>
+    </test>
+
+    <test name="AdminUpdateCustomerAddressNoZipNoStateTest" extends="AdminUpdateCustomerInfoFromDefaultToNonDefaultTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Update Customer Information in Admin"/>
+            <title value="Update Customer Address, without zip/state required, default billing/shipping checked in Admin"/>
+            <description value="Update Customer Address, without zip/state required, default billing/shipping checked in Admin"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13621"/>
+            <group value="Customer"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <after>
+            <remove keyForRemoval="goToCustomersGridPage"/>
+            <remove keyForRemoval="waitForCustomersGrid"/>
+            <remove keyForRemoval="resetFilter"/>
+        </after>
+
+        <!-- Remove steps that are not used for this test -->
+        <remove keyForRemoval="editCustomerInformation"/>
+        <remove keyForRemoval="goToCustomersGridPage"/>
+        <remove keyForRemoval="waitForCustomersGrid"/>
+        <remove keyForRemoval="resetFilter"/>
+        <remove keyForRemoval="filterByEamil"/>
+        <remove keyForRemoval="checkCustomerInGrid"/>
+        <remove keyForRemoval="checkCustomerAccountInformation"/>
+
+        <!--Update Customer Addresses With No Zip and No State -->
+        <actionGroup stepKey="editCustomerAddress" ref="AdminEditCustomerAddressNoZipNoState">
+            <argument name="customerAddress" value="addressNoZipNoState"/>
+        </actionGroup>
+
+        <!-- Assert Customer Default Billing Address -->
+        <actionGroup stepKey="checkDefaultBilling" ref="AdminAssertCustomerDefaultBillingAddress">
+            <argument name="firstName" value="$$customer.firstname$$"/>
+            <argument name="lastName" value="$$customer.lastname$$"/>
+            <argument name="street1" value="{{addressNoZipNoState.street[0]}}"/>
+            <argument name="country" value="{{addressNoZipNoState.country_id}}"/>
+            <argument name="telephone" value="{{addressNoZipNoState.telephone}}"/>
+        </actionGroup>
+        <!-- Assert Customer Default Shipping Address -->
+        <actionGroup stepKey="checkDefaultShipping" ref="AdminAssertCustomerDefaultShippingAddress">
+            <argument name="firstName" value="$$customer.firstname$$"/>
+            <argument name="lastName" value="$$customer.lastname$$"/>
+            <argument name="street1" value="{{addressNoZipNoState.street[0]}}"/>
+            <argument name="country" value="{{addressNoZipNoState.country_id}}"/>
+            <argument name="telephone" value="{{addressNoZipNoState.telephone}}"/>
+        </actionGroup>
+        <!-- Assert Customer Login Storefront -->
+        <actionGroup stepKey="login" ref="StorefrontAssertSuccessLoginToStorefront" after="checkDefaultShipping" >
+            <argument name="Customer" value="$$customer$$"/>
+        </actionGroup>
+    </test>
+
+    <test name="AdminUpdateCustomerAddressNoBillingNoShippingTest" extends="AdminUpdateCustomerInfoFromDefaultToNonDefaultTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Update Customer Information in Admin"/>
+            <title value="Update Customer Address, default billing/shipping unchecked in Admin"/>
+            <description value="Update Customer Address, default billing/shipping unchecked in Admin"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13622"/>
+            <group value="Customer"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <after>
+            <remove keyForRemoval="goToCustomersGridPage"/>
+            <remove keyForRemoval="waitForCustomersGrid"/>
+            <remove keyForRemoval="resetFilter"/>
+        </after>
+
+        <!-- Remove steps that are not used for this test -->
+        <remove keyForRemoval="editCustomerInformation"/>
+        <remove keyForRemoval="goToCustomersGridPage"/>
+        <remove keyForRemoval="waitForCustomersGrid"/>
+        <remove keyForRemoval="resetFilter"/>
+        <remove keyForRemoval="filterByEamil"/>
+        <remove keyForRemoval="checkCustomerInGrid"/>
+        <remove keyForRemoval="checkCustomerAccountInformation"/>
+        <remove keyForRemoval="checkDefaultBilling"/>
+        <remove keyForRemoval="checkDefaultShipping"/>
+
+        <!--Update Customer Addresses With Default Billing and Shipping Unchecked -->
+        <actionGroup stepKey="editCustomerAddress" ref="AdminEditCustomerAddressesFrom">
+            <argument name="customerAddress" value="CustomerAddressSimple"/>
+        </actionGroup>
+
+        <!-- Check Customer Address in Customer Form -->
+        <actionGroup stepKey="checkNoDefaultBilling" ref="AdminAssertCustomerNoDefaultBillingAddress" after="waitForCustomerEditPageAfterSave"/>
+        <actionGroup stepKey="checkNoDefaultShipping" ref="AdminAssertCustomerNoDefaultShippingAddress" after="checkNoDefaultBilling"/>
+        <actionGroup stepKey="resetFilter" ref="AdminResetFilterInCustomerAddressGrid" after="checkNoDefaultShipping"/>
+        <actionGroup stepKey="searchAddress" ref="AdminFilterCustomerAddressGridByPhoneNumber" after="resetFilter">
+            <argument name="phone" value="{{CustomerAddressSimple.telephone}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressStreetInGrid" ref="AdminAssertAddressInCustomersAddressGrid" after="searchAddress">
+            <argument name="text" value="{{CustomerAddressSimple.street[0]}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressPhoneInGrid" ref="AdminAssertAddressInCustomersAddressGrid" after="checkAddressStreetInGrid">
+            <argument name="text" value="{{CustomerAddressSimple.telephone}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressStateInGrid" ref="AdminAssertAddressInCustomersAddressGrid" after="checkAddressPhoneInGrid">
+            <argument name="text" value="{{CustomerAddressSimple.state}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressCityInGrid" ref="AdminAssertAddressInCustomersAddressGrid" after="checkAddressStateInGrid">
+            <argument name="text" value="{{CustomerAddressSimple.city}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressCountryInGrid" ref="AdminAssertAddressInCustomersAddressGrid" after="checkAddressCityInGrid">
+            <argument name="text" value="{{CustomerAddressSimple.country_id}}"/>
+        </actionGroup>
+        <actionGroup stepKey="resetFilterWhenDone" ref="AdminResetFilterInCustomerAddressGrid" after="checkAddressCountryInGrid"/>
+        <!-- Assert Customer Login Storefront -->
+        <actionGroup stepKey="login" ref="StorefrontAssertSuccessLoginToStorefront" after="resetFilterWhenDone" >
+            <argument name="Customer" value="$$customer$$"/>
+        </actionGroup>
+    </test>
+
+    <test name="AdminDeleteCustomerAddressTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Delete Customer Address in Admin"/>
+            <title value="Delete Customer Address in Admin"/>
+            <description value="Delete Customer Address in Admin"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13623"/>
+            <group value="Customer"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData stepKey="customer" entity="Simple_US_Customer_Multiple_Addresses"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{AdminCustomerPage.url}}edit/id/$$customer.id$$/" stepKey="openCustomerEditPage"/>
+        <waitForPageLoad stepKey="waitForCustomerEditPage"/>
+        <!-- Assert Customer Default Billing Address -->
+        <actionGroup stepKey="checkDefaultBilling" ref="AdminAssertCustomerDefaultBillingAddress">
+            <argument name="firstName" value="$$customer.firstname$$"/>
+            <argument name="lastName" value="$$customer.lastname$$"/>
+            <argument name="street1" value="{{US_Address_NY.street[0]}}"/>
+            <argument name="state" value="{{US_Address_NY.state}}"/>
+            <argument name="postcode" value="{{US_Address_NY.postcode}}"/>
+            <argument name="country" value="{{US_Address_NY.country}}"/>
+            <argument name="telephone" value="{{US_Address_NY.telephone}}"/>
+        </actionGroup>
+        <!-- Assert Customer Default Shipping Address -->
+        <actionGroup stepKey="checkDefaultShipping" ref="AdminAssertCustomerDefaultShippingAddress">
+            <argument name="firstName" value="$$customer.firstname$$"/>
+            <argument name="lastName" value="$$customer.lastname$$"/>
+            <argument name="street1" value="{{US_Address_NY.street[0]}}"/>
+            <argument name="state" value="{{US_Address_NY.state}}"/>
+            <argument name="postcode" value="{{US_Address_NY.postcode}}"/>
+            <argument name="country" value="{{US_Address_NY.country}}"/>
+            <argument name="telephone" value="{{US_Address_NY.telephone}}"/>
+        </actionGroup>
+        <actionGroup stepKey="resetFilter" ref="AdminResetFilterInCustomerAddressGrid"/>
+        <!-- Assert 2 records in Customer Address Grid -->
+        <actionGroup stepKey="see2Record" ref="AdminAssertNumberOfRecordsInCustomersAddressGrid">
+            <argument name="number" value="2"/>
+        </actionGroup>
+        <!-- Assert Address 1 in Grid -->
+        <actionGroup stepKey="checkAddressStreetInGrid" ref="AdminAssertAddressInCustomersAddressGrid">
+            <argument name="text" value="{{US_Address_NY.street[0]}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressPhoneInGrid" ref="AdminAssertAddressInCustomersAddressGrid">
+            <argument name="text" value="{{US_Address_NY.telephone}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressStateInGrid" ref="AdminAssertAddressInCustomersAddressGrid">
+            <argument name="text" value="{{US_Address_NY.state}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressCityInGrid" ref="AdminAssertAddressInCustomersAddressGrid">
+            <argument name="text" value="{{US_Address_NY.city}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressCountryInGrid" ref="AdminAssertAddressInCustomersAddressGrid">
+            <argument name="text" value="{{US_Address_NY.country}}"/>
+        </actionGroup>
+        <!-- Assert Address 2 in Grid -->
+        <actionGroup stepKey="checkAddressStreetInGrid2" ref="AdminAssertAddressInCustomersAddressGrid">
+            <argument name="text" value="{{UK_Not_Default_Address.street[0]}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressPhoneInGrid2" ref="AdminAssertAddressInCustomersAddressGrid">
+            <argument name="text" value="{{UK_Not_Default_Address.telephone}}"/>
+        </actionGroup>
+        <actionGroup stepKey="checkAddressCityInGrid2" ref="AdminAssertAddressInCustomersAddressGrid">
+            <argument name="text" value="{{UK_Not_Default_Address.city}}"/>
+        </actionGroup>
+        <!-- Delete Customer in Customer Address Grid -->
+        <actionGroup stepKey="deleteAddress" ref="AdminDeleteAddressInCustomersAddressGrid">
+            <argument name="row" value="0"/>
+        </actionGroup>
+        <!-- Assert 1 record in Customer Address Grid -->
+        <actionGroup stepKey="see1Record" ref="AdminAssertNumberOfRecordsInCustomersAddressGrid">
+            <argument name="number" value="1"/>
+        </actionGroup>
+        <actionGroup stepKey="saveAndContinue" ref="AdminCustomerSaveAndContinue"/>
+        <actionGroup stepKey="saveAndCheckSuccessMessage" ref="AdminSaveCustomerAndAssertSuccessMessage"/>
+        <!-- Assert Customer Login Storefront -->
+        <actionGroup stepKey="login" ref="StorefrontAssertSuccessLoginToStorefront">
+            <argument name="Customer" value="$$customer$$"/>
+        </actionGroup>
+        <!-- Assert Customer Address Book -->
+        <actionGroup stepKey="goToAddressBook" ref="StorefrontCustomerGoToSidebarMenu">
+            <argument name="menu" value="Address Book"/>
+        </actionGroup>
+        <actionGroup stepKey="assertAddressNumber" ref="StorefrontCustomerAddressBookNumberOfAddresses">
+            <argument name="number" value="1"/>
+        </actionGroup>
+        <actionGroup stepKey="assertNoAddress1" ref="StorefrontCustomerAddressBookNotContains">
+            <argument name="text" value="{{US_Address_NY.street[0]}}"/>
+        </actionGroup>
+        <actionGroup stepKey="assertAddress2" ref="StorefrontCustomerAddressBookContains">
+            <argument name="text" value="{{UK_Not_Default_Address.street[0]}}"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml
new file mode 100644
index 0000000000000..7dab6eefde8ec
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml
@@ -0,0 +1,39 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminVerifyCreateCustomerRequiredFieldsTest">
+        <annotations>
+            <stories value="Create customer"/>
+            <title value="Create customer, verify required fields on Account Information tab"/>
+            <description value="Login as admin and verify required fields on account information section"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5314"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open New Customer Page -->
+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
+        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+
+        <!--Assert Required Fields -->
+        <seeElement selector="{{AdminCustomerAccountInformationSection.firstNameRequiredMessage}}" stepKey="seeFirstNameRequiredFieldMessage"/>
+        <seeElement selector="{{AdminCustomerAccountInformationSection.lastNameRequiredMessage}}" stepKey="seeLastNameRequiredFieldMessage"/>
+        <seeElement selector="{{AdminCustomerAccountInformationSection.emailRequiredMessage}}" stepKey="seeEmailRequiredFieldMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressRequiredFieldsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressRequiredFieldsTest.xml
new file mode 100644
index 0000000000000..bfb47dc9e1911
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressRequiredFieldsTest.xml
@@ -0,0 +1,49 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminVerifyCustomerAddressRequiredFieldsTest">
+        <annotations>
+            <stories value="Create customer"/>
+            <title value="Create customer, verify required fields on Addresses tab"/>
+            <description value="Login as admin and verify required fields on Address tab"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5315"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open Created Customer -->
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="editCustomerForm">
+            <argument name="customer" value="Simple_Customer_Without_Address"/>
+        </actionGroup>
+        <click selector="{{AdminCustomerAccountInformationSection.addressesButton}}" stepKey="openAddressesTab"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="ClickOnAddNewAddressButton"/>
+        <waitForPageLoad stepKey="waitForAdressPageToLoad"/>
+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="clickOnSaveButton"/>
+        <waitForPageLoad stepKey="waitForPageToBeSaved"/>
+
+        <!--Assert Required Field Messages -->
+        <seeElement selector="{{AdminCustomerAddressesSection.streetRequiredMessage}}" stepKey="seeStreetRequiredMessage"/>
+        <seeElement selector="{{AdminCustomerAddressesSection.cityRequiredMessage}}" stepKey="seeCityRequiredMessage"/>
+        <scrollTo selector="{{AdminEditCustomerAddressesSection.phone}}" x="0" y="-80" stepKey="scrollToPhone"/>
+        <seeElement selector="{{AdminCustomerAddressesSection.countryRequiredMessage}}" stepKey="seeCountryRequiredMessage"/>
+        <seeElement selector="{{AdminCustomerAddressesSection.postcodeRequiredMessage}}" stepKey="seePostcodeRequiredMessage"/>
+        <seeElement selector="{{AdminCustomerAddressesSection.phoneNumberRequiredMessage}}" stepKey="seePhoneNumberRequiredMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml
index 9a6c1c5ec8988..104b5d56314ba 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml
@@ -17,7 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-10913"/>
             <group value="Customer"/>
-            <group value="mtf-migrated"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <createData stepKey="customer" entity="Simple_US_Customer"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml
new file mode 100644
index 0000000000000..648c30b1ca0bb
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml
@@ -0,0 +1,38 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="VerifyDisabledCustomerGroupFieldTest">
+        <annotations>
+            <stories value="Check that field is disabled in system Customer Group"/>
+            <title value="Check that field is disabled in system Customer Group"/>
+            <description value="Checks that customer_group_code field is disabled in NOT LOGGED IN Customer Group"/>
+            <testCaseId value="MC-14206"/>
+            <severity value="CRITICAL"/>
+            <group value="customers"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <!-- Steps -->
+        <!-- 1. Login to backend as admin user -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <waitForPageLoad stepKey="waitForAdminPageLoad" />
+
+        <!-- 2. Navigate to Customers > Customer Groups -->
+        <amOnPage url="{{AdminCustomerGroupPage.url}}" stepKey="amOnCustomerGroupPage" />
+        <waitForPageLoad stepKey="waitForCustomerGroupsPageLoad" />
+
+        <!-- 3. Select system Customer Group specified in data set from grid -->
+        <click selector="{{AdminCustomerGroupMainSection.editButtonByCustomerGroupCode(NotLoggedInCustomerGroup.code)}}" stepKey="clickOnEditCustomerGroup" />
+
+        <!-- 4. Perform all assertions -->
+        <seeInField selector="{{AdminNewCustomerGroupSection.groupName}}" userInput="{{NotLoggedInCustomerGroup.code}}" stepKey="seeNotLoggedInTextInGroupName" />
+        <assertElementContainsAttribute selector="{{AdminNewCustomerGroupSection.groupName}}" attribute="disabled" expectedValue="true" stepKey="checkIfGroupNameIsDisabled" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
index 31bcc37612302..47f96b132b3db 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
@@ -81,7 +81,7 @@ protected function setUp()
     public function testGetChildHtml()
     {
         $customerId = 1;
-
+        $outputString = 'OutputString';
         /** @var \Magento\Framework\View\Element\BlockInterface|\PHPUnit_Framework_MockObject_MockObject $block */
         $block = $this->getMockBuilder(\Magento\Framework\View\Element\BlockInterface::class)
             ->setMethods(['setCollection'])
@@ -93,7 +93,7 @@ public function testGetChildHtml()
         /** @var \PHPUnit_Framework_MockObject_MockObject */
         $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setOrder', 'setCustomerFilter', 'load'])
+            ->setMethods(['setOrder', 'setCustomerFilter', 'load','addFieldToFilter'])
             ->getMock();
 
         $layout->expects($this->atLeastOnce())->method('getChildName')->with('NameInLayout', 'pager')
@@ -108,12 +108,13 @@ public function testGetChildHtml()
             ->willReturnSelf();
         $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
             ->willReturnSelf();
+        $addressCollection->expects(static::any())->method('addFieldToFilter')->willReturnSelf();
         $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
             ->willReturn($addressCollection);
         $block->expects($this->atLeastOnce())->method('setCollection')->with($addressCollection)->willReturnSelf();
         $this->gridBlock->setNameInLayout('NameInLayout');
         $this->gridBlock->setLayout($layout);
-        $this->assertEquals('OutputString', $this->gridBlock->getChildHtml('pager'));
+        $this->assertEquals($outputString, $this->gridBlock->getChildHtml('pager'));
     }
 
     /**
@@ -137,7 +138,7 @@ public function testGetAdditionalAddresses()
         /** @var \PHPUnit_Framework_MockObject_MockObject */
         $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setOrder', 'setCustomerFilter', 'load', 'getIterator'])
+            ->setMethods(['setOrder', 'setCustomerFilter', 'load', 'getIterator','addFieldToFilter'])
             ->getMock();
         $addressDataModel = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
         $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
@@ -157,6 +158,7 @@ public function testGetAdditionalAddresses()
             ->willReturnSelf();
         $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
             ->willReturnSelf();
+        $addressCollection->expects(static::any())->method('addFieldToFilter')->willReturnSelf();
         $addressCollection->expects($this->atLeastOnce())->method('getIterator')
             ->willReturn(new \ArrayIterator($collection));
         $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
index fd5ecbfa7f277..0c5af453f2373 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <title>Create New Customer Account</title>
+    </head>
     <body>
         <referenceBlock name="head.components">
             <block class="Magento\Framework\View\Element\Js\Components" name="customer_account_create_head_components" template="Magento_Customer::js/components.phtml"/>
diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
index 7dec4279ee280..3840c534b1964 100644
--- a/app/code/Magento/CustomerAnalytics/composer.json
+++ b/app/code/Magento/CustomerAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-customer": "*"
+        "magento/module-customer": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
new file mode 100644
index 0000000000000..388b6dc2ea943
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Api\DataObjectHelper;
+
+/**
+ * Create customer address
+ */
+class CreateCustomerAddress
+{
+    /**
+     * @var GetAllowedAddressAttributes
+     */
+    private $getAllowedAddressAttributes;
+
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $addressFactory;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
+     * @param AddressInterfaceFactory $addressFactory
+     * @param AddressRepositoryInterface $addressRepository
+     * @param DataObjectHelper $dataObjectHelper
+     */
+    public function __construct(
+        GetAllowedAddressAttributes $getAllowedAddressAttributes,
+        AddressInterfaceFactory $addressFactory,
+        AddressRepositoryInterface $addressRepository,
+        DataObjectHelper $dataObjectHelper
+    ) {
+        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
+        $this->addressFactory = $addressFactory;
+        $this->addressRepository = $addressRepository;
+        $this->dataObjectHelper = $dataObjectHelper;
+    }
+
+    /**
+     * Create customer address
+     *
+     * @param int $customerId
+     * @param array $data
+     * @return AddressInterface
+     * @throws GraphQlInputException
+     */
+    public function execute(int $customerId, array $data): AddressInterface
+    {
+        $this->validateData($data);
+
+        /** @var AddressInterface $address */
+        $address = $this->addressFactory->create();
+        $this->dataObjectHelper->populateWithArray($address, $data, AddressInterface::class);
+
+        if (isset($data['region']['region_id'])) {
+            $address->setRegionId($address->getRegion()->getRegionId());
+        }
+        $address->setCustomerId($customerId);
+
+        try {
+            $this->addressRepository->save($address);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+        return $address;
+    }
+
+    /**
+     * Validate customer address create data
+     *
+     * @param array $addressData
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function validateData(array $addressData): void
+    {
+        $attributes = $this->getAllowedAddressAttributes->execute();
+        $errorInput = [];
+
+        foreach ($attributes as $attributeName => $attributeInfo) {
+            if ($attributeInfo->getIsRequired()
+                && (!isset($addressData[$attributeName]) || empty($addressData[$attributeName]))
+            ) {
+                $errorInput[] = $attributeName;
+            }
+        }
+
+        if ($errorInput) {
+            throw new GraphQlInputException(
+                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php
deleted file mode 100644
index 65672bcd3503b..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CustomerGraphQl\Model\Customer\Address;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-
-/**
- * Customer address create data validator
- */
-class CustomerAddressCreateDataValidator
-{
-    /**
-     * @var GetAllowedAddressAttributes
-     */
-    private $getAllowedAddressAttributes;
-
-    /**
-     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
-     */
-    public function __construct(GetAllowedAddressAttributes $getAllowedAddressAttributes)
-    {
-        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
-    }
-
-    /**
-     * Validate customer address create data
-     *
-     * @param array $addressData
-     * @return void
-     * @throws GraphQlInputException
-     */
-    public function validate(array $addressData): void
-    {
-        $attributes = $this->getAllowedAddressAttributes->execute();
-        $errorInput = [];
-
-        foreach ($attributes as $attributeName => $attributeInfo) {
-            if ($attributeInfo->getIsRequired()
-                && (!isset($addressData[$attributeName]) || empty($addressData[$attributeName]))
-            ) {
-                $errorInput[] = $attributeName;
-            }
-        }
-
-        if ($errorInput) {
-            throw new GraphQlInputException(
-                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
-            );
-        }
-    }
-}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php
deleted file mode 100644
index 13716b491fddf..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CustomerGraphQl\Model\Customer\Address;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-
-/**
- * Customer address update data validator. Patch update is allowed
- */
-class CustomerAddressUpdateDataValidator
-{
-    /**
-     * @var GetAllowedAddressAttributes
-     */
-    private $getAllowedAddressAttributes;
-
-    /**
-     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
-     */
-    public function __construct(GetAllowedAddressAttributes $getAllowedAddressAttributes)
-    {
-        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
-    }
-
-    /**
-     * Validate customer address update data
-     *
-     * @param array $addressData
-     * @return void
-     * @throws GraphQlInputException
-     */
-    public function validate(array $addressData): void
-    {
-        $attributes = $this->getAllowedAddressAttributes->execute();
-        $errorInput = [];
-
-        foreach ($attributes as $attributeName => $attributeInfo) {
-            if ($attributeInfo->getIsRequired()
-                && (isset($addressData[$attributeName]) && empty($addressData[$attributeName]))
-            ) {
-                $errorInput[] = $attributeName;
-            }
-        }
-
-        if ($errorInput) {
-            throw new GraphQlInputException(
-                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
-            );
-        }
-    }
-}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/DeleteCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/DeleteCustomerAddress.php
new file mode 100644
index 0000000000000..586fbebde703f
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/DeleteCustomerAddress.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Delete customer address
+ */
+class DeleteCustomerAddress
+{
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @param AddressRepositoryInterface $addressRepository
+     */
+    public function __construct(
+        AddressRepositoryInterface $addressRepository
+    ) {
+        $this->addressRepository = $addressRepository;
+    }
+
+    /**
+     * Delete customer address
+     *
+     * @param AddressInterface $address
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function execute(AddressInterface $address): void
+    {
+        if ($address->isDefaultBilling()) {
+            throw new GraphQlInputException(
+                __('Customer Address %1 is set as default billing address and can not be deleted', [$address->getId()])
+            );
+        }
+        if ($address->isDefaultShipping()) {
+            throw new GraphQlInputException(
+                __('Customer Address %1 is set as default shipping address and can not be deleted', [$address->getId()])
+            );
+        }
+
+        try {
+            $this->addressRepository->delete($address);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
similarity index 80%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
index 9640953032ac6..a4649bccc02e8 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
@@ -17,9 +17,9 @@
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
- * Customer Address field data provider, used for GraphQL request processing.
+ * Transform single customer address data from object to in array format
  */
-class CustomerAddressDataProvider
+class ExtractCustomerAddressData
 {
     /**
      * @var ServiceOutputProcessor
@@ -82,24 +82,27 @@ private function curateAddressDefaultValues(array $address, AddressInterface $ad
     /**
      * Transform single customer address data from object to in array format
      *
-     * @param AddressInterface $addressObject
+     * @param AddressInterface $address
      * @return array
      */
-    public function getAddressData(AddressInterface $addressObject): array
+    public function execute(AddressInterface $address): array
     {
-        $address = $this->serviceOutputProcessor->process(
-            $addressObject,
+        $addressData = $this->serviceOutputProcessor->process(
+            $address,
             AddressRepositoryInterface::class,
             'getById'
         );
-        $address = $this->curateAddressDefaultValues($address, $addressObject);
+        $addressData = $this->curateAddressDefaultValues($addressData, $address);
 
-        if (isset($address[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
-            $address = array_merge($address, $address[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY]);
+        if (isset($addressData[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
+            $addressData = array_merge(
+                $addressData,
+                $addressData[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY]
+            );
         }
         $customAttributes = [];
-        if (isset($address[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES])) {
-            foreach ($address[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES] as $attribute) {
+        if (isset($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES])) {
+            foreach ($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES] as $attribute) {
                 $isArray = false;
                 if (is_array($attribute['value'])) {
                     $isArray = true;
@@ -120,8 +123,8 @@ public function getAddressData(AddressInterface $addressObject): array
                 $customAttributes[$attribute['attribute_code']] = $attribute['value'];
             }
         }
-        $address = array_merge($address, $customAttributes);
+        $addressData = array_merge($addressData, $customAttributes);
 
-        return $address;
+        return $addressData;
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddress.php
similarity index 90%
rename from app/code/Magento/QuoteGraphQl/Model/Cart/GetCustomerAddress.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddress.php
index 93c888a1d0bd2..7258f2e726fd7 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddress.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\QuoteGraphQl\Model\Cart;
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
@@ -16,7 +16,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 
 /**
- * Get customer address. Throws exception if customer is not owner of address
+ * Get customer address
  */
 class GetCustomerAddress
 {
@@ -52,13 +52,13 @@ public function execute(int $addressId, int $customerId): AddressInterface
                 __('Could not find a address with ID "%address_id"', ['address_id' => $addressId])
             );
         } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
+            throw new GraphQlInputException(__($e->getMessage()), $e);
         }
 
         if ((int)$customerAddress->getCustomerId() !== $customerId) {
             throw new GraphQlAuthorizationException(
                 __(
-                    'The current user cannot use address with ID "%address_id"',
+                    'Current customer does not have permission to address with ID "%address_id"',
                     ['address_id' => $addressId]
                 )
             );
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php
deleted file mode 100644
index f7323402a6c62..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CustomerGraphQl\Model\Customer\Address;
-
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\Data\AddressInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-
-/**
- * Get customer address for user
- */
-class GetCustomerAddressForUser
-{
-    /**
-     * @var AddressRepositoryInterface
-     */
-    private $addressRepository;
-
-    /**
-     * @param AddressRepositoryInterface $addressRepository
-     */
-    public function __construct(AddressRepositoryInterface $addressRepository)
-    {
-        $this->addressRepository = $addressRepository;
-    }
-
-    /**
-     * Get customer address for user
-     *
-     * @param int $addressId
-     * @param int $userId
-     * @return AddressInterface
-     * @throws GraphQlAuthorizationException
-     * @throws GraphQlNoSuchEntityException
-     */
-    public function execute(int $addressId, int $userId): AddressInterface
-    {
-        try {
-            /** @var AddressInterface $address */
-            $address = $this->addressRepository->getById($addressId);
-        } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(
-                __('Address id %1 does not exist.', [$addressId])
-            );
-        }
-
-        if ($address->getCustomerId() != $userId) {
-            throw new GraphQlAuthorizationException(
-                __('Current customer does not have permission to address id %1', [$addressId])
-            );
-        }
-        return $address;
-    }
-}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php
new file mode 100644
index 0000000000000..65745a20bc8eb
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Api\DataObjectHelper;
+
+/**
+ * Update customer address
+ */
+class UpdateCustomerAddress
+{
+    /**
+     * @var GetAllowedAddressAttributes
+     */
+    private $getAllowedAddressAttributes;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var array
+     */
+    private $restrictedKeys;
+
+    /**
+     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
+     * @param AddressRepositoryInterface $addressRepository
+     * @param DataObjectHelper $dataObjectHelper
+     * @param array $restrictedKeys
+     */
+    public function __construct(
+        GetAllowedAddressAttributes $getAllowedAddressAttributes,
+        AddressRepositoryInterface $addressRepository,
+        DataObjectHelper $dataObjectHelper,
+        array $restrictedKeys = []
+    ) {
+        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
+        $this->addressRepository = $addressRepository;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->restrictedKeys = $restrictedKeys;
+    }
+
+    /**
+     * Update customer address
+     *
+     * @param AddressInterface $address
+     * @param array $data
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function execute(AddressInterface $address, array $data): void
+    {
+        $this->validateData($data);
+
+        $filteredData = array_diff_key($data, array_flip($this->restrictedKeys));
+        $this->dataObjectHelper->populateWithArray($address, $filteredData, AddressInterface::class);
+
+        if (isset($data['region']['region_id'])) {
+            $address->setRegionId($address->getRegion()->getRegionId());
+        }
+
+        try {
+            $this->addressRepository->save($address);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+    }
+
+    /**
+     * Validate customer address update data
+     *
+     * @param array $addressData
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function validateData(array $addressData): void
+    {
+        $attributes = $this->getAllowedAddressAttributes->execute();
+        $errorInput = [];
+
+        foreach ($attributes as $attributeName => $attributeInfo) {
+            if ($attributeInfo->getIsRequired()
+                && (isset($addressData[$attributeName]) && empty($addressData[$attributeName]))
+            ) {
+                $errorInput[] = $attributeName;
+            }
+        }
+
+        if ($errorInput) {
+            throw new GraphQlInputException(
+                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php
index f3c03e5fc18aa..3cc831e1ca40e 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php
@@ -9,7 +9,12 @@
 
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 
 /**
  * Check customer password
@@ -36,15 +41,21 @@ public function __construct(
      * @param string $password
      * @param int $customerId
      * @throws GraphQlAuthenticationException
+     * @throws GraphQlInputException
+     * @throws GraphQlNoSuchEntityException
      */
     public function execute(string $password, int $customerId)
     {
         try {
             $this->authentication->authenticate($customerId, $password);
         } catch (InvalidEmailOrPasswordException $e) {
-            throw new GraphQlAuthenticationException(
-                __('The password doesn\'t match this account. Verify the password and try again.')
-            );
+            throw new GraphQlAuthenticationException(__($e->getMessage()), $e);
+        } catch (UserLockedException $e) {
+            throw new GraphQlAuthenticationException(__($e->getMessage()), $e);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
         }
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
similarity index 62%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
index 4a4b5c863528b..b7b66df042467 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
@@ -12,13 +12,13 @@
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Class CreateAccount creates new customer account
+ * Create new customer account
  */
-class CreateAccount
+class CreateCustomerAccount
 {
     /**
      * @var DataObjectHelper
@@ -40,46 +40,73 @@ class CreateAccount
      */
     private $storeManager;
 
+    /**
+     * @var ChangeSubscriptionStatus
+     */
+    private $changeSubscriptionStatus;
+
     /**
      * @param DataObjectHelper $dataObjectHelper
      * @param CustomerInterfaceFactory $customerFactory
      * @param StoreManagerInterface $storeManager
      * @param AccountManagementInterface $accountManagement
+     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
      */
     public function __construct(
         DataObjectHelper $dataObjectHelper,
         CustomerInterfaceFactory $customerFactory,
         StoreManagerInterface $storeManager,
-        AccountManagementInterface $accountManagement
+        AccountManagementInterface $accountManagement,
+        ChangeSubscriptionStatus $changeSubscriptionStatus
     ) {
         $this->dataObjectHelper = $dataObjectHelper;
         $this->customerFactory = $customerFactory;
         $this->accountManagement = $accountManagement;
         $this->storeManager = $storeManager;
+        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
     }
 
     /**
      * Creates new customer account
      *
-     * @param array $args
+     * @param array $data
+     * @return CustomerInterface
+     * @throws GraphQlInputException
+     */
+    public function execute(array $data): CustomerInterface
+    {
+        try {
+            $customer = $this->createAccount($data);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()));
+        }
+
+        if (isset($data['is_subscribed'])) {
+            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
+        }
+        return $customer;
+    }
+
+    /**
+     * Create account
+     *
+     * @param array $data
      * @return CustomerInterface
      * @throws LocalizedException
-     * @throws NoSuchEntityException
      */
-    public function execute(array $args): CustomerInterface
+    private function createAccount(array $data): CustomerInterface
     {
         $customerDataObject = $this->customerFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $customerDataObject,
-            $args['input'],
+            $data,
             CustomerInterface::class
         );
         $store = $this->storeManager->getStore();
         $customerDataObject->setWebsiteId($store->getWebsiteId());
         $customerDataObject->setStoreId($store->getId());
 
-        $password = array_key_exists('password', $args['input']) ? $args['input']['password'] : null;
-
+        $password = array_key_exists('password', $data) ? $data['password'] : null;
         return $this->accountManagement->createAccount($customerDataObject, $password);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
similarity index 72%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
index c8382593eab23..de37482aca056 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
@@ -9,22 +9,15 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Webapi\ServiceOutputProcessor;
 use Magento\Customer\Api\Data\CustomerInterface;
 
 /**
- * Customer field data provider, used for GraphQL request processing.
+ * Transform single customer data from object to in array format
  */
-class CustomerDataProvider
+class ExtractCustomerData
 {
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepository;
-
     /**
      * @var ServiceOutputProcessor
      */
@@ -36,47 +29,24 @@ class CustomerDataProvider
     private $serializer;
 
     /**
-     * @param CustomerRepositoryInterface $customerRepository
      * @param ServiceOutputProcessor $serviceOutputProcessor
      * @param SerializerInterface $serializer
      */
     public function __construct(
-        CustomerRepositoryInterface $customerRepository,
         ServiceOutputProcessor $serviceOutputProcessor,
         SerializerInterface $serializer
     ) {
-        $this->customerRepository = $customerRepository;
         $this->serviceOutputProcessor = $serviceOutputProcessor;
         $this->serializer = $serializer;
     }
 
-    /**
-     * Get customer data by Id or empty array
-     *
-     * @param int $customerId
-     * @return array
-     * @throws NoSuchEntityException|LocalizedException
-     */
-    public function getCustomerById(int $customerId): array
-    {
-        try {
-            $customer = $this->customerRepository->getById($customerId);
-        } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(
-                __('Customer id "%customer_id" does not exist.', ['customer_id' => $customerId]),
-                $e
-            );
-        }
-        return $this->processCustomer($customer);
-    }
-
     /**
      * Curate default shipping and default billing keys
      *
      * @param array $arrayAddress
      * @return array
      */
-    private function curateAddressData(array $arrayAddress) : array
+    private function curateAddressData(array $arrayAddress): array
     {
         foreach ($arrayAddress as $key => $address) {
             if (!isset($address['default_shipping'])) {
@@ -94,8 +64,9 @@ private function curateAddressData(array $arrayAddress) : array
      *
      * @param CustomerInterface $customer
      * @return array
+     * @throws LocalizedException
      */
-    private function processCustomer(CustomerInterface $customer): array
+    public function execute(CustomerInterface $customer): array
     {
         $customerData = $this->serviceOutputProcessor->process(
             $customer,
@@ -131,6 +102,7 @@ private function processCustomer(CustomerInterface $customer): array
         }
         $customerData = array_merge($customerData, $customAttributes);
 
+        $customerData['model'] = $customer;
         return $customerData;
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
similarity index 79%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerAccount.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
index b2f524c877fd6..8bd5c9157493c 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerAccount.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
@@ -10,6 +10,7 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -17,11 +18,12 @@
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 
 /**
- * Check customer account
+ * Get customer
  */
-class CheckCustomerAccount
+class GetCustomer
 {
     /**
      * @var AuthenticationInterface
@@ -54,39 +56,41 @@ public function __construct(
     }
 
     /**
-     * Check customer account
+     * Get customer
      *
-     * @param int|null $customerId
-     * @param int|null $customerType
-     * @return void
+     * @param ContextInterface $context
+     * @return CustomerInterface
+     * @throws GraphQlAuthenticationException
      * @throws GraphQlAuthorizationException
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
-     * @throws GraphQlAuthenticationException
      */
-    public function execute(?int $customerId, ?int $customerType): void
+    public function execute(ContextInterface $context): CustomerInterface
     {
-        if (true === $this->isCustomerGuest($customerId, $customerType)) {
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        if (true === $this->isUserGuest($currentUserId, $currentUserType)) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
         try {
-            $this->customerRepository->getById($customerId);
+            $customer = $this->customerRepository->getById($currentUserId);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(
-                __('Customer with id "%customer_id" does not exist.', ['customer_id' => $customerId]),
+                __('Customer with id "%customer_id" does not exist.', ['customer_id' => $currentUserId]),
                 $e
             );
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
 
-        if (true === $this->authentication->isLocked($customerId)) {
+        if (true === $this->authentication->isLocked($currentUserId)) {
             throw new GraphQlAuthenticationException(__('The account is locked.'));
         }
 
         try {
-            $confirmationStatus = $this->accountManagement->getConfirmationStatus($customerId);
+            $confirmationStatus = $this->accountManagement->getConfirmationStatus($currentUserId);
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
@@ -94,6 +98,7 @@ public function execute(?int $customerId, ?int $customerType): void
         if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
             throw new GraphQlAuthenticationException(__("This account isn't confirmed. Verify and try again."));
         }
+        return $customer;
     }
 
     /**
@@ -103,7 +108,7 @@ public function execute(?int $customerId, ?int $customerType): void
      * @param int|null $customerType
      * @return bool
      */
-    private function isCustomerGuest(?int $customerId, ?int $customerType): bool
+    private function isUserGuest(?int $customerId, ?int $customerType): bool
     {
         if (null === $customerId || null === $customerType) {
             return true;
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php
new file mode 100644
index 0000000000000..1605c63b62f4c
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Customer\Api\Data\CustomerInterface;
+
+/**
+ * Save customer
+ */
+class SaveCustomer
+{
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @param CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Save customer
+     *
+     * @param CustomerInterface $customer
+     * @throws GraphQlAlreadyExistsException
+     * @throws GraphQlAuthenticationException
+     * @throws GraphQlInputException
+     */
+    public function execute(CustomerInterface $customer): void
+    {
+        try {
+            $this->customerRepository->save($customer);
+        } catch (AlreadyExistsException $e) {
+            throw new GraphQlAlreadyExistsException(
+                __('A customer with the same email address already exists in an associated website.'),
+                $e
+            );
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php b/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
deleted file mode 100644
index 1fcf1c0d7c1c3..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CustomerGraphQl\Model\Customer;
-
-use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-use Magento\Authorization\Model\UserContextInterface;
-
-/**
- * Set up user context after creating new customer account
- */
-class SetUpUserContext
-{
-    /**
-     * Set up user context after creating new customer account
-     *
-     * @param ContextInterface $context
-     * @param CustomerInterface $customer
-     */
-    public function execute(ContextInterface $context, CustomerInterface $customer)
-    {
-        $context->setUserId((int)$customer->getId());
-        $context->setUserType(UserContextInterface::USER_TYPE_CUSTOMER);
-    }
-}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
new file mode 100644
index 0000000000000..8601d586b3c95
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Api\DataObjectHelper;
+
+/**
+ * Update customer account data
+ */
+class UpdateCustomerAccount
+{
+    /**
+     * @var SaveCustomer
+     */
+    private $saveCustomer;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var CheckCustomerPassword
+     */
+    private $checkCustomerPassword;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var ChangeSubscriptionStatus
+     */
+    private $changeSubscriptionStatus;
+
+    /**
+     * @var array
+     */
+    private $restrictedKeys;
+
+    /**
+     * @param SaveCustomer $saveCustomer
+     * @param StoreManagerInterface $storeManager
+     * @param CheckCustomerPassword $checkCustomerPassword
+     * @param DataObjectHelper $dataObjectHelper
+     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
+     * @param array $restrictedKeys
+     */
+    public function __construct(
+        SaveCustomer $saveCustomer,
+        StoreManagerInterface $storeManager,
+        CheckCustomerPassword $checkCustomerPassword,
+        DataObjectHelper $dataObjectHelper,
+        ChangeSubscriptionStatus $changeSubscriptionStatus,
+        array $restrictedKeys = []
+    ) {
+        $this->saveCustomer = $saveCustomer;
+        $this->storeManager = $storeManager;
+        $this->checkCustomerPassword = $checkCustomerPassword;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->restrictedKeys = $restrictedKeys;
+        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
+    }
+
+    /**
+     * Update customer account data
+     *
+     * @param CustomerInterface $customer
+     * @param array $data
+     * @return void
+     * @throws GraphQlAlreadyExistsException
+     * @throws GraphQlAuthenticationException
+     * @throws GraphQlInputException
+     */
+    public function execute(CustomerInterface $customer, array $data): void
+    {
+        if (isset($data['email']) && $customer->getEmail() !== $data['email']) {
+            if (!isset($data['password']) || empty($data['password'])) {
+                throw new GraphQlInputException(__('Provide the current "password" to change "email".'));
+            }
+
+            $this->checkCustomerPassword->execute($data['password'], (int)$customer->getId());
+            $customer->setEmail($data['email']);
+        }
+
+        $filteredData = array_diff_key($data, array_flip($this->restrictedKeys));
+        $this->dataObjectHelper->populateWithArray($customer, $filteredData, CustomerInterface::class);
+
+        $customer->setStoreId($this->storeManager->getStore()->getId());
+
+        $this->saveCustomer->execute($customer);
+
+        if (isset($data['is_subscribed'])) {
+            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php
deleted file mode 100644
index 18510b872e64a..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CustomerGraphQl\Model\Customer;
-
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Framework\Exception\AlreadyExistsException;
-use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Store\Model\StoreManagerInterface;
-
-/**
- * Update customer data
- */
-class UpdateCustomerData
-{
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepository;
-
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var CheckCustomerPassword
-     */
-    private $checkCustomerPassword;
-
-    /**
-     * @param CustomerRepositoryInterface $customerRepository
-     * @param StoreManagerInterface $storeManager
-     * @param CheckCustomerPassword $checkCustomerPassword
-     */
-    public function __construct(
-        CustomerRepositoryInterface $customerRepository,
-        StoreManagerInterface $storeManager,
-        CheckCustomerPassword $checkCustomerPassword
-    ) {
-        $this->customerRepository = $customerRepository;
-        $this->storeManager = $storeManager;
-        $this->checkCustomerPassword = $checkCustomerPassword;
-    }
-
-    /**
-     * Update account information
-     *
-     * @param int $customerId
-     * @param array $data
-     * @return void
-     * @throws GraphQlNoSuchEntityException
-     * @throws GraphQlInputException
-     * @throws GraphQlAlreadyExistsException
-     */
-    public function execute(int $customerId, array $data): void
-    {
-        $customer = $this->customerRepository->getById($customerId);
-
-        if (isset($data['firstname'])) {
-            $customer->setFirstname($data['firstname']);
-        }
-
-        if (isset($data['lastname'])) {
-            $customer->setLastname($data['lastname']);
-        }
-
-        if (isset($data['email']) && $customer->getEmail() !== $data['email']) {
-            if (!isset($data['password']) || empty($data['password'])) {
-                throw new GraphQlInputException(__('Provide the current "password" to change "email".'));
-            }
-
-            $this->checkCustomerPassword->execute($data['password'], $customerId);
-            $customer->setEmail($data['email']);
-        }
-
-        $customer->setStoreId($this->storeManager->getStore()->getId());
-
-        try {
-            $this->customerRepository->save($customer);
-        } catch (AlreadyExistsException $e) {
-            throw new GraphQlAlreadyExistsException(
-                __('A customer with the same email address already exists in an associated website.'),
-                $e
-            );
-        }
-    }
-}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
index 78fa852a7ac59..317b7725b0265 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
@@ -9,8 +9,9 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerPassword;
-use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -22,9 +23,9 @@
 class ChangePassword implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var CheckCustomerPassword
@@ -37,26 +38,26 @@ class ChangePassword implements ResolverInterface
     private $accountManagement;
 
     /**
-     * @var CustomerDataProvider
+     * @var ExtractCustomerData
      */
-    private $customerDataProvider;
+    private $extractCustomerData;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param CheckCustomerPassword $checkCustomerPassword
      * @param AccountManagementInterface $accountManagement
-     * @param CustomerDataProvider $customerDataProvider
+     * @param ExtractCustomerData $extractCustomerData
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         CheckCustomerPassword $checkCustomerPassword,
         AccountManagementInterface $accountManagement,
-        CustomerDataProvider $customerDataProvider
+        ExtractCustomerData $extractCustomerData
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->checkCustomerPassword = $checkCustomerPassword;
         $this->accountManagement = $accountManagement;
-        $this->customerDataProvider = $customerDataProvider;
+        $this->extractCustomerData = $extractCustomerData;
     }
 
     /**
@@ -69,24 +70,24 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($args['currentPassword'])) {
+        if (!isset($args['currentPassword']) || '' == trim($args['currentPassword'])) {
             throw new GraphQlInputException(__('Specify the "currentPassword" value.'));
         }
 
-        if (!isset($args['newPassword'])) {
+        if (!isset($args['newPassword']) || '' == trim($args['newPassword'])) {
             throw new GraphQlInputException(__('Specify the "newPassword" value.'));
         }
 
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+        $customer = $this->getCustomer->execute($context);
+        $customerId = (int)$customer->getId();
 
-        $currentUserId = (int)$currentUserId;
-        $this->checkCustomerPassword->execute($args['currentPassword'], $currentUserId);
+        $this->checkCustomerPassword->execute($args['currentPassword'], $customerId);
 
-        $this->accountManagement->changePasswordById($currentUserId, $args['currentPassword'], $args['newPassword']);
-
-        $data = $this->customerDataProvider->getCustomerById($currentUserId);
-        return $data;
+        try {
+            $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+        return $this->extractCustomerData->execute($customer);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
index 299045c6b62b0..1ae22bcc12792 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
@@ -7,16 +7,13 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\ChangeSubscriptionStatus;
-use Magento\CustomerGraphQl\Model\Customer\CreateAccount;
-use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
-use Magento\CustomerGraphQl\Model\Customer\SetUpUserContext;
-use Magento\Framework\Exception\State\InputMismatchException;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\CustomerGraphQl\Model\Customer\CreateCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\Validator\Exception as ValidatorException;
 
 /**
  * Create customer account resolver
@@ -24,41 +21,25 @@
 class CreateCustomer implements ResolverInterface
 {
     /**
-     * @var CustomerDataProvider
+     * @var ExtractCustomerData
      */
-    private $customerDataProvider;
+    private $extractCustomerData;
 
     /**
-     * @var ChangeSubscriptionStatus
+     * @var CreateCustomerAccount
      */
-    private $changeSubscriptionStatus;
+    private $createCustomerAccount;
 
     /**
-     * @var CreateAccount
-     */
-    private $createAccount;
-
-    /**
-     * @var SetUpUserContext
-     */
-    private $setUpUserContext;
-
-    /**
-     * @param CustomerDataProvider $customerDataProvider
-     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
-     * @param SetUpUserContext $setUpUserContext
-     * @param CreateAccount $createAccount
+     * @param ExtractCustomerData $extractCustomerData
+     * @param CreateCustomerAccount $createCustomerAccount
      */
     public function __construct(
-        CustomerDataProvider $customerDataProvider,
-        ChangeSubscriptionStatus $changeSubscriptionStatus,
-        SetUpUserContext $setUpUserContext,
-        CreateAccount $createAccount
+        ExtractCustomerData $extractCustomerData,
+        CreateCustomerAccount $createCustomerAccount
     ) {
-        $this->customerDataProvider = $customerDataProvider;
-        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
-        $this->createAccount = $createAccount;
-        $this->setUpUserContext = $setUpUserContext;
+        $this->extractCustomerData = $extractCustomerData;
+        $this->createCustomerAccount = $createCustomerAccount;
     }
 
     /**
@@ -74,22 +55,13 @@ public function resolve(
         if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
             throw new GraphQlInputException(__('"input" value should be specified'));
         }
-        try {
-            $customer = $this->createAccount->execute($args);
-            $customerId = (int)$customer->getId();
-            $this->setUpUserContext->execute($context, $customer);
-            if (array_key_exists('is_subscribed', $args['input'])) {
-                if ($args['input']['is_subscribed']) {
-                    $this->changeSubscriptionStatus->execute($customerId, true);
-                }
-            }
-            $data = $this->customerDataProvider->getCustomerById($customerId);
-        } catch (ValidatorException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
-        } catch (InputMismatchException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
-        }
 
+        $customer = $this->createCustomerAccount->execute($args['input']);
+
+        $context->setUserId((int)$customer->getId());
+        $context->setUserType(UserContextInterface::USER_TYPE_CUSTOMER);
+
+        $data = $this->extractCustomerData->execute($customer);
         return ['customer' => $data];
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
index 823444e5a2d7d..fd8122de961ee 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
@@ -7,14 +7,9 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\Data\AddressInterfaceFactory;
-use Magento\Customer\Api\Data\AddressInterface;
-use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressCreateDataValidator;
-use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressDataProvider;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
-use Magento\Framework\Api\DataObjectHelper;
-use Magento\Framework\Exception\InputException;
+use Magento\CustomerGraphQl\Model\Customer\Address\CreateCustomerAddress as CreateCustomerAddressModel;
+use Magento\CustomerGraphQl\Model\Customer\Address\ExtractCustomerAddressData;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -26,57 +21,33 @@
 class CreateCustomerAddress implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
-     * @var AddressRepositoryInterface
+     * @var CreateCustomerAddressModel
      */
-    private $addressRepository;
+    private $createCustomerAddress;
 
     /**
-     * @var AddressInterfaceFactory
+     * @var ExtractCustomerAddressData
      */
-    private $addressInterfaceFactory;
+    private $extractCustomerAddressData;
 
     /**
-     * @var CustomerAddressDataProvider
-     */
-    private $customerAddressDataProvider;
-
-    /**
-     * @var DataObjectHelper
-     */
-    private $dataObjectHelper;
-
-    /**
-     * @var CustomerAddressCreateDataValidator
-     */
-    private $customerAddressCreateDataValidator;
-
-    /**
-     * @param CheckCustomerAccount $checkCustomerAccount
-     * @param AddressRepositoryInterface $addressRepository
-     * @param AddressInterfaceFactory $addressInterfaceFactory
-     * @param CustomerAddressDataProvider $customerAddressDataProvider
-     * @param DataObjectHelper $dataObjectHelper
-     * @param CustomerAddressCreateDataValidator $customerAddressCreateDataValidator
+     * @param GetCustomer $getCustomer
+     * @param CreateCustomerAddressModel $createCustomerAddress
+     * @param ExtractCustomerAddressData $extractCustomerAddressData
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
-        AddressRepositoryInterface $addressRepository,
-        AddressInterfaceFactory $addressInterfaceFactory,
-        CustomerAddressDataProvider $customerAddressDataProvider,
-        DataObjectHelper $dataObjectHelper,
-        CustomerAddressCreateDataValidator $customerAddressCreateDataValidator
+        GetCustomer $getCustomer,
+        CreateCustomerAddressModel $createCustomerAddress,
+        ExtractCustomerAddressData $extractCustomerAddressData
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->addressRepository = $addressRepository;
-        $this->addressInterfaceFactory = $addressInterfaceFactory;
-        $this->customerAddressDataProvider = $customerAddressDataProvider;
-        $this->dataObjectHelper = $dataObjectHelper;
-        $this->customerAddressCreateDataValidator = $customerAddressCreateDataValidator;
+        $this->getCustomer = $getCustomer;
+        $this->createCustomerAddress = $createCustomerAddress;
+        $this->extractCustomerAddressData = $extractCustomerAddressData;
     }
 
     /**
@@ -89,36 +60,13 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
-
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-        $this->customerAddressCreateDataValidator->validate($args['input']);
-
-        $address = $this->createCustomerAddress((int)$currentUserId, $args['input']);
-        return $this->customerAddressDataProvider->getAddressData($address);
-    }
+        if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
+            throw new GraphQlInputException(__('"input" value should be specified'));
+        }
 
-    /**
-     * Create customer address
-     *
-     * @param int $customerId
-     * @param array $addressData
-     * @return AddressInterface
-     * @throws GraphQlInputException
-     */
-    private function createCustomerAddress(int $customerId, array $addressData) : AddressInterface
-    {
-        /** @var AddressInterface $address */
-        $address = $this->addressInterfaceFactory->create();
-        $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
-        $address->setCustomerId($customerId);
+        $customer = $this->getCustomer->execute($context);
 
-        try {
-            $address = $this->addressRepository->save($address);
-        } catch (InputException $e) {
-            throw new GraphQlInputException(__($e->getMessage()), $e);
-        }
-        return $address;
+        $address = $this->createCustomerAddress->execute((int)$customer->getId(), $args['input']);
+        return $this->extractCustomerAddressData->execute($address);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
index c3c78a1004da6..91048d4836c80 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
@@ -7,9 +7,9 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
@@ -19,25 +19,25 @@
 class Customer implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
-     * @var CustomerDataProvider
+     * @var ExtractCustomerData
      */
-    private $customerDataProvider;
+    private $extractCustomerData;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
-     * @param CustomerDataProvider $customerDataProvider
+     * @param GetCustomer $getCustomer
+     * @param ExtractCustomerData $extractCustomerData
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
-        CustomerDataProvider $customerDataProvider
+        GetCustomer $getCustomer,
+        ExtractCustomerData $extractCustomerData
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->customerDataProvider = $customerDataProvider;
+        $this->getCustomer = $getCustomer;
+        $this->extractCustomerData = $extractCustomerData;
     }
 
     /**
@@ -50,13 +50,8 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
+        $customer = $this->getCustomer->execute($context);
 
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        $currentUserId = (int)$currentUserId;
-        $data = $this->customerDataProvider->getCustomerById($currentUserId);
-        return $data;
+        return $this->extractCustomerData->execute($customer);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php
new file mode 100644
index 0000000000000..e6e3887de423c
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Customer\Model\Customer;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\CustomerGraphQl\Model\Customer\Address\ExtractCustomerAddressData;
+
+/**
+ * Customers addresses field resolver
+ */
+class CustomerAddresses implements ResolverInterface
+{
+    /**
+     * @var GetCustomer
+     */
+    private $getCustomer;
+
+    /**
+     * @var ExtractCustomerAddressData
+     */
+    private $extractCustomerAddressData;
+
+    /**
+     * @param GetCustomer $getCustomer
+     * @param ExtractCustomerAddressData $extractCustomerAddressData
+     */
+    public function __construct(
+        GetCustomer $getCustomer,
+        ExtractCustomerAddressData $extractCustomerAddressData
+    ) {
+        $this->getCustomer = $getCustomer;
+        $this->extractCustomerAddressData = $extractCustomerAddressData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        /** @var Customer $customer */
+        $customer = $value['model'];
+
+        $addressesData = [];
+        $addresses = $customer->getAddresses();
+
+        if (count($addresses)) {
+            foreach ($addresses as $address) {
+                $addressesData[] = $this->extractCustomerAddressData->execute($address);
+            }
+        }
+        return $addressesData;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
index 084857c84d5a4..08e82d930f268 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
@@ -7,14 +7,13 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddressForUser;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\Address\DeleteCustomerAddress as DeleteCustomerAddressModel;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 
 /**
  * Customers address delete, used for GraphQL request processing.
@@ -22,33 +21,33 @@
 class DeleteCustomerAddress implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
-     * @var AddressRepositoryInterface
+     * @var GetCustomerAddress
      */
-    private $addressRepository;
+    private $getCustomerAddress;
 
     /**
-     * @var GetCustomerAddressForUser
+     * @var DeleteCustomerAddressModel
      */
-    private $getCustomerAddressForUser;
+    private $deleteCustomerAddress;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
-     * @param AddressRepositoryInterface $addressRepository
-     * @param GetCustomerAddressForUser $getCustomerAddressForUser
+     * @param GetCustomer $getCustomer
+     * @param GetCustomerAddress $getCustomerAddress
+     * @param DeleteCustomerAddressModel $deleteCustomerAddress
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
-        AddressRepositoryInterface $addressRepository,
-        GetCustomerAddressForUser $getCustomerAddressForUser
+        GetCustomer $getCustomer,
+        GetCustomerAddress $getCustomerAddress,
+        DeleteCustomerAddressModel $deleteCustomerAddress
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->addressRepository = $addressRepository;
-        $this->getCustomerAddressForUser = $getCustomerAddressForUser;
+        $this->getCustomer = $getCustomer;
+        $this->getCustomerAddress = $getCustomerAddress;
+        $this->deleteCustomerAddress = $deleteCustomerAddress;
     }
 
     /**
@@ -61,36 +60,14 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
-
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+        if (!isset($args['id']) || empty($args['id'])) {
+            throw new GraphQlInputException(__('Address "id" value should be specified'));
+        }
 
-        return $this->deleteCustomerAddress((int)$currentUserId, (int)$args['id']);
-    }
+        $customer = $this->getCustomer->execute($context);
+        $address = $this->getCustomerAddress->execute((int)$args['id'], (int)$customer->getId());
 
-    /**
-     * Delete customer address
-     *
-     * @param int $customerId
-     * @param int $addressId
-     * @return bool
-     * @throws GraphQlAuthorizationException
-     * @throws GraphQlNoSuchEntityException
-     */
-    private function deleteCustomerAddress($customerId, $addressId)
-    {
-        $address = $this->getCustomerAddressForUser->execute($addressId, $customerId);
-        if ($address->isDefaultBilling()) {
-            throw new GraphQlAuthorizationException(
-                __('Customer Address %1 is set as default billing address and can not be deleted', [$addressId])
-            );
-        }
-        if ($address->isDefaultShipping()) {
-            throw new GraphQlAuthorizationException(
-                __('Customer Address %1 is set as default shipping address and can not be deleted', [$addressId])
-            );
-        }
-        return $this->addressRepository->delete($address);
+        $this->deleteCustomerAddress->execute($address);
+        return true;
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php
index 11ad0f77f8949..ddf1aec275ece 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php
@@ -8,6 +8,7 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -42,11 +43,15 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $email = $args['email'] ?? null;
-        if (!$email) {
+        if (!isset($args['email']) || empty($args['email'])) {
             throw new GraphQlInputException(__('"Email should be specified'));
         }
-        $isEmailAvailable = $this->accountManagement->isEmailAvailable($email);
+
+        try {
+            $isEmailAvailable = $this->accountManagement->isEmailAvailable($args['email']);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
 
         return [
             'is_email_available' => $isEmailAvailable
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
index c0bd864b3ee09..fc5691d97cbfe 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
@@ -7,7 +7,7 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -19,9 +19,9 @@
 class IsSubscribed implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var SubscriberFactory
@@ -29,14 +29,14 @@ class IsSubscribed implements ResolverInterface
     private $subscriberFactory;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param SubscriberFactory $subscriberFactory
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         SubscriberFactory $subscriberFactory
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->subscriberFactory = $subscriberFactory;
     }
 
@@ -50,12 +50,9 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
+        $customer = $this->getCustomer->execute($context);
 
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        $status = $this->subscriberFactory->create()->loadByCustomerId((int)$currentUserId)->isSubscribed();
+        $status = $this->subscriberFactory->create()->loadByCustomerId((int)$customer->getId())->isSubscribed();
         return (bool)$status;
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
index 3301162dc0088..92779597e5afa 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
@@ -7,7 +7,7 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
@@ -19,9 +19,9 @@
 class RevokeCustomerToken implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var CustomerTokenServiceInterface
@@ -29,14 +29,14 @@ class RevokeCustomerToken implements ResolverInterface
     private $customerTokenService;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param CustomerTokenServiceInterface $customerTokenService
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         CustomerTokenServiceInterface $customerTokenService
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->customerTokenService = $customerTokenService;
     }
 
@@ -50,11 +50,8 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
+        $customer = $this->getCustomer->execute($context);
 
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        return ['result' => $this->customerTokenService->revokeCustomerAccessToken((int)$currentUserId)];
+        return ['result' => $this->customerTokenService->revokeCustomerAccessToken((int)$customer->getId())];
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
index 50760d2e2e31c..7e06a2a063b4b 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
@@ -7,12 +7,11 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\ChangeSubscriptionStatus;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
-use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerData;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerAccount;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
@@ -22,41 +21,33 @@
 class UpdateCustomer implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
-     * @var UpdateCustomerData
+     * @var UpdateCustomerAccount
      */
-    private $updateCustomerData;
+    private $updateCustomerAccount;
 
     /**
-     * @var ChangeSubscriptionStatus
+     * @var ExtractCustomerData
      */
-    private $changeSubscriptionStatus;
+    private $extractCustomerData;
 
     /**
-     * @var CustomerDataProvider
-     */
-    private $customerDataProvider;
-
-    /**
-     * @param CheckCustomerAccount $checkCustomerAccount
-     * @param UpdateCustomerData $updateCustomerData
-     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
-     * @param CustomerDataProvider $customerDataProvider
+     * @param GetCustomer $getCustomer
+     * @param UpdateCustomerAccount $updateCustomerAccount
+     * @param ExtractCustomerData $extractCustomerData
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
-        UpdateCustomerData $updateCustomerData,
-        ChangeSubscriptionStatus $changeSubscriptionStatus,
-        CustomerDataProvider $customerDataProvider
+        GetCustomer $getCustomer,
+        UpdateCustomerAccount $updateCustomerAccount,
+        ExtractCustomerData $extractCustomerData
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->updateCustomerData = $updateCustomerData;
-        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
-        $this->customerDataProvider = $customerDataProvider;
+        $this->getCustomer = $getCustomer;
+        $this->updateCustomerAccount = $updateCustomerAccount;
+        $this->extractCustomerData = $extractCustomerData;
     }
 
     /**
@@ -73,19 +64,10 @@ public function resolve(
             throw new GraphQlInputException(__('"input" value should be specified'));
         }
 
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
-
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        $currentUserId = (int)$currentUserId;
-        $this->updateCustomerData->execute($currentUserId, $args['input']);
-
-        if (isset($args['input']['is_subscribed'])) {
-            $this->changeSubscriptionStatus->execute($currentUserId, (bool)$args['input']['is_subscribed']);
-        }
+        $customer = $this->getCustomer->execute($context);
+        $this->updateCustomerAccount->execute($customer, $args['input']);
 
-        $data = $this->customerDataProvider->getCustomerById($currentUserId);
+        $data = $this->extractCustomerData->execute($customer);
         return ['customer' => $data];
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
index 833ab2e450280..bf41b7ddd10c9 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
@@ -7,13 +7,11 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\Data\AddressInterface;
-use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressDataProvider;
-use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressUpdateDataValidator;
-use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddressForUser;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
-use Magento\Framework\Api\DataObjectHelper;
+use Magento\CustomerGraphQl\Model\Customer\Address\ExtractCustomerAddressData;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\Address\UpdateCustomerAddress as UpdateCustomerAddressModel;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -24,57 +22,41 @@
 class UpdateCustomerAddress implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
-     * @var AddressRepositoryInterface
+     * @var GetCustomerAddress
      */
-    private $addressRepository;
+    private $getCustomerAddress;
 
     /**
-     * @var CustomerAddressDataProvider
+     * @var UpdateCustomerAddressModel
      */
-    private $customerAddressDataProvider;
+    private $updateCustomerAddress;
 
     /**
-     * @var DataObjectHelper
+     * @var ExtractCustomerAddressData
      */
-    private $dataObjectHelper;
+    private $extractCustomerAddressData;
 
     /**
-     * @var CustomerAddressUpdateDataValidator
-     */
-    private $customerAddressUpdateDataValidator;
-
-    /**
-     * @var GetCustomerAddressForUser
-     */
-    private $getCustomerAddressForUser;
-
-    /**
-     * @param CheckCustomerAccount $checkCustomerAccount
-     * @param AddressRepositoryInterface $addressRepository
-     * @param CustomerAddressDataProvider $customerAddressDataProvider
-     * @param DataObjectHelper $dataObjectHelper
-     * @param CustomerAddressUpdateDataValidator $customerAddressUpdateDataValidator
-     * @param GetCustomerAddressForUser $getCustomerAddressForUser
+     * @param GetCustomer $getCustomer
+     * @param GetCustomerAddress $getCustomerAddress
+     * @param UpdateCustomerAddressModel $updateCustomerAddress
+     * @param ExtractCustomerAddressData $extractCustomerAddressData
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
-        AddressRepositoryInterface $addressRepository,
-        CustomerAddressDataProvider $customerAddressDataProvider,
-        DataObjectHelper $dataObjectHelper,
-        CustomerAddressUpdateDataValidator $customerAddressUpdateDataValidator,
-        GetCustomerAddressForUser $getCustomerAddressForUser
+        GetCustomer $getCustomer,
+        GetCustomerAddress $getCustomerAddress,
+        UpdateCustomerAddressModel $updateCustomerAddress,
+        ExtractCustomerAddressData $extractCustomerAddressData
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->addressRepository = $addressRepository;
-        $this->customerAddressDataProvider = $customerAddressDataProvider;
-        $this->dataObjectHelper = $dataObjectHelper;
-        $this->customerAddressUpdateDataValidator = $customerAddressUpdateDataValidator;
-        $this->getCustomerAddressForUser = $getCustomerAddressForUser;
+        $this->getCustomer = $getCustomer;
+        $this->getCustomerAddress = $getCustomerAddress;
+        $this->updateCustomerAddress = $updateCustomerAddress;
+        $this->extractCustomerAddressData = $extractCustomerAddressData;
     }
 
     /**
@@ -87,32 +69,18 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
-
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-        $this->customerAddressUpdateDataValidator->validate($args['input']);
-
-        $address = $this->updateCustomerAddress((int)$currentUserId, (int)$args['id'], $args['input']);
-        return $this->customerAddressDataProvider->getAddressData($address);
-    }
+        if (!isset($args['id']) || empty($args['id'])) {
+            throw new GraphQlInputException(__('Address "id" value should be specified'));
+        }
 
-    /**
-     * Update customer address
-     *
-     * @param int $customerId
-     * @param int $addressId
-     * @param array $addressData
-     * @return AddressInterface
-     */
-    private function updateCustomerAddress(int $customerId, int $addressId, array $addressData)
-    {
-        $address = $this->getCustomerAddressForUser->execute($addressId, $customerId);
-        $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
-        if (isset($addressData['region']['region_id'])) {
-            $address->setRegionId($address->getRegion()->getRegionId());
+        if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
+            throw new GraphQlInputException(__('"input" value should be specified'));
         }
 
-        return $this->addressRepository->save($address);
+        $customer = $this->getCustomer->execute($context);
+        $address = $this->getCustomerAddress->execute((int)$args['id'], (int)$customer->getId());
+
+        $this->updateCustomerAddress->execute($address, $args['input']);
+        return $this->extractCustomerAddressData->execute($address);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md b/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
deleted file mode 100644
index ae023224f4d9b..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Customer Graph Ql Functional Tests
-
-The Functional Test Module for **Magento Customer Graph Ql** module.
diff --git a/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml b/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..f1bd3563fda3d
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml
@@ -0,0 +1,16 @@
+<?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\CustomerGraphQl\Model\Customer\UpdateCustomerData">
+        <arguments>
+            <argument name="restrictedKeys" xsi:type="array">
+                <item name="email" xsi:type="const">Magento\Customer\Api\Data\CustomerInterface::EMAIL</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index 139ac80be8429..4e4fd1d0fa8ad 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -91,7 +91,8 @@ type Customer @doc(description: "Customer defines the customer name and address
     taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
     id: Int @doc(description: "The ID assigned to the customer")
     is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\IsSubscribed")
-    addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses")
+    addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CustomerAddresses")
+    gender: Int @doc(description: "The customer's gender(Male - 1, Female - 2)")
 }
 
 type CustomerAddress @doc(description: "CustomerAddress contains detailed information about a customer's billing and shipping addresses"){
diff --git a/app/code/Magento/Deploy/Console/DeployStaticOptions.php b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
index 89cb3e4b30345..1c02d24f7e99c 100644
--- a/app/code/Magento/Deploy/Console/DeployStaticOptions.php
+++ b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Deploy\Console;
 
+use Magento\Deploy\Process\Queue;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 
@@ -57,6 +58,11 @@ class DeployStaticOptions
      */
     const JOBS_AMOUNT = 'jobs';
 
+    /**
+     * Key for max execution time option
+     */
+    const MAX_EXECUTION_TIME = 'max-execution-time';
+
     /**
      * Force run of static deploy
      */
@@ -150,6 +156,7 @@ public function getOptionsList()
      * Basic options
      *
      * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     private function getBasicOptions()
     {
@@ -216,6 +223,13 @@ private function getBasicOptions()
                 'Enable parallel processing using the specified number of jobs.',
                 self::DEFAULT_JOBS_AMOUNT
             ),
+            new InputOption(
+                self::MAX_EXECUTION_TIME,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The maximum expected execution time of deployment static process (in seconds).',
+                Queue::DEFAULT_MAX_EXEC_TIME
+            ),
             new InputOption(
                 self::SYMLINK_LOCALE,
                 null,
diff --git a/app/code/Magento/Deploy/Service/DeployStaticContent.php b/app/code/Magento/Deploy/Service/DeployStaticContent.php
index 66ec6e7418afd..854bf50e0af2f 100644
--- a/app/code/Magento/Deploy/Service/DeployStaticContent.php
+++ b/app/code/Magento/Deploy/Service/DeployStaticContent.php
@@ -85,24 +85,26 @@ public function deploy(array $options)
             return;
         }
 
-        $queue = $this->queueFactory->create(
-            [
-                'logger' => $this->logger,
-                'options' => $options,
-                'maxProcesses' => $this->getProcessesAmount($options),
-                'deployPackageService' => $this->objectManager->create(
-                    \Magento\Deploy\Service\DeployPackage::class,
-                    [
-                        'logger' => $this->logger
-                    ]
-                )
-            ]
-        );
+        $queueOptions = [
+            'logger' => $this->logger,
+            'options' => $options,
+            'maxProcesses' => $this->getProcessesAmount($options),
+            'deployPackageService' => $this->objectManager->create(
+                \Magento\Deploy\Service\DeployPackage::class,
+                [
+                    'logger' => $this->logger
+                ]
+            )
+        ];
+
+        if (isset($options[Options::MAX_EXECUTION_TIME])) {
+            $queueOptions['maxExecTime'] = (int)$options[Options::MAX_EXECUTION_TIME];
+        }
 
         $deployStrategy = $this->deployStrategyFactory->create(
             $options[Options::STRATEGY],
             [
-                'queue' => $queue
+                'queue' => $this->queueFactory->create($queueOptions)
             ]
         );
 
@@ -133,6 +135,8 @@ public function deploy(array $options)
     }
 
     /**
+     * Returns amount of parallel processes, returns zero if option wasn't set.
+     *
      * @param array $options
      * @return int
      */
@@ -142,6 +146,8 @@ private function getProcessesAmount(array $options)
     }
 
     /**
+     * Checks if need to refresh only version.
+     *
      * @param array $options
      * @return bool
      */
diff --git a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
index 75edc8cb4f6ee..396381960e544 100644
--- a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Deploy\Test\Unit\Service;
 
+use Magento\Deploy\Console\DeployStaticOptions;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Process\Queue;
 use Magento\Deploy\Service\Bundle;
@@ -221,4 +222,35 @@ public function deployDataProvider()
             ]
         ];
     }
+
+    public function testMaxExecutionTimeOptionPassed()
+    {
+        $options = [
+            DeployStaticOptions::MAX_EXECUTION_TIME => 100,
+            DeployStaticOptions::REFRESH_CONTENT_VERSION_ONLY => false,
+            DeployStaticOptions::JOBS_AMOUNT => 3,
+            DeployStaticOptions::STRATEGY => 'compact',
+            DeployStaticOptions::NO_JAVASCRIPT => true,
+            DeployStaticOptions::NO_HTML_MINIFY => true,
+        ];
+
+        $queueMock = $this->createMock(Queue::class);
+        $strategyMock = $this->createMock(CompactDeploy::class);
+        $this->queueFactory->expects($this->once())
+            ->method('create')
+            ->with([
+                'logger' => $this->logger,
+                'maxExecTime' => 100,
+                'maxProcesses' => 3,
+                'options' => $options,
+                'deployPackageService' => null
+            ])
+            ->willReturn($queueMock);
+        $this->deployStrategyFactory->expects($this->once())
+            ->method('create')
+            ->with('compact', ['queue' => $queueMock])
+            ->willReturn($strategyMock);
+
+        $this->service->deploy($options);
+    }
 }
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
index 69d500960d3f0..47f4fb0a6c7f3 100644
--- a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
@@ -13,8 +13,7 @@
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class AddDataForIndia
- * @package Magento\Directory\Setup\Patch\Data
+ * Add Regions for India.
  */
 class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
 {
@@ -29,7 +28,7 @@ class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
     private $dataInstallerFactory;
 
     /**
-     * AddDataForCroatia constructor.
+     * AddDataForIndia constructor.
      *
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
@@ -43,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -103,7 +102,7 @@ private function getDataForIndia()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -113,7 +112,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -121,7 +120,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForMexico.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForMexico.php
new file mode 100644
index 0000000000000..32bdf90800d6b
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForMexico.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Directory\Setup\Patch\Data;
+
+use Magento\Directory\Setup\DataInstaller;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Adds Mexican States
+ */
+class AddDataForMexico implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\Directory\Setup\DataInstallerFactory
+     */
+    private $dataInstallerFactory;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->dataInstallerFactory = $dataInstallerFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        /** @var DataInstaller $dataInstaller */
+        $dataInstaller = $this->dataInstallerFactory->create();
+        $dataInstaller->addCountryRegions(
+            $this->moduleDataSetup->getConnection(),
+            $this->getDataForMexico()
+        );
+    }
+
+    /**
+     * Mexican states data.
+     *
+     * @return array
+     */
+    private function getDataForMexico()
+    {
+        return [
+            ['MX', 'AGU', 'Aguascalientes'],
+            ['MX', 'BCN', 'Baja California'],
+            ['MX', 'BCS', 'Baja California Sur'],
+            ['MX', 'CAM', 'Campeche'],
+            ['MX', 'CHP', 'Chiapas'],
+            ['MX', 'CHH', 'Chihuahua'],
+            ['MX', 'CMX', 'Ciudad de México'],
+            ['MX', 'COA', 'Coahuila'],
+            ['MX', 'COL', 'Colima'],
+            ['MX', 'DUR', 'Durango'],
+            ['MX', 'MEX', 'Estado de México'],
+            ['MX', 'GUA', 'Guanajuato'],
+            ['MX', 'GRO', 'Guerrero'],
+            ['MX', 'HID', 'Hidalgo'],
+            ['MX', 'JAL', 'Jalisco'],
+            ['MX', 'MIC', 'Michoacán'],
+            ['MX', 'MOR', 'Morelos'],
+            ['MX', 'NAY', 'Nayarit'],
+            ['MX', 'NLE', 'Nuevo León'],
+            ['MX', 'OAX', 'Oaxaca'],
+            ['MX', 'PUE', 'Puebla'],
+            ['MX', 'QUE', 'Querétaro'],
+            ['MX', 'ROO', 'Quintana Roo'],
+            ['MX', 'SLP', 'San Luis Potosí'],
+            ['MX', 'SIN', 'Sinaloa'],
+            ['MX', 'SON', 'Sonora'],
+            ['MX', 'TAB', 'Tabasco'],
+            ['MX', 'TAM', 'Tamaulipas'],
+            ['MX', 'TLA', 'Tlaxcala'],
+            ['MX', 'VER', 'Veracruz'],
+            ['MX', 'YUC', 'Yucatán'],
+            ['MX', 'ZAC', 'Zacatecas']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class,
+            AddDataForAustralia::class,
+            AddDataForCroatia::class,
+            AddDataForIndia::class,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getVersion()
+    {
+        return '2.0.4';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls b/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
index 40ef6975fad8b..8da1920f9a444 100644
--- a/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
@@ -10,8 +10,10 @@ type Query {
 type Currency {
     base_currency_code: String
     base_currency_symbol: String
-    default_display_currecy_code: String
-    default_display_currecy_symbol: String
+    default_display_currecy_code: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_code`.")
+    default_display_currency_code: String
+    default_display_currecy_symbol: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_symbol`.")
+    default_display_currency_symbol: String
     available_currency_codes: [String]
     exchange_rates: [ExchangeRate]
 }
diff --git a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
new file mode 100644
index 0000000000000..b84dbff1154cf
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
@@ -0,0 +1,14 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="VerifyProductTypeOrder">
+        <seeElement stepKey="seeDownloadableInOrder" selector="{{AdminProductDropdownOrderSection.downloadProduct}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
new file mode 100644
index 0000000000000..39b4e303d5165
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDropdownOrderSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductDropdownOrderSection">
+        <element name="downloadProduct" type="text" selector="//li[not(following-sibling::li[span[@title='Bundle Product']]) and not(following-sibling::li[span[@title='Simple Product']]) and not(following-sibling::li[span[@title='Configurable Product']]) and not(following-sibling::li[span[@title='Grouped Product']]) and not(following-sibling::li[span[@title='Virtual Product']])]/span[@title='Downloadable Product']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
index 2188a671a5aa0..c4824f913daf8 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
@@ -3,22 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Downloadable\Model\Product\Type;
-use Magento\Downloadable\Model\Source\TypeUpload;
 use Magento\Downloadable\Model\Source\Shareable;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Downloadable\Model\Source\TypeUpload;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Ui\Component\DynamicRows;
 use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Container;
+use Magento\Ui\Component\DynamicRows;
 use Magento\Ui\Component\Form;
 
 /**
- * Class adds a grid with links
+ * Class adds a grid with links.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Links extends AbstractModifier
@@ -238,6 +240,7 @@ protected function getTitleColumn()
             'label' => __('Title'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 10,
         ];
         $titleField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -267,6 +270,7 @@ protected function getPriceColumn()
             'label' => __('Price'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 20,
         ];
         $priceField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -304,6 +308,7 @@ protected function getFileColumn()
             'label' => __('File'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 30,
         ];
         $fileTypeField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,
@@ -370,6 +375,7 @@ protected function getSampleColumn()
             'label' => __('Sample'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 40,
         ];
         $sampleTypeField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,
@@ -432,6 +438,7 @@ protected function getShareableColumn()
             'componentType' => Form\Field::NAME,
             'dataType' => Form\Element\DataType\Number::NAME,
             'dataScope' => 'is_shareable',
+            'sortOrder' => 50,
             'options' => $this->shareable->toOptionArray(),
         ];
 
@@ -452,6 +459,7 @@ protected function getMaxDownloadsColumn()
             'label' => __('Max. Downloads'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 60,
         ];
         $numberOfDownloadsField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
index 197bf1338f945..81c5918eb24ae 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
@@ -3,21 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Downloadable\Model\Product\Type;
 use Magento\Downloadable\Model\Source\TypeUpload;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Ui\Component\DynamicRows;
 use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Container;
+use Magento\Ui\Component\DynamicRows;
 use Magento\Ui\Component\Form;
 
 /**
- * Class adds a grid with samples
+ * Class adds a grid with samples.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Samples extends AbstractModifier
@@ -209,6 +211,7 @@ protected function getTitleColumn()
             'showLabel' => false,
             'label' => __('Title'),
             'dataScope' => '',
+            'sortOrder' => 10,
         ];
         $titleField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -238,6 +241,7 @@ protected function getSampleColumn()
             'label' => __('File'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 20,
         ];
         $sampleType['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml b/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
index 45e5f0b8da72d..f851558c1a563 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
@@ -26,17 +26,6 @@
                 </block>
             </block>
         </referenceBlock>
-        <referenceContainer name="product.info.options.wrapper.bottom">
-            <block class="Magento\Catalog\Pricing\Render" name="product.price.final.copy" before="-">
-                <arguments>
-                    <argument name="price_render" xsi:type="string">product.price.render.default</argument>
-                    <argument name="price_type_code" xsi:type="string">final_price</argument>
-                    <argument name="display_msrp_help_message" xsi:type="string">1</argument>
-                    <argument name="zone" xsi:type="string">item_view</argument>
-                    <argument name="id_suffix" xsi:type="string">copy-</argument>
-                </arguments>
-            </block>
-        </referenceContainer>
         <referenceBlock name="head.components">
             <block class="Magento\Framework\View\Element\Js\Components" name="downloadable_page_head_components" template="Magento_Downloadable::js/components.phtml"/>
         </referenceBlock>
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
index c5a18a3de99c6..be9d2700664c7 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -4,15 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Product attribute add/edit form main tab
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Eav\Block\Adminhtml\Attribute\Edit\Main;
 
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 
+/**
+ * Product attribute add/edit form main tab
+ */
 abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
@@ -110,7 +108,6 @@ protected function _prepareForm()
 
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create(
-            
             ['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
         );
 
@@ -280,10 +277,11 @@ protected function _initFormValues()
     }
 
     /**
-     * Processing block html after rendering
+     * Processing block html after rendering.
+     *
      * Adding js block to the end of this block
      *
-     * @param   string $html
+     * @param string $html
      * @return  string
      */
     protected function _afterToHtml($html)
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index d0a5e8de53ae9..1fd71e446e6bb 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -1683,14 +1683,16 @@ public function saveAttribute(DataObject $object, $attributeCode)
         $connection->beginTransaction();
 
         try {
-            $select = $connection->select()->from($table, 'value_id')->where($where);
-            $origValueId = $connection->fetchOne($select);
+            $select = $connection->select()->from($table, ['value_id', 'value'])->where($where);
+            $origRow = $connection->fetchRow($select);
+            $origValueId = $origRow['value_id'] ?? false;
+            $origValue = $origRow['value'] ?? null;
 
             if ($origValueId === false && $newValue !== null) {
                 $this->_insertAttribute($object, $attribute, $newValue);
             } elseif ($origValueId !== false && $newValue !== null) {
                 $this->_updateAttribute($object, $attribute, $origValueId, $newValue);
-            } elseif ($origValueId !== false && $newValue === null) {
+            } elseif ($origValueId !== false && $newValue === null && $origValue !== null) {
                 $connection->delete($table, $where);
             }
             $this->_processAttributeValues();
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
index 0b6ac2b998de7..2e55964560588 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
@@ -3,11 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\Entity\Attribute;
 
+use Magento\Eav\Api\Data\AttributeGroupExtensionInterface;
 use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
+ * Entity attribute group model
+ *
  * @api
  * @method int getSortOrder()
  * @method \Magento\Eav\Model\Entity\Attribute\Group setSortOrder(int $value)
@@ -27,6 +32,11 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      */
     private $translitFilter;
 
+    /**
+     * @var array
+     */
+    private $reservedSystemNames = [];
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -35,7 +45,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Filter\Translit $translitFilter
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-     * @param array $data
+     * @param array $data (optional)
+     * @param array $reservedSystemNames (optional)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -45,7 +56,8 @@ public function __construct(
         \Magento\Framework\Filter\Translit $translitFilter,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        array $reservedSystemNames = []
     ) {
         parent::__construct(
             $context,
@@ -56,6 +68,7 @@ public function __construct(
             $resourceCollection,
             $data
         );
+        $this->reservedSystemNames = $reservedSystemNames;
         $this->translitFilter = $translitFilter;
     }
 
@@ -74,6 +87,7 @@ protected function _construct()
      * Checks if current attribute group exists
      *
      * @return bool
+     * @throws LocalizedException
      * @codeCoverageIgnore
      */
     public function itemExists()
@@ -85,6 +99,7 @@ public function itemExists()
      * Delete groups
      *
      * @return $this
+     * @throws LocalizedException
      * @codeCoverageIgnore
      */
     public function deleteGroups()
@@ -110,9 +125,10 @@ public function beforeSave()
                     ),
                     '-'
                 );
-                if (empty($attributeGroupCode)) {
+                $isReservedSystemName = in_array(strtolower($attributeGroupCode), $this->reservedSystemNames);
+                if (empty($attributeGroupCode) || $isReservedSystemName) {
                     // in the following code md5 is not used for security purposes
-                    $attributeGroupCode = md5($groupName);
+                    $attributeGroupCode = md5(strtolower($groupName));
                 }
                 $this->setAttributeGroupCode($attributeGroupCode);
             }
@@ -121,7 +137,8 @@ public function beforeSave()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @codeCoverageIgnoreStart
      */
     public function getAttributeGroupId()
@@ -130,7 +147,7 @@ public function getAttributeGroupId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributeGroupName()
     {
@@ -138,7 +155,7 @@ public function getAttributeGroupName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributeSetId()
     {
@@ -146,7 +163,7 @@ public function getAttributeSetId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAttributeGroupId($attributeGroupId)
     {
@@ -154,7 +171,7 @@ public function setAttributeGroupId($attributeGroupId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAttributeGroupName($attributeGroupName)
     {
@@ -162,7 +179,7 @@ public function setAttributeGroupName($attributeGroupName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAttributeSetId($attributeSetId)
     {
@@ -170,9 +187,9 @@ public function setAttributeSetId($attributeSetId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
-     * @return \Magento\Eav\Api\Data\AttributeGroupExtensionInterface|null
+     * @return AttributeGroupExtensionInterface|null
      */
     public function getExtensionAttributes()
     {
@@ -180,14 +197,13 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
-     * @param \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
+     * @param AttributeGroupExtensionInterface $extensionAttributes
      * @return $this
      */
-    public function setExtensionAttributes(
-        \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
-    ) {
+    public function setExtensionAttributes(AttributeGroupExtensionInterface $extensionAttributes)
+    {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
 
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
index 56188ab997b76..36ad026029056 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
@@ -73,7 +73,7 @@ public function getOptionText($value)
             }
         }
         // End
-        if (isset($options[$value])) {
+        if (is_scalar($value) && isset($options[$value])) {
             return $options[$value];
         }
         return false;
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 6e81ddc36e9c9..29f9163a6e91d 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -10,12 +10,12 @@
 use Magento\Eav\Model\Entity\Setup\PropertyMapperInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Framework\App\CacheInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 
 /**
+ * Base eav setup class.
+ *
  * @api
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -101,7 +101,8 @@ public function __construct(
     }
 
     /**
-     * Gets setup model
+     * Gets setup model.
+     *
      * @deprecated
      * @return ModuleDataSetupInterface
      */
@@ -568,6 +569,8 @@ public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = nul
     }
 
     /**
+     * Convert group name to attribute group code.
+     *
      * @param string $groupName
      * @return string
      * @since 100.1.0
@@ -1063,7 +1066,7 @@ private function _updateAttributeAdditionalData($entityTypeId, $id, $field, $val
                 return $this;
             }
         }
-      
+
         $attributeId = $this->getAttributeId($entityTypeId, $id);
         if (false === $attributeId) {
             throw new LocalizedException(__('Attribute with ID: "%1" does not exist', $id));
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
index d4c91e98d9608..1584b922abaa9 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
@@ -40,6 +40,7 @@ protected function setUp()
             'resource' => $this->resourceMock,
             'translitFilter' => $translitFilter,
             'context' => $contextMock,
+            'reservedSystemNames' => ['configurable'],
         ];
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
@@ -67,6 +68,8 @@ public function attributeGroupCodeDataProvider()
     {
         return [
             ['General Group', 'general-group'],
+            ['configurable', md5('configurable')],
+            ['configurAble', md5('configurable')],
             ['///', md5('///')],
         ];
     }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
index ee972c27aa8a2..8cf5df877a6eb 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
@@ -101,13 +101,13 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t1' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
+                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123'"
+                            . " AND code_t1.store_id='0'",
                     ],
                     1 => [
                         'requisites' => ['code_t2' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
+                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123'"
+                            . " AND code_t2.store_id='12'",
                     ],
                 ],
                 'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) ASC',
@@ -118,13 +118,13 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t1' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
+                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123'"
+                            . " AND code_t1.store_id='0'",
                     ],
                     1 => [
                         'requisites' => ['code_t2' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
+                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123'"
+                            . " AND code_t2.store_id='12'",
                     ],
                 ],
                 'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) DESC',
@@ -135,8 +135,8 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
+                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123'"
+                            . " AND code_t.store_id='0'",
                     ],
                 ],
                 'expectedOrder' => 'code_t.value DESC',
@@ -147,8 +147,8 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
+                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123'"
+                            . " AND code_t.store_id='0'",
                     ],
                 ],
                 'expectedOrder' => 'code_t.value ASC',
diff --git a/app/code/Magento/Eav/etc/di.xml b/app/code/Magento/Eav/etc/di.xml
index a4c89dcfab2af..db6f9b0a64f9f 100644
--- a/app/code/Magento/Eav/etc/di.xml
+++ b/app/code/Magento/Eav/etc/di.xml
@@ -210,4 +210,3 @@
         </arguments>
     </type>
 </config>
-
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
index b7f21696162dd..26173fcf29b0c 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
@@ -19,13 +19,19 @@ class Converter implements ConverterInterface
      */
     private const ES_NO_INDEX = false;
 
+    /**
+     * Text flags for Elasticsearch no analyze index value
+     */
+    private const ES_NO_ANALYZE = false;
+
     /**
      * Mapping between internal data types and elastic service.
      *
      * @var array
      */
     private $mapping = [
-        'no_index' => self::ES_NO_INDEX,
+        ConverterInterface::INTERNAL_NO_INDEX_VALUE => self::ES_NO_INDEX,
+        ConverterInterface::INTERNAL_NO_ANALYZE_VALUE => self::ES_NO_ANALYZE,
     ];
 
     /**
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php
index a6838d831b4bc..0ae347d5791ad 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php
@@ -125,6 +125,7 @@ public function query(RequestInterface $request)
             [
                 'documents' => $rawDocuments,
                 'aggregations' => $aggregationBuilder->build($request, $rawResponse),
+                'total' => isset($rawResponse['hits']['total']) ? $rawResponse['hits']['total'] : 0
             ]
         );
         return $queryResponse;
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
index db961d86962e9..09968db00aa25 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query;
 
+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Sort;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Search\RequestInterface;
 use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
@@ -12,6 +15,8 @@
 use Magento\Framework\App\ScopeResolverInterface;
 
 /**
+ * Query builder for search adapter.
+ *
  * @api
  * @since 100.1.0
  */
@@ -41,22 +46,30 @@ class Builder
      */
     protected $scopeResolver;
 
+    /**
+     * @var Sort
+     */
+    protected $sortBuilder;
+
     /**
      * @param Config $clientConfig
      * @param SearchIndexNameResolver $searchIndexNameResolver
      * @param AggregationBuilder $aggregationBuilder
      * @param ScopeResolverInterface $scopeResolver
+     * @param Sort|null $sortBuilder
      */
     public function __construct(
         Config $clientConfig,
         SearchIndexNameResolver $searchIndexNameResolver,
         AggregationBuilder $aggregationBuilder,
-        ScopeResolverInterface $scopeResolver
+        ScopeResolverInterface $scopeResolver,
+        Sort $sortBuilder = null
     ) {
         $this->clientConfig = $clientConfig;
         $this->searchIndexNameResolver = $searchIndexNameResolver;
         $this->aggregationBuilder = $aggregationBuilder;
         $this->scopeResolver = $scopeResolver;
+        $this->sortBuilder = $sortBuilder ?: ObjectManager::getInstance()->get(Sort::class);
     }
 
     /**
@@ -70,6 +83,7 @@ public function initQuery(RequestInterface $request)
     {
         $dimension = current($request->getDimensions());
         $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+
         $searchQuery = [
             'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()),
             'type' => $this->clientConfig->getEntityType(),
@@ -77,6 +91,7 @@ public function initQuery(RequestInterface $request)
                 'from' => $request->getFrom(),
                 'size' => $request->getSize(),
                 'stored_fields' => ['_id', '_score'],
+                'sort' => $this->sortBuilder->getSort($request),
                 'query' => [],
             ],
         ];
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter.php
index 17ebf9c83903e..54586fa357ff0 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter.php
@@ -146,6 +146,16 @@ public function getAttributeCode(): string
         return $this->attributeCode;
     }
 
+    /**
+     * Check if attribute is sortable.
+     *
+     * @return bool
+     */
+    public function isSortable(): bool
+    {
+        return (int)$this->getAttribute()->getUsedForSortBy() === 1;
+    }
+
     /**
      * Check if attribute is defined by user.
      *
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter/DummyAttribute.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter/DummyAttribute.php
index b8c0da53c53e0..19b9f85c44b03 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter/DummyAttribute.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeAdapter/DummyAttribute.php
@@ -59,4 +59,24 @@ public function setCustomAttributes(array $attributes)
     {
         return $this;
     }
+
+    /**
+     * Get property value that guarantee of using an attribute in sort purposes on the storefront.
+     *
+     * @return bool
+     */
+    public function getUsedForSortBy()
+    {
+        return false;
+    }
+
+    /**
+     * Dummy attribute doesn't have backend type.
+     *
+     * @return null
+     */
+    public function getBackendType()
+    {
+        return null;
+    }
 }
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
index c7e2a4beabb5c..268fe00e4c41e 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
@@ -18,6 +18,8 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
     as FieldNameResolver;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Provide dynamic fields for product.
@@ -27,10 +29,18 @@ class DynamicField implements FieldProviderInterface
     /**
      * Category list.
      *
+     * @deprecated
      * @var CategoryListInterface
      */
     private $categoryList;
 
+    /**
+     * Category collection.
+     *
+     * @var Collection
+     */
+    private $categoryCollection;
+
     /**
      * Customer group repository.
      *
@@ -73,6 +83,7 @@ class DynamicField implements FieldProviderInterface
      * @param CategoryListInterface $categoryList
      * @param FieldNameResolver $fieldNameResolver
      * @param AttributeProvider $attributeAdapterProvider
+     * @param Collection|null $categoryCollection
      */
     public function __construct(
         FieldTypeConverterInterface $fieldTypeConverter,
@@ -81,7 +92,8 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         CategoryListInterface $categoryList,
         FieldNameResolver $fieldNameResolver,
-        AttributeProvider $attributeAdapterProvider
+        AttributeProvider $attributeAdapterProvider,
+        Collection $categoryCollection = null
     ) {
         $this->groupRepository = $groupRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
@@ -90,6 +102,8 @@ public function __construct(
         $this->categoryList = $categoryList;
         $this->fieldNameResolver = $fieldNameResolver;
         $this->attributeAdapterProvider = $attributeAdapterProvider;
+        $this->categoryCollection = $categoryCollection ?:
+            ObjectManager::getInstance()->get(Collection::class);
     }
 
     /**
@@ -98,18 +112,17 @@ public function __construct(
     public function getFields(array $context = []): array
     {
         $allAttributes = [];
-        $searchCriteria = $this->searchCriteriaBuilder->create();
-        $categories = $this->categoryList->getList($searchCriteria)->getItems();
+        $categoryIds = $this->categoryCollection->getAllIds();
         $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
         $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
-        foreach ($categories as $category) {
+        foreach ($categoryIds as $categoryId) {
             $categoryPositionKey = $this->fieldNameResolver->getFieldName(
                 $positionAttribute,
-                ['categoryId' => $category->getId()]
+                ['categoryId' => $categoryId]
             );
             $categoryNameKey = $this->fieldNameResolver->getFieldName(
                 $categoryNameAttribute,
-                ['categoryId' => $category->getId()]
+                ['categoryId' => $categoryId]
             );
             $allAttributes[$categoryPositionKey] = [
                 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
@@ -121,12 +134,15 @@ public function getFields(array $context = []): array
             ];
         }
 
+        $searchCriteria = $this->searchCriteriaBuilder->create();
         $groups = $this->groupRepository->getList($searchCriteria)->getItems();
         $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
+        $ctx = isset($context['websiteId']) ? ['websiteId' => $context['websiteId']] : [];
         foreach ($groups as $group) {
+            $ctx['customerGroupId'] = $group->getId();
             $groupPriceKey = $this->fieldNameResolver->getFieldName(
                 $priceAttribute,
-                ['customerGroupId' => $group->getId(), 'websiteId' => $context['websiteId']]
+                $ctx
             );
             $allAttributes[$groupPriceKey] = [
                 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_FLOAT),
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
index 5abe4972e34d0..535ab62dd5991 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
@@ -17,13 +17,19 @@ class Converter implements ConverterInterface
      */
     private const ES_NO_INDEX = 'no';
 
+    /**
+     * Text flags for Elasticsearch no analyze index value
+     */
+    private const ES_NO_ANALYZE = 'not_analyzed';
+
     /**
      * Mapping between internal data types and elastic service.
      *
      * @var array
      */
     private $mapping = [
-        'no_index' => self::ES_NO_INDEX,
+        ConverterInterface::INTERNAL_NO_INDEX_VALUE => self::ES_NO_INDEX,
+        ConverterInterface::INTERNAL_NO_ANALYZE_VALUE => self::ES_NO_ANALYZE,
     ];
 
     /**
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ConverterInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ConverterInterface.php
index 02c4d29558dad..5ecfd62430032 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ConverterInterface.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/ConverterInterface.php
@@ -17,6 +17,7 @@ interface ConverterInterface
      */
     public const INTERNAL_NO_INDEX_VALUE = 'no_index';
     public const INTERNAL_INDEX_VALUE = 'index';
+    public const INTERNAL_NO_ANALYZE_VALUE = 'no_analyze';
 
     /**
      * Get service field index type.
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
index 3208ca7fc6171..5f319daeb3b39 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
@@ -51,22 +51,22 @@ public function __construct(
      */
     public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
     {
-        $fieldType = $this->fieldTypeResolver->getFieldType($attribute);
         $attributeCode = $attribute->getAttributeCode();
-        $frontendInput = $attribute->getFrontendInput();
         if (empty($context['type'])) {
-            $fieldName = $attributeCode;
-        } elseif ($context['type'] === FieldMapperInterface::TYPE_FILTER) {
+            return $attributeCode;
+        }
+
+        $fieldType = $this->fieldTypeResolver->getFieldType($attribute);
+        $frontendInput = $attribute->getFrontendInput();
+        $fieldName = $attributeCode;
+        if ($context['type'] === FieldMapperInterface::TYPE_FILTER) {
             if ($this->isStringServiceFieldType($fieldType)) {
-                return $this->getFieldName(
-                    $attribute,
-                    array_merge($context, ['type' => FieldMapperInterface::TYPE_QUERY])
-                );
+                return $this->getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode);
             }
             $fieldName = $attributeCode;
         } elseif ($context['type'] === FieldMapperInterface::TYPE_QUERY) {
             $fieldName = $this->getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode);
-        } else {
+        } elseif ($context['type'] == FieldMapperInterface::TYPE_SORT && $attribute->isSortable()) {
             $fieldName = 'sort_' . $attributeCode;
         }
 
@@ -115,10 +115,11 @@ private function getQueryTypeFieldName($frontendInput, $fieldType, $attributeCod
     private function getRefinedFieldName($frontendInput, $fieldType, $attributeCode)
     {
         $stringTypeKey = $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING);
+        $keywordTypeKey = $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD);
         switch ($frontendInput) {
             case 'select':
             case 'multiselect':
-                return in_array($fieldType, [$stringTypeKey, 'integer'], true)
+                return in_array($fieldType, [$stringTypeKey, $keywordTypeKey, 'integer'], true)
                     ? $attributeCode . '_value'
                     : $attributeCode;
             case 'boolean':
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttribute.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttribute.php
index 4fa16db98639e..652fc853adbcc 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttribute.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/SpecialAttribute.php
@@ -24,7 +24,9 @@ class SpecialAttribute implements ResolverInterface
      */
     public function getFieldName(AttributeAdapter $attribute, $context = []): ?string
     {
-        if (in_array($attribute->getAttributeCode(), ['id', 'sku', 'store_id', 'visibility'], true)) {
+        if (in_array($attribute->getAttributeCode(), ['id', 'sku', 'store_id', 'visibility'], true)
+            && empty($context['type'])
+        ) {
             return $attribute->getAttributeCode();
         }
 
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
index b5c78cbc28f45..6876b23bbb156 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Eav\Model\Config;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
@@ -19,6 +20,7 @@
     as FieldTypeResolver;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface
     as FieldIndexResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
 
 /**
  * Provide static fields for mapping of product.
@@ -55,6 +57,11 @@ class StaticField implements FieldProviderInterface
      */
     private $fieldIndexResolver;
 
+    /**
+     * @var FieldName\ResolverInterface
+     */
+    private $fieldNameResolver;
+
     /**
      * @param Config $eavConfig
      * @param FieldTypeConverterInterface $fieldTypeConverter
@@ -62,6 +69,7 @@ class StaticField implements FieldProviderInterface
      * @param FieldTypeResolver $fieldTypeResolver
      * @param FieldIndexResolver $fieldIndexResolver
      * @param AttributeProvider $attributeAdapterProvider
+     * @param FieldName\ResolverInterface|null $fieldNameResolver
      */
     public function __construct(
         Config $eavConfig,
@@ -69,7 +77,8 @@ public function __construct(
         IndexTypeConverterInterface $indexTypeConverter,
         FieldTypeResolver $fieldTypeResolver,
         FieldIndexResolver $fieldIndexResolver,
-        AttributeProvider $attributeAdapterProvider
+        AttributeProvider $attributeAdapterProvider,
+        FieldName\ResolverInterface $fieldNameResolver = null
     ) {
         $this->eavConfig = $eavConfig;
         $this->fieldTypeConverter = $fieldTypeConverter;
@@ -77,6 +86,8 @@ public function __construct(
         $this->fieldTypeResolver = $fieldTypeResolver;
         $this->fieldIndexResolver = $fieldIndexResolver;
         $this->attributeAdapterProvider = $attributeAdapterProvider;
+        $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
+            ->get(FieldName\ResolverInterface::class);
     }
 
     /**
@@ -84,6 +95,7 @@ public function __construct(
      *
      * @param array $context
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getFields(array $context = []): array
     {
@@ -92,19 +104,38 @@ public function getFields(array $context = []): array
 
         foreach ($attributes as $attribute) {
             $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attribute->getAttributeCode());
-            $code = $attributeAdapter->getAttributeCode();
+            $fieldName = $this->fieldNameResolver->getFieldName($attributeAdapter);
 
-            $allAttributes[$code] = [
+            $allAttributes[$fieldName] = [
                 'type' => $this->fieldTypeResolver->getFieldType($attributeAdapter),
             ];
 
             $index = $this->fieldIndexResolver->getFieldIndex($attributeAdapter);
             if (null !== $index) {
-                $allAttributes[$code]['index'] = $index;
+                $allAttributes[$fieldName]['index'] = $index;
+            }
+
+            if ($attributeAdapter->isSortable()) {
+                $sortFieldName = $this->fieldNameResolver->getFieldName(
+                    $attributeAdapter,
+                    ['type' => FieldMapperInterface::TYPE_SORT]
+                );
+                $allAttributes[$fieldName]['fields'][$sortFieldName] = [
+                    'type' => $this->fieldTypeConverter->convert(
+                        FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
+                    ),
+                    'index' => $this->indexTypeConverter->convert(
+                        IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
+                    )
+                ];
             }
 
             if ($attributeAdapter->isComplexType()) {
-                $allAttributes[$code . '_value'] = [
+                $childFieldName = $this->fieldNameResolver->getFieldName(
+                    $attributeAdapter,
+                    ['type' => FieldMapperInterface::TYPE_QUERY]
+                );
+                $allAttributes[$childFieldName] = [
                     'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING)
                 ];
             }
diff --git a/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php b/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php
new file mode 100644
index 0000000000000..b3f8a56110f8d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Elasticsearch\Model\Advanced;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\Config;
+use Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyInterface;
+
+/**
+ * Strategy interface for preparing product collection.
+ */
+class ProductCollectionPrepareStrategy implements ProductCollectionPrepareStrategyInterface
+{
+    /**
+     * @var Config
+     */
+    private $catalogConfig;
+
+    /**
+     * @param Config $catalogConfig
+     */
+    public function __construct(
+        Config $catalogConfig
+    ) {
+        $this->catalogConfig = $catalogConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function prepare(Collection $collection)
+    {
+        $collection
+            ->addAttributeToSelect($this->catalogConfig->getProductAttributes())
+            ->addMinimalPrice()
+            ->addTaxPercents();
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php
index dc08a72a9feb3..387db07c62f90 100644
--- a/app/code/Magento/Elasticsearch/Model/Config.php
+++ b/app/code/Magento/Elasticsearch/Model/Config.php
@@ -25,8 +25,6 @@ class Config implements ClientOptionsInterface
      */
     const ENGINE_NAME = 'elasticsearch';
 
-    private const ENGINE_NAME_5 = 'elasticsearch5';
-
     /**
      * Elasticsearch Entity type
      */
@@ -64,23 +62,31 @@ class Config implements ClientOptionsInterface
     private $engineResolver;
 
     /**
-     * Constructor
+     * Available Elasticsearch engines.
      *
+     * @var array
+     */
+    private $engineList;
+
+    /**
      * @param ScopeConfigInterface $scopeConfig
      * @param ClientResolver|null $clientResolver
      * @param EngineResolverInterface|null $engineResolver
      * @param string|null $prefix
+     * @param array $engineList
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         ClientResolver $clientResolver = null,
         EngineResolverInterface $engineResolver = null,
-        $prefix = null
+        $prefix = null,
+        $engineList = []
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->clientResolver = $clientResolver ?: ObjectManager::getInstance()->get(ClientResolver::class);
         $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolverInterface::class);
         $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
+        $this->engineList = $engineList;
     }
 
     /**
@@ -138,7 +144,7 @@ public function getSearchConfigData($field, $storeId = null)
      */
     public function isElasticsearchEnabled()
     {
-        return in_array($this->engineResolver->getCurrentSearchEngine(), [self::ENGINE_NAME, self::ENGINE_NAME_5]);
+        return in_array($this->engineResolver->getCurrentSearchEngine(), $this->engineList);
     }
 
     /**
diff --git a/app/code/Magento/Elasticsearch/Model/Layer/Category/ItemCollectionProvider.php b/app/code/Magento/Elasticsearch/Model/Layer/Category/ItemCollectionProvider.php
new file mode 100644
index 0000000000000..ef2992e1fff9f
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Layer/Category/ItemCollectionProvider.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Model\Layer\Category;
+
+use Magento\Catalog\Model\Layer\ItemCollectionProviderInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+
+/**
+ * Catalog search category layer collection provider.
+ */
+class ItemCollectionProvider implements ItemCollectionProviderInterface
+{
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
+    /**
+     * @var array
+     */
+    private $factories;
+
+    /**
+     * ItemCollectionProvider constructor.
+     * @param EngineResolverInterface $engineResolver
+     * @param array $factories
+     */
+    public function __construct(
+        EngineResolverInterface $engineResolver,
+        array $factories
+    ) {
+        $this->engineResolver = $engineResolver;
+        $this->factories = $factories;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCollection(\Magento\Catalog\Model\Category $category)
+    {
+        if (!isset($this->factories[$this->engineResolver->getCurrentSearchEngine()])) {
+            throw new \DomainException('Undefined factory ' . $this->engineResolver->getCurrentSearchEngine());
+        }
+        $collection = $this->factories[$this->engineResolver->getCurrentSearchEngine()]->create();
+        $collection->addCategoryFilter($category);
+
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Layer/Search/ItemCollectionProvider.php b/app/code/Magento/Elasticsearch/Model/Layer/Search/ItemCollectionProvider.php
new file mode 100644
index 0000000000000..7d2a30b493d30
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Layer/Search/ItemCollectionProvider.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Model\Layer\Search;
+
+use Magento\Catalog\Model\Layer\ItemCollectionProviderInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+
+/**
+ * Catalog search category layer collection provider.
+ */
+class ItemCollectionProvider implements ItemCollectionProviderInterface
+{
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
+    /**
+     * @var array
+     */
+    private $factories;
+
+    /**
+     * ItemCollectionProvider constructor.
+     * @param EngineResolverInterface $engineResolver
+     * @param array $factories
+     */
+    public function __construct(
+        EngineResolverInterface $engineResolver,
+        array $factories
+    ) {
+        $this->engineResolver = $engineResolver;
+        $this->factories = $factories;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCollection(\Magento\Catalog\Model\Category $category)
+    {
+        if (!isset($this->factories[$this->engineResolver->getCurrentSearchEngine()])) {
+            throw new \DomainException('Undefined factory ' . $this->engineResolver->getCurrentSearchEngine());
+        }
+        $collection = $this->factories[$this->engineResolver->getCurrentSearchEngine()]->create();
+
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php
new file mode 100644
index 0000000000000..255c7885e84b9
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection;
+
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
+use Magento\Framework\Data\Collection;
+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\Api\Search\SearchCriteria;
+
+/**
+ * Resolve specific attributes for search criteria.
+ */
+class SearchCriteriaResolver implements SearchCriteriaResolverInterface
+{
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $builder;
+
+    /**
+     * @var Collection
+     */
+    private $collection;
+
+    /**
+     * @var string
+     */
+    private $searchRequestName;
+
+    /**
+     * @var int
+     */
+    private $size;
+
+    /**
+     * @var array
+     */
+    private $orders;
+
+    /**
+     * @var int
+     */
+    private $currentPage;
+
+    /**
+     * SearchCriteriaResolver constructor.
+     * @param SearchCriteriaBuilder $builder
+     * @param Collection $collection
+     * @param string $searchRequestName
+     * @param int $currentPage
+     * @param int $size
+     * @param array $orders
+     */
+    public function __construct(
+        SearchCriteriaBuilder $builder,
+        Collection $collection,
+        string $searchRequestName,
+        int $currentPage,
+        int $size,
+        ?array $orders
+    ) {
+        $this->builder = $builder;
+        $this->collection = $collection;
+        $this->searchRequestName = $searchRequestName;
+        $this->currentPage = $currentPage;
+        $this->size = $size;
+        $this->orders = $orders;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(): SearchCriteria
+    {
+        $this->builder->setPageSize($this->size);
+        $searchCriteria = $this->builder->create();
+        $searchCriteria->setRequestName($this->searchRequestName);
+        $searchCriteria->setSortOrders($this->orders);
+        $searchCriteria->setCurrentPage($this->currentPage - 1);
+
+        return $searchCriteria;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
new file mode 100644
index 0000000000000..3ae2d384782c3
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection;
+
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
+use Magento\Framework\Data\Collection;
+use Magento\Framework\Api\Search\SearchResultInterface;
+
+/**
+ * Resolve specific attributes for search criteria.
+ */
+class SearchResultApplier implements SearchResultApplierInterface
+{
+    /**
+     * @var Collection|\Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection
+     */
+    private $collection;
+
+    /**
+     * @var SearchResultInterface
+     */
+    private $searchResult;
+
+    /**
+     * @param Collection $collection
+     * @param SearchResultInterface $searchResult
+     */
+    public function __construct(
+        Collection $collection,
+        SearchResultInterface $searchResult
+    ) {
+        $this->collection = $collection;
+        $this->searchResult = $searchResult;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        if (empty($this->searchResult->getItems())) {
+            $this->collection->getSelect()->where('NULL');
+            return;
+        }
+        $ids = [];
+        foreach ($this->searchResult->getItems() as $item) {
+            $ids[] = (int)$item->getId();
+        }
+        $this->collection->setPageSize(null);
+        $this->collection->getSelect()->where('e.entity_id IN (?)', $ids);
+        $orderList = join(',', $ids);
+        $this->collection->getSelect()->reset(\Magento\Framework\DB\Select::ORDER);
+        $this->collection->getSelect()->order("FIELD(e.entity_id,$orderList)");
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php
new file mode 100644
index 0000000000000..109721fcc71a9
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/TotalRecordsResolver.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection;
+
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
+use Magento\Framework\Api\Search\SearchResultInterface;
+
+/**
+ * Resolve total records count.
+ */
+class TotalRecordsResolver implements TotalRecordsResolverInterface
+{
+    /**
+     * @var SearchResultInterface
+     */
+    private $searchResult;
+
+    /**
+     * @param SearchResultInterface $searchResult
+     */
+    public function __construct(
+        SearchResultInterface $searchResult
+    ) {
+        $this->searchResult = $searchResult;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(): ?int
+    {
+        return $this->searchResult->getTotalCount();
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php b/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php
index 43b2bfe553a98..6f9ef552351fd 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php
@@ -68,8 +68,7 @@ public function __construct(
     }
 
     /**
-     * @param RequestInterface $request
-     * @return QueryResponse
+     * @inheritdoc
      */
     public function query(RequestInterface $request)
     {
@@ -86,6 +85,7 @@ public function query(RequestInterface $request)
             [
                 'documents' => $rawDocuments,
                 'aggregations' => $aggregationBuilder->build($request, $rawResponse),
+                'total' => isset($rawResponse['hits']['total']) ? $rawResponse['hits']['total'] : 0
             ]
         );
         return $queryResponse;
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
index 0c03a9df18dc8..eeb48f805bccf 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
@@ -22,13 +22,15 @@ public function build(
         array $queryResult,
         DataProviderInterface $dataProvider
     ) {
+        $buckets = $queryResult['aggregations'][$bucket->getName()]['buckets'] ?? [];
         $values = [];
-        foreach ($queryResult['aggregations'][$bucket->getName()]['buckets'] as $resultBucket) {
+        foreach ($buckets as $resultBucket) {
             $values[$resultBucket['key']] = [
                 'value' => $resultBucket['key'],
                 'count' => $resultBucket['doc_count'],
             ];
         }
+
         return $values;
     }
 }
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php
index cf75366b9b25e..d0aaa4b3dd572 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php
@@ -3,19 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch\SearchAdapter\Query;
 
 use Magento\Framework\Search\RequestInterface;
-use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query\Builder as Elasticsearch5Builder;
 
 /**
+ * Query builder for search adapter.
+ *
  * @api
  * @since 100.1.0
  */
 class Builder extends Elasticsearch5Builder
 {
-
     /**
      * Set initial settings for query
      *
@@ -34,6 +35,7 @@ public function initQuery(RequestInterface $request)
                 'from' => $request->getFrom(),
                 'size' => $request->getSize(),
                 'fields' => ['_id', '_score'],
+                'sort' => $this->sortBuilder->getSort($request),
                 'query' => [],
             ],
         ];
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
index aaa9d8a88382f..afd383c13421f 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Elasticsearch\SearchAdapter\Query\Builder;
 
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface as TypeResolver;
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
@@ -26,20 +30,49 @@ class Match implements QueryInterface
     private $fieldMapper;
 
     /**
+     * @deprecated
+     * @see \Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer
      * @var PreprocessorInterface[]
      */
     protected $preprocessorContainer;
 
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeProvider;
+
+    /**
+     * @var TypeResolver
+     */
+    private $fieldTypeResolver;
+
+    /**
+     * @var ValueTransformerPool
+     */
+    private $valueTransformerPool;
+
     /**
      * @param FieldMapperInterface $fieldMapper
      * @param PreprocessorInterface[] $preprocessorContainer
+     * @param AttributeProvider|null $attributeProvider
+     * @param TypeResolver|null $fieldTypeResolver
+     * @param ValueTransformerPool|null $valueTransformerPool
      */
     public function __construct(
         FieldMapperInterface $fieldMapper,
-        array $preprocessorContainer
+        array $preprocessorContainer,
+        AttributeProvider $attributeProvider = null,
+        TypeResolver $fieldTypeResolver = null,
+        ValueTransformerPool $valueTransformerPool = null
     ) {
         $this->fieldMapper = $fieldMapper;
         $this->preprocessorContainer = $preprocessorContainer;
+        $this->attributeProvider = $attributeProvider ?? ObjectManager::getInstance()
+            ->get(AttributeProvider::class);
+        $this->fieldTypeResolver = $fieldTypeResolver ?? ObjectManager::getInstance()
+            ->get(TypeResolver::class);
+        $this->valueTransformerPool = $valueTransformerPool ?? ObjectManager::getInstance()
+            ->get(ValueTransformerPool::class);
     }
 
     /**
@@ -72,10 +105,6 @@ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $
      */
     protected function prepareQuery($queryValue, $conditionType)
     {
-        $queryValue = $this->escape($queryValue);
-        foreach ($this->preprocessorContainer as $preprocessor) {
-            $queryValue = $preprocessor->process($queryValue);
-        }
         $condition = $conditionType === BoolExpression::QUERY_CONDITION_NOT ?
             self::QUERY_CONDITION_MUST_NOT : $conditionType;
         return [
@@ -104,10 +133,24 @@ protected function buildQueries(array $matches, array $queryValue)
 
         // Checking for quoted phrase \"phrase test\", trim escaped surrounding quotes if found
         $count = 0;
-        $value = preg_replace('#^\\\\"(.*)\\\\"$#m', '$1', $queryValue['value'], -1, $count);
+        $value = preg_replace('#^"(.*)"$#m', '$1', $queryValue['value'], -1, $count);
         $condition = ($count) ? 'match_phrase' : 'match';
 
+        $transformedTypes = [];
         foreach ($matches as $match) {
+            $attributeAdapter = $this->attributeProvider->getByAttributeCode($match['field']);
+            $fieldType = $this->fieldTypeResolver->getFieldType($attributeAdapter);
+            $valueTransformer = $this->valueTransformerPool->get($fieldType ?? 'text');
+            $valueTransformerHash = \spl_object_hash($valueTransformer);
+            if (!isset($transformedTypes[$valueTransformerHash])) {
+                $transformedTypes[$valueTransformerHash] = $valueTransformer->transform($value);
+            }
+            $transformedValue = $transformedTypes[$valueTransformerHash];
+            if (null === $transformedValue) {
+                //Value is incompatible with this field type.
+                continue;
+            }
+
             $resolvedField = $this->fieldMapper->getFieldName(
                 $match['field'],
                 ['type' => FieldMapperInterface::TYPE_QUERY]
@@ -117,8 +160,8 @@ protected function buildQueries(array $matches, array $queryValue)
                 'body' => [
                     $condition => [
                         $resolvedField => [
-                            'query' => $value,
-                            'boost' => isset($match['boost']) ? $match['boost'] : 1,
+                            'query' => $transformedValue,
+                            'boost' => $match['boost'] ?? 1,
                         ],
                     ],
                 ],
@@ -131,16 +174,13 @@ protected function buildQueries(array $matches, array $queryValue)
     /**
      * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
      *
-     * Cut trailing plus or minus sign, and @ symbol, using of which causes InnoDB to report a syntax error.
-     * https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html Fulltext-boolean search docs.
-     *
+     * @deprecated
+     * @see \Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer
      * @param string $value
      * @return string
      */
     protected function escape($value)
     {
-        $value = preg_replace('/@+|[@+-]+$/', '', $value);
-
         $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
         $replace = '\\\$1';
 
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php
new file mode 100644
index 0000000000000..5ccf202e3812b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\Builder;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
+    as FieldNameResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Framework\Search\RequestInterface;
+
+/**
+ * Sort builder.
+ */
+class Sort
+{
+    /**
+     * List of fields that need to skipp by default.
+     */
+    private const DEFAULT_SKIPPED_FIELDS = [
+        'entity_id',
+    ];
+
+    /**
+     * Default mapping for special fields.
+     */
+    private const DEFAULT_MAP = [
+        'relevance' => '_score',
+    ];
+
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var FieldNameResolver
+     */
+    private $fieldNameResolver;
+
+    /**
+     * @var array
+     */
+    private $skippedFields;
+
+    /**
+     * @var array
+     */
+    private $map;
+
+    /**
+     * @param AttributeProvider $attributeAdapterProvider
+     * @param FieldNameResolver $fieldNameResolver
+     * @param array $skippedFields
+     * @param array $map
+     */
+    public function __construct(
+        AttributeProvider $attributeAdapterProvider,
+        FieldNameResolver $fieldNameResolver,
+        array $skippedFields = [],
+        array $map = []
+    ) {
+        $this->attributeAdapterProvider = $attributeAdapterProvider;
+        $this->fieldNameResolver = $fieldNameResolver;
+        $this->skippedFields = array_merge(self::DEFAULT_SKIPPED_FIELDS, $skippedFields);
+        $this->map = array_merge(self::DEFAULT_MAP, $map);
+    }
+
+    /**
+     * Prepare sort.
+     *
+     * @param RequestInterface $request
+     * @return array
+     */
+    public function getSort(RequestInterface $request)
+    {
+        $sorts = [];
+        foreach ($request->getSort() as $item) {
+            if (in_array($item['field'], $this->skippedFields)) {
+                continue;
+            }
+            $attribute = $this->attributeAdapterProvider->getByAttributeCode($item['field']);
+            $fieldName = $this->fieldNameResolver->getFieldName($attribute);
+            if (isset($this->map[$fieldName])) {
+                $fieldName = $this->map[$fieldName];
+            }
+            if ($attribute->isSortable() && !($attribute->isFloatType() || $attribute->isIntegerType())) {
+                $suffix = $this->fieldNameResolver->getFieldName(
+                    $attribute,
+                    ['type' => FieldMapperInterface::TYPE_SORT]
+                );
+                $fieldName .= '.' . $suffix;
+            }
+            $sorts[] = [
+                $fieldName => [
+                    'order' => strtolower($item['direction'])
+                ]
+            ];
+        }
+
+        return $sorts;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php
new file mode 100644
index 0000000000000..49eca6e9d82a6
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\Model\Adapter\FieldType\Date;
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+
+/**
+ * Value transformer for date type fields.
+ */
+class DateTransformer implements ValueTransformerInterface
+{
+    /**
+     * @var Date
+     */
+    private $dateFieldType;
+
+    /**
+     * @param Date $dateFieldType
+     */
+    public function __construct(Date $dateFieldType)
+    {
+        $this->dateFieldType = $dateFieldType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): ?string
+    {
+        try {
+            $formattedDate = $this->dateFieldType->formatDate(null, $value);
+        } catch (\Exception $e) {
+            $formattedDate = null;
+        }
+
+        return $formattedDate;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php
new file mode 100644
index 0000000000000..5e330076d3df7
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+
+/**
+ * Value transformer for float type fields.
+ */
+class FloatTransformer implements ValueTransformerInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): ?float
+    {
+        return \is_numeric($value) ? (float) $value : null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php
new file mode 100644
index 0000000000000..0846ff3a9bd86
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+
+/**
+ * Value transformer for integer type fields.
+ */
+class IntegerTransformer implements ValueTransformerInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): ?int
+    {
+        return \is_numeric($value) ? (int) $value : null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php
new file mode 100644
index 0000000000000..68bec2580f621
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
+
+/**
+ * Value transformer for fields with text types.
+ */
+class TextTransformer implements ValueTransformerInterface
+{
+    /**
+     * @var PreprocessorInterface[]
+     */
+    private $preprocessors;
+
+    /**
+     * @param PreprocessorInterface[] $preprocessors
+     */
+    public function __construct(array $preprocessors = [])
+    {
+        foreach ($preprocessors as $preprocessor) {
+            if (!$preprocessor instanceof PreprocessorInterface) {
+                throw new \InvalidArgumentException(
+                    \sprintf('"%s" is not a instance of ValueTransformerInterface.', get_class($preprocessor))
+                );
+            }
+        }
+
+        $this->preprocessors = $preprocessors;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): string
+    {
+        $value = $this->escape($value);
+        foreach ($this->preprocessors as $preprocessor) {
+            $value = $preprocessor->process($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
+     *
+     * @param string $value
+     * @return string
+     */
+    private function escape(string $value): string
+    {
+        $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
+        $replace = '\\\$1';
+
+        return preg_replace($pattern, $replace, $value);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerInterface.php
new file mode 100644
index 0000000000000..c84ddc69cc7a8
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query;
+
+/**
+ * Value transformer of search term for matching with ES field types.
+ */
+interface ValueTransformerInterface
+{
+    /**
+     * Transform value according to field type.
+     *
+     * @param string $value
+     * @return mixed
+     */
+    public function transform(string $value);
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerPool.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerPool.php
new file mode 100644
index 0000000000000..11a35d79ce1fd
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerPool.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query;
+
+/**
+ * Pool of value transformers.
+ */
+class ValueTransformerPool
+{
+    /**
+     * @var ValueTransformerInterface[]
+     */
+    private $transformers;
+
+    /**
+     * @param ValueTransformerInterface[] $valueTransformers
+     */
+    public function __construct(array $valueTransformers = [])
+    {
+        foreach ($valueTransformers as $valueTransformer) {
+            if (!$valueTransformer instanceof ValueTransformerInterface) {
+                throw new \InvalidArgumentException(
+                    \sprintf('"%s" is not a instance of ValueTransformerInterface.', get_class($valueTransformer))
+                );
+            }
+        }
+
+        $this->transformers = $valueTransformers;
+    }
+
+    /**
+     * Get value transformer related to field type.
+     *
+     * @param string $fieldType
+     * @return ValueTransformerInterface
+     */
+    public function get(string $fieldType): ValueTransformerInterface
+    {
+        return $this->transformers[$fieldType] ?? $this->transformers['default'];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php b/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php
index 33fda48f4af57..0813975ac9a4b 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php
@@ -76,6 +76,7 @@ public function create($response)
             [
                 'documents' => $documents,
                 'aggregations' => $aggregations,
+                'total' => $response['total']
             ]
         );
     }
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php
index ba5e97aa14b54..7c2a33c05aa08 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php
@@ -24,6 +24,7 @@
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
     as FieldNameResolver;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
 
 /**
  * @SuppressWarnings(PHPMD)
@@ -65,6 +66,11 @@ class DynamicFieldTest extends \PHPUnit\Framework\TestCase
      */
     private $categoryList;
 
+    /**
+     * @var Collection
+     */
+    private $categoryCollection;
+
     /**
      * @var FieldNameResolver
      */
@@ -100,6 +106,10 @@ protected function setUp()
         $this->categoryList = $this->getMockBuilder(CategoryListInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->categoryCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAllIds'])
+            ->getMock();
 
         $objectManager = new ObjectManagerHelper($this);
 
@@ -113,6 +123,7 @@ protected function setUp()
                 'attributeAdapterProvider' => $this->attributeAdapterProvider,
                 'categoryList' => $this->categoryList,
                 'fieldNameResolver' => $this->fieldNameResolver,
+                'categoryCollection' => $this->categoryCollection,
             ]
         );
     }
@@ -124,7 +135,6 @@ protected function setUp()
      * @param $groupId
      * @param array $expected
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function testGetAllAttributesTypes(
         $complexType,
@@ -138,10 +148,6 @@ public function testGetAllAttributesTypes(
         $this->searchCriteriaBuilder->expects($this->any())
             ->method('create')
             ->willReturn($searchCriteria);
-        $categorySearchResults = $this->getMockBuilder(CategorySearchResultsInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getItems'])
-            ->getMockForAbstractClass();
         $groupSearchResults = $this->getMockBuilder(GroupSearchResultsInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getItems'])
@@ -156,19 +162,10 @@ public function testGetAllAttributesTypes(
         $groupSearchResults->expects($this->any())
             ->method('getItems')
             ->willReturn([$group]);
-        $category = $this->getMockBuilder(CategoryInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getId'])
-            ->getMockForAbstractClass();
-        $category->expects($this->any())
-            ->method('getId')
-            ->willReturn($categoryId);
-        $categorySearchResults->expects($this->any())
-            ->method('getItems')
-            ->willReturn([$category]);
-        $this->categoryList->expects($this->any())
-            ->method('getList')
-            ->willReturn($categorySearchResults);
+
+        $this->categoryCollection->expects($this->any())
+            ->method('getAllIds')
+            ->willReturn([$categoryId]);
 
         $categoryAttributeMock = $this->getMockBuilder(AttributeAdapter::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
index 4fa99f3bf834d..fd5c87bc9518b 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
@@ -66,6 +66,7 @@ protected function setUp()
      * @param $fieldType
      * @param $attributeCode
      * @param $frontendInput
+     * @param $isSortable
      * @param $context
      * @param $expected
      * @return void
@@ -74,6 +75,7 @@ public function testGetFieldName(
         $fieldType,
         $attributeCode,
         $frontendInput,
+        $isSortable,
         $context,
         $expected
     ) {
@@ -82,7 +84,7 @@ public function testGetFieldName(
             ->willReturn('string');
         $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getAttributeCode', 'getFrontendInput'])
+            ->setMethods(['getAttributeCode', 'getFrontendInput', 'isSortable'])
             ->getMock();
         $attributeMock->expects($this->any())
             ->method('getAttributeCode')
@@ -90,6 +92,9 @@ public function testGetFieldName(
         $attributeMock->expects($this->any())
             ->method('getFrontendInput')
             ->willReturn($frontendInput);
+        $attributeMock->expects($this->any())
+            ->method('isSortable')
+            ->willReturn($isSortable);
         $this->fieldTypeResolver->expects($this->any())
             ->method('getFieldType')
             ->willReturn($fieldType);
@@ -106,13 +111,13 @@ public function testGetFieldName(
     public function getFieldNameProvider()
     {
         return [
-            ['', 'code', '', [], 'code'],
-            ['', 'code', '', ['type' => 'default'], 'code'],
-            ['string', '*', '', ['type' => 'default'], '_all'],
-            ['', 'code', '', ['type' => 'default'], 'code'],
-            ['', 'code', 'select', ['type' => 'default'], 'code'],
-            ['', 'code', 'boolean', ['type' => 'default'], 'code'],
-            ['', 'code', '', ['type' => 'type'], 'sort_code'],
+            ['', 'code', '', false, [], 'code'],
+            ['', 'code', '', false, ['type' => 'default'], 'code'],
+            ['string', '*', '', false, ['type' => 'default'], '_all'],
+            ['', 'code', '', false, ['type' => 'default'], 'code'],
+            ['', 'code', 'select', false, ['type' => 'default'], 'code'],
+            ['', 'code', 'boolean', false, ['type' => 'default'], 'code'],
+            ['', 'code', '', true, ['type' => 'sort'], 'sort_code'],
         ];
     }
 }
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
index bf8b601ed43ab..de85b8b6602b8 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
@@ -20,6 +20,8 @@
     as FieldTypeResolver;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ResolverInterface
     as FieldIndexResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
+    as FieldNameResolver;
 
 /**
  * @SuppressWarnings(PHPMD)
@@ -61,6 +63,11 @@ class StaticFieldTest extends \PHPUnit\Framework\TestCase
      */
     private $fieldTypeResolver;
 
+    /**
+     * @var FieldNameResolver
+     */
+    private $fieldNameResolver;
+
     /**
      * Set up test environment
      *
@@ -90,6 +97,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getFieldIndex'])
             ->getMock();
+        $this->fieldNameResolver = $this->getMockBuilder(FieldNameResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getFieldName'])
+            ->getMock();
 
         $objectManager = new ObjectManagerHelper($this);
 
@@ -102,6 +113,7 @@ protected function setUp()
                 'attributeAdapterProvider' => $this->attributeAdapterProvider,
                 'fieldIndexResolver' => $this->fieldIndexResolver,
                 'fieldTypeResolver' => $this->fieldTypeResolver,
+                'fieldNameResolver' => $this->fieldNameResolver,
             ]
         );
     }
@@ -113,6 +125,10 @@ protected function setUp()
      * @param $indexType
      * @param $isComplexType
      * @param $complexType
+     * @param $isSortable
+     * @param $fieldName
+     * @param $compositeFieldName
+     * @param $sortFieldName
      * @param array $expected
      * @return void
      */
@@ -122,6 +138,10 @@ public function testGetAllAttributesTypes(
         $indexType,
         $isComplexType,
         $complexType,
+        $isSortable,
+        $fieldName,
+        $compositeFieldName,
+        $sortFieldName,
         $expected
     ) {
         $this->fieldTypeResolver->expects($this->any())
@@ -132,7 +152,30 @@ public function testGetAllAttributesTypes(
             ->willReturn($indexType);
         $this->indexTypeConverter->expects($this->any())
             ->method('convert')
-            ->willReturn('no');
+            ->with($this->anything())
+            ->will($this->returnCallback(
+                function ($type) {
+                    if ($type === 'no_index') {
+                        return 'no';
+                    } elseif ($type === 'no_analyze') {
+                        return 'not_analyzed';
+                    }
+                }
+            ));
+        $this->fieldNameResolver->expects($this->any())
+            ->method('getFieldName')
+            ->with($this->anything())
+            ->will($this->returnCallback(
+                function ($attributeMock, $context) use ($fieldName, $compositeFieldName, $sortFieldName) {
+                    if (empty($context)) {
+                        return $fieldName;
+                    } elseif ($context['type'] === 'sort') {
+                        return $sortFieldName;
+                    } elseif ($context['type'] === 'text') {
+                        return $compositeFieldName;
+                    }
+                }
+            ));
 
         $productAttributeMock = $this->getMockBuilder(AbstractAttribute::class)
             ->setMethods(['getAttributeCode'])
@@ -146,11 +189,14 @@ public function testGetAllAttributesTypes(
 
         $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
             ->disableOriginalConstructor()
-            ->setMethods(['isComplexType', 'getAttributeCode'])
+            ->setMethods(['isComplexType', 'getAttributeCode', 'isSortable'])
             ->getMock();
         $attributeMock->expects($this->any())
             ->method('isComplexType')
             ->willReturn($isComplexType);
+        $attributeMock->expects($this->any())
+            ->method('isSortable')
+            ->willReturn($isSortable);
         $attributeMock->expects($this->any())
             ->method('getAttributeCode')
             ->willReturn($attributeCode);
@@ -166,13 +212,12 @@ function ($type) use ($complexType) {
                     static $callCount = [];
                     $callCount[$type] = !isset($callCount[$type]) ? 1 : ++$callCount[$type];
 
-                    if ($type === 'string') {
-                        return 'string';
-                    }
                     if ($type === 'string') {
                         return 'string';
                     } elseif ($type === 'float') {
                         return 'float';
+                    } elseif ($type === 'keyword') {
+                        return 'string';
                     } else {
                         return $complexType;
                     }
@@ -197,6 +242,10 @@ public function attributeProvider()
                 true,
                 true,
                 'text',
+                false,
+                'category_ids',
+                'category_ids_value',
+                '',
                 [
                     'category_ids' => [
                         'type' => 'select',
@@ -217,6 +266,10 @@ public function attributeProvider()
                 'no',
                 false,
                 null,
+                false,
+                'attr_code',
+                '',
+                '',
                 [
                     'attr_code' => [
                         'type' => 'text',
@@ -234,6 +287,10 @@ public function attributeProvider()
                 null,
                 false,
                 null,
+                false,
+                'attr_code',
+                '',
+                '',
                 [
                     'attr_code' => [
                         'type' => 'text'
@@ -243,6 +300,32 @@ public function attributeProvider()
                         'index' => 'no'
                     ]
                 ]
+            ],
+            [
+                'attr_code',
+                'text',
+                null,
+                false,
+                null,
+                true,
+                'attr_code',
+                '',
+                'sort_attr_code',
+                [
+                    'attr_code' => [
+                        'type' => 'text',
+                        'fields' => [
+                            'sort_attr_code' => [
+                                'type' => 'string',
+                                'index' => 'not_analyzed'
+                            ]
+                        ]
+                    ],
+                    'store_id' => [
+                        'type' => 'string',
+                        'index' => 'no'
+                    ]
+                ]
             ]
         ];
     }
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
index 8114feb09d35d..d0ffc6debcd8a 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
@@ -5,14 +5,29 @@
  */
 namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder;
 
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface as TypeResolver;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
 use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder;
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool;
 use Magento\Framework\Search\Request\Query\Match as MatchRequestQuery;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject as MockObject;
 
 class MatchTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var AttributeProvider|MockObject
+     */
+    private $attributeProvider;
+
+    /**
+     * @var TypeResolver|MockObject
+     */
+    private $fieldTypeResolver;
+
     /**
      * @var MatchQueryBuilder
      */
@@ -23,46 +38,63 @@ class MatchTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
+        $this->attributeProvider = $this->createMock(AttributeProvider::class);
+        $this->fieldTypeResolver = $this->createMock(TypeResolver::class);
+
+        $valueTransformerPoolMock = $this->createMock(ValueTransformerPool::class);
+        $valueTransformerMock = $this->createMock(ValueTransformerInterface::class);
+        $valueTransformerPoolMock->method('get')
+            ->willReturn($valueTransformerMock);
+        $valueTransformerMock->method('transform')
+            ->willReturnArgument(0);
+
         $this->matchQueryBuilder = (new ObjectManager($this))->getObject(
             MatchQueryBuilder::class,
             [
                 'fieldMapper' => $this->getFieldMapper(),
                 'preprocessorContainer' => [],
+                'attributeProvider' => $this->attributeProvider,
+                'fieldTypeResolver' => $this->fieldTypeResolver,
+                'valueTransformerPool' => $valueTransformerPoolMock,
             ]
         );
     }
 
     /**
      * Tests that method constructs a correct select query.
-     * @see MatchQueryBuilder::build
-     *
-     * @dataProvider queryValuesInvariantsProvider
      *
-     * @param string $rawQueryValue
-     * @param string $errorMessage
+     * @see MatchQueryBuilder::build
      */
-    public function testBuild($rawQueryValue, $errorMessage)
+    public function testBuild()
     {
-        $this->assertSelectQuery(
-            $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'not'),
-            $errorMessage
-        );
-    }
+        $attributeAdapter = $this->createMock(AttributeAdapter::class);
+        $this->attributeProvider->expects($this->once())
+            ->method('getByAttributeCode')
+            ->with('some_field')
+            ->willReturn($attributeAdapter);
+        $this->fieldTypeResolver->expects($this->once())
+            ->method('getFieldType')
+            ->with($attributeAdapter)
+            ->willReturn('text');
+
+        $rawQueryValue = 'query_value';
+        $selectQuery = $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'not');
 
-    /**
-     * @link https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html Fulltext-boolean search docs.
-     *
-     * @return array
-     */
-    public function queryValuesInvariantsProvider()
-    {
-        return [
-            ['query_value', 'Select query field must match simple raw query value.'],
-            ['query_value+', 'Specifying a trailing plus sign causes InnoDB to report a syntax error.'],
-            ['query_value-', 'Specifying a trailing minus sign causes InnoDB to report a syntax error.'],
-            ['query_@value', 'The @ symbol is reserved for use by the @distance proximity search operator.'],
-            ['query_value+@', 'The @ symbol is reserved for use by the @distance proximity search operator.'],
+        $expectedSelectQuery = [
+            'bool' => [
+                'must_not' => [
+                    [
+                        'match' => [
+                            'some_field' => [
+                                'query' => $rawQueryValue,
+                                'boost' => 43,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
         ];
+        $this->assertEquals($expectedSelectQuery, $selectQuery);
     }
 
     /**
@@ -76,6 +108,16 @@ public function queryValuesInvariantsProvider()
      */
     public function testBuildMatchQuery($rawQueryValue, $queryValue, $match)
     {
+        $attributeAdapter = $this->createMock(AttributeAdapter::class);
+        $this->attributeProvider->expects($this->once())
+            ->method('getByAttributeCode')
+            ->with('some_field')
+            ->willReturn($attributeAdapter);
+        $this->fieldTypeResolver->expects($this->once())
+            ->method('getFieldType')
+            ->with($attributeAdapter)
+            ->willReturn('text');
+
         $query = $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'should');
 
         $expectedSelectQuery = [
@@ -111,30 +153,6 @@ public function matchProvider()
         ];
     }
 
-    /**
-     * @param array $selectQuery
-     * @param string $errorMessage
-     */
-    private function assertSelectQuery($selectQuery, $errorMessage)
-    {
-        $expectedSelectQuery = [
-            'bool' => [
-                'must_not' => [
-                    [
-                        'match' => [
-                            'some_field' => [
-                                'query' => 'query_value',
-                                'boost' => 43,
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ];
-
-        $this->assertEquals($expectedSelectQuery, $selectQuery, $errorMessage);
-    }
-
     /**
      * Gets fieldMapper mock object.
      *
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/SortTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/SortTest.php
new file mode 100644
index 0000000000000..efd9073694129
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/SortTest.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder;
+
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
+    as FieldNameResolver;
+use Magento\Framework\Search\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Elasticsearch\SearchAdapter\Query\Builder\Sort;
+
+/**
+ * Class SortTest
+ */
+class SortTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeAdapterProvider;
+
+    /**
+     * @var FieldNameResolver
+     */
+    private $fieldNameResolver;
+
+    /**
+     * @var Sort
+     */
+    private $sortBuilder;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->attributeAdapterProvider = $this->getMockBuilder(AttributeProvider::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getByAttributeCode'])
+            ->getMock();
+        $this->fieldNameResolver = $this->getMockBuilder(FieldNameResolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getFieldName'])
+            ->getMock();
+
+        $this->sortBuilder = (new ObjectManager($this))->getObject(
+            Sort::class,
+            [
+                'attributeAdapterProvider' => $this->attributeAdapterProvider,
+                'fieldNameResolver' => $this->fieldNameResolver,
+            ]
+        );
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @dataProvider getSortProvider
+     * @param array $sortItems
+     * @param $isSortable
+     * @param $isFloatType
+     * @param $isIntegerType
+     * @param $fieldName
+     * @param array $expected
+     */
+    public function testGetSort(
+        array $sortItems,
+        $isSortable,
+        $isFloatType,
+        $isIntegerType,
+        $fieldName,
+        array $expected
+    ) {
+        /** @var MockObject|RequestInterface $request */
+        $request = $this->getMockBuilder(RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getSort'])
+            ->getMockForAbstractClass();
+        $request->expects($this->any())
+            ->method('getSort')
+            ->willReturn($sortItems);
+        $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isSortable', 'isFloatType', 'isIntegerType'])
+            ->getMock();
+        $attributeMock->expects($this->any())
+            ->method('isSortable')
+            ->willReturn($isSortable);
+        $attributeMock->expects($this->any())
+            ->method('isFloatType')
+            ->willReturn($isFloatType);
+        $attributeMock->expects($this->any())
+            ->method('isIntegerType')
+            ->willReturn($isIntegerType);
+        $this->attributeAdapterProvider->expects($this->any())
+            ->method('getByAttributeCode')
+            ->with($this->anything())
+            ->willReturn($attributeMock);
+        $this->fieldNameResolver->expects($this->any())
+            ->method('getFieldName')
+            ->with($this->anything())
+            ->will($this->returnCallback(
+                function ($attribute, $context) use ($fieldName) {
+                    if (empty($context)) {
+                        return $fieldName;
+                    } elseif ($context['type'] === 'sort') {
+                        return 'sort_' . $fieldName;
+                    }
+                }
+            ));
+
+        $this->assertEquals(
+            $expected,
+            $this->sortBuilder->getSort($request)
+        );
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return array
+     */
+    public function getSortProvider()
+    {
+        return [
+            [
+                [
+                    [
+                        'field' => 'entity_id',
+                        'direction' => 'DESC'
+                    ]
+                ],
+                null,
+                null,
+                null,
+                null,
+                []
+            ],
+            [
+                [
+                    [
+                        'field' => 'entity_id',
+                        'direction' => 'DESC'
+                    ],
+                    [
+                        'field' => 'price',
+                        'direction' => 'DESC'
+                    ],
+                ],
+                false,
+                false,
+                false,
+                'price',
+                [
+                    [
+                        'price' => [
+                            'order' => 'desc'
+                        ]
+                    ]
+                ]
+            ],
+            [
+                [
+                    [
+                        'field' => 'entity_id',
+                        'direction' => 'DESC'
+                    ],
+                    [
+                        'field' => 'price',
+                        'direction' => 'DESC'
+                    ],
+                ],
+                true,
+                true,
+                true,
+                'price',
+                [
+                    [
+                        'price' => [
+                            'order' => 'desc'
+                        ]
+                    ]
+                ]
+            ],
+            [
+                [
+                    [
+                        'field' => 'entity_id',
+                        'direction' => 'DESC'
+                    ],
+                    [
+                        'field' => 'name',
+                        'direction' => 'DESC'
+                    ],
+                ],
+                true,
+                false,
+                false,
+                'name',
+                [
+                    [
+                        'name.sort_name' => [
+                            'order' => 'desc'
+                        ]
+                    ]
+                ]
+            ],
+            [
+                [
+                    [
+                        'field' => 'entity_id',
+                        'direction' => 'DESC'
+                    ],
+                    [
+                        'field' => 'not_eav_attribute',
+                        'direction' => 'DESC'
+                    ],
+                ],
+                false,
+                false,
+                false,
+                'not_eav_attribute',
+                [
+                    [
+                        'not_eav_attribute' => [
+                            'order' => 'desc'
+                        ]
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php
index 9ea241b2fbf5c..d89e420457206 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php
@@ -79,7 +79,7 @@ public function testCreate()
                 'itemTwo' => 45,
             ]
         ];
-        $rawResponse = ['documents' => $documents, 'aggregations' => $aggregations];
+        $rawResponse = ['documents' => $documents, 'aggregations' => $aggregations, 'total' => 2];
 
         $exceptedResponse = [
             'documents' => [
@@ -102,6 +102,7 @@ public function testCreate()
                     'itemTwo' => 45
                 ],
             ],
+            'total' => 2,
         ];
 
         $this->documentFactory->expects($this->at(0))->method('create')
@@ -118,7 +119,11 @@ public function testCreate()
         $this->objectManager->expects($this->once())->method('create')
             ->with(
                 $this->equalTo(\Magento\Framework\Search\Response\QueryResponse::class),
-                $this->equalTo(['documents' => ['document1', 'document2'], 'aggregations' => 'aggregationsData'])
+                $this->equalTo([
+                    'documents' => ['document1', 'document2'],
+                    'aggregations' => 'aggregationsData',
+                    'total' => 2
+                ])
             )
             ->will($this->returnValue('QueryResponseObject'));
 
diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index a821506f5ef6e..c6ac38c1e4005 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "elasticsearch/elasticsearch": "~2.0|~5.1"
+        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index ad549d5d37705..9732ae8226431 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -13,6 +13,124 @@
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter" />
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter" />
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider" />
+    <type name="Magento\Elasticsearch\Model\Config">
+        <arguments>
+            <argument name="engineList" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">elasticsearch</item>
+                <item name="elasticsearch5" xsi:type="string">elasticsearch5</item>
+            </argument>
+        </arguments>
+    </type>
+
+    <virtualType name="Magento\Elasticsearch\Model\Layer\Search\Context" type="Magento\Catalog\Model\Layer\Search\Context">
+        <arguments>
+            <argument name="collectionProvider" xsi:type="object">elasticsearchLayerSearchItemCollectionProvider</argument>
+            <argument name="stateKey" xsi:type="object">Magento\CatalogSearch\Model\Layer\Search\StateKey</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Catalog\Model\Layer\Search">
+        <arguments>
+            <argument name="context" xsi:type="object">Magento\Elasticsearch\Model\Layer\Search\Context</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Elasticsearch\Model\Layer\Category\Context" type="Magento\Catalog\Model\Layer\Category\Context">
+        <arguments>
+            <argument name="collectionProvider" xsi:type="object">elasticsearchLayerCategoryItemCollectionProvider</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Catalog\Model\Layer\Category">
+        <arguments>
+            <argument name="context" xsi:type="object">Magento\Elasticsearch\Model\Layer\Category\Context</argument>
+        </arguments>
+    </type>
+    <virtualType name="elasticsearchFulltextSearchCollection" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection">
+        <arguments>
+            <argument name="searchRequestName" xsi:type="string">quick_search_container</argument>
+            <argument name="searchCriteriaResolverFactory" xsi:type="object">elasticsearchSearchCriteriaResolverFactory</argument>
+            <argument name="searchResultApplierFactory" xsi:type="object">elasticsearchSearchResultApplier\Factory</argument>
+            <argument name="totalRecordsResolverFactory" xsi:type="object">elasticsearchTotalRecordsResolver\Factory</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearchFulltextSearchCollectionFactory" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\SearchCollectionFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">elasticsearchFulltextSearchCollection</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearchLayerSearchItemCollectionProvider" type="Magento\Elasticsearch\Model\Layer\Search\ItemCollectionProvider">
+        <arguments>
+            <argument name="factories" xsi:type="array">
+                <item name="mysql" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Fulltext\SearchCollectionFactory</item>
+                <item name="elasticsearch" xsi:type="object">elasticsearchFulltextSearchCollectionFactory</item>
+                <item name="elasticsearch5" xsi:type="object">elasticsearchFulltextSearchCollectionFactory</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearchCategoryCollection" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection">
+        <arguments>
+            <argument name="searchRequestName" xsi:type="string">catalog_view_container</argument>
+            <argument name="searchCriteriaResolverFactory" xsi:type="object">elasticsearchSearchCriteriaResolverFactory</argument>
+            <argument name="searchResultApplierFactory" xsi:type="object">elasticsearchSearchResultApplier\Factory</argument>
+            <argument name="totalRecordsResolverFactory" xsi:type="object">elasticsearchTotalRecordsResolver\Factory</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearchCategoryCollectionFactory" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\SearchCollectionFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">elasticsearchCategoryCollection</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearchLayerCategoryItemCollectionProvider" type="Magento\Elasticsearch\Model\Layer\Category\ItemCollectionProvider">
+        <arguments>
+            <argument name="factories" xsi:type="array">
+                <item name="mysql" xsi:type="object">Magento\CatalogSearch\Model\ResourceModel\Fulltext\CollectionFactory</item>
+                <item name="elasticsearch" xsi:type="object">elasticsearchCategoryCollectionFactory</item>
+                <item name="elasticsearch5" xsi:type="object">elasticsearchCategoryCollectionFactory</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearchAdvancedCollection" type="Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection">
+        <arguments>
+            <argument name="searchRequestName" xsi:type="string">advanced_search_container</argument>
+            <argument name="searchCriteriaResolverFactory" xsi:type="object">elasticsearchSearchCriteriaResolverFactory</argument>
+            <argument name="searchResultApplierFactory" xsi:type="object">elasticsearchSearchResultApplier\Factory</argument>
+            <argument name="totalRecordsResolverFactory" xsi:type="object">elasticsearchTotalRecordsResolver\Factory</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearchAdvancedCollectionFactory" type="Magento\CatalogSearch\Model\ResourceModel\Advanced\CollectionFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">elasticsearchAdvancedCollection</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\CatalogSearch\Model\Search\ItemCollectionProvider">
+        <arguments>
+            <argument name="factories" xsi:type="array">
+                <item name="elasticsearch" xsi:type="object">elasticsearchAdvancedCollectionFactory</item>
+                <item name="elasticsearch5" xsi:type="object">elasticsearchAdvancedCollectionFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyProvider">
+        <arguments>
+            <argument name="strategies" xsi:type="array">
+                <item name="elasticsearch" xsi:type="object">Magento\Elasticsearch\Model\Advanced\ProductCollectionPrepareStrategy</item>
+                <item name="elasticsearch5" xsi:type="object">Magento\Elasticsearch\Model\Advanced\ProductCollectionPrepareStrategy</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="elasticsearchSearchCriteriaResolverFactory" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolver</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearchSearchResultApplier\Factory" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplier</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="elasticsearchTotalRecordsResolver\Factory" type="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolver</argument>
+        </arguments>
+    </virtualType>
     <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver">
         <arguments>
             <argument name="fieldMappers" xsi:type="array">
@@ -21,7 +139,7 @@
         </arguments>
     </type>
     <preference for="Magento\Elasticsearch\Model\Adapter\DataMapperInterface" type="Magento\Elasticsearch\Model\Adapter\DataMapper\DataMapperResolver" />
-    <virtualType name="AdditionalFieldsForElasticsearchDataMapper" type="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProvider">
+    <virtualType name="additionalFieldsProviderForElasticsearch" type="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProvider">
         <arguments>
             <argument name="fieldsProviders" xsi:type="array">
                 <item name="categories" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProviderProxy</item>
@@ -31,7 +149,7 @@
     </virtualType>
     <type name="Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper">
         <arguments>
-            <argument name="additionalFieldsProvider" xsi:type="object">AdditionalFieldsForElasticsearchDataMapper</argument>
+            <argument name="additionalFieldsProvider" xsi:type="object">additionalFieldsProviderForElasticsearch</argument>
         </arguments>
     </type>
     <preference for="Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface" type="Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperResolver" />
@@ -360,6 +478,7 @@
             <argument name="indexTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
             <argument name="fieldIndexResolver" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\IndexResolver</argument>
             <argument name="fieldTypeResolver" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver</argument>
+            <argument name="fieldNameResolver" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface</argument>
         </arguments>
     </virtualType>
     <virtualType name="elasticsearch5DynamicFieldProvider" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField">
@@ -421,4 +540,22 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool">
+        <arguments>
+            <argument name="valueTransformers" xsi:type="array">
+                <item name="default" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer</item>
+                <item name="date" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\DateTransformer</item>
+                <item name="float" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\FloatTransformer</item>
+                <item name="integer" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\IntegerTransformer</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer">
+        <arguments>
+            <argument name="preprocessors" xsi:type="array">
+                <item name="stopwordsPreprocessor" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords</item>
+                <item name="synonymsPreprocessor" xsi:type="object">Magento\Search\Adapter\Query\Preprocessor\Synonyms</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Elasticsearch6/Model/Config.php b/app/code/Magento/Elasticsearch6/Model/Config.php
deleted file mode 100644
index 1a989e2705fdd..0000000000000
--- a/app/code/Magento/Elasticsearch6/Model/Config.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Elasticsearch6\Model;
-
-use Magento\Framework\Search\EngineResolverInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\AdvancedSearch\Model\Client\ClientResolver;
-
-/**
- * Elasticsearch6 config model
- */
-class Config extends \Magento\Elasticsearch\Model\Config
-{
-    /**
-     * Search engine name
-     */
-    private const ENGINE_NAME_6 = 'elasticsearch6';
-
-    /**
-     * @var EngineResolverInterface
-     */
-    private $engineResolver;
-
-    /**
-     * Constructor
-     *
-     * @param ScopeConfigInterface $scopeConfig
-     * @param ClientResolver|null $clientResolver
-     * @param EngineResolverInterface|null $engineResolver
-     * @param string|null $prefix
-     */
-    public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\AdvancedSearch\Model\Client\ClientResolver $clientResolver,
-        \Magento\Framework\Search\EngineResolverInterface $engineResolver,
-        $prefix = null
-    ) {
-        parent::__construct($scopeConfig, $clientResolver, $engineResolver, $prefix);
-        $this->engineResolver = $engineResolver;
-    }
-
-    /**
-     * Return true if third party search engine is used
-     *
-     * @return bool
-     */
-    public function isElasticsearchEnabled()
-    {
-        return in_array($this->engineResolver->getCurrentSearchEngine(), [self::ENGINE_NAME_6]);
-    }
-}
diff --git a/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
index 77e1270f54fc2..d05471734bb8f 100644
--- a/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
+++ b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
@@ -9,7 +9,7 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Search\Model\QueryInterface;
 use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
-use Magento\Elasticsearch6\Model\Config;
+use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
 use Magento\Search\Model\QueryResultFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
index c2a70d3f082f0..a3c6e7e148f3d 100644
--- a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php
@@ -66,6 +66,7 @@ protected function setUp()
      * @param $fieldType
      * @param $attributeCode
      * @param $frontendInput
+     * @param $isSortable
      * @param $context
      * @param $expected
      * @return void
@@ -74,6 +75,7 @@ public function testGetFieldName(
         $fieldType,
         $attributeCode,
         $frontendInput,
+        $isSortable,
         $context,
         $expected
     ) {
@@ -82,7 +84,7 @@ public function testGetFieldName(
             ->willReturn('string');
         $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getAttributeCode', 'getFrontendInput'])
+            ->setMethods(['getAttributeCode', 'getFrontendInput', 'isSortable'])
             ->getMock();
         $attributeMock->expects($this->any())
             ->method('getAttributeCode')
@@ -90,6 +92,9 @@ public function testGetFieldName(
         $attributeMock->expects($this->any())
             ->method('getFrontendInput')
             ->willReturn($frontendInput);
+        $attributeMock->expects($this->any())
+            ->method('isSortable')
+            ->willReturn($isSortable);
         $this->fieldTypeResolver->expects($this->any())
             ->method('getFieldType')
             ->willReturn($fieldType);
@@ -106,13 +111,13 @@ public function testGetFieldName(
     public function getFieldNameProvider()
     {
         return [
-            ['', 'code', '', [], 'code'],
-            ['', 'code', '', ['type' => 'default'], 'code'],
-            ['string', '*', '', ['type' => 'default'], '_search'],
-            ['', 'code', '', ['type' => 'default'], 'code'],
-            ['', 'code', 'select', ['type' => 'default'], 'code'],
-            ['', 'code', 'boolean', ['type' => 'default'], 'code'],
-            ['', 'code', '', ['type' => 'type'], 'sort_code'],
+            ['', 'code', '', false, [], 'code'],
+            ['', 'code', '', false, ['type' => 'default'], 'code'],
+            ['string', '*', '', false, ['type' => 'default'], '_search'],
+            ['', 'code', '', false, ['type' => 'default'], 'code'],
+            ['', 'code', 'select', false, ['type' => 'default'], 'code'],
+            ['', 'code', 'boolean', false, ['type' => 'default'], 'code'],
+            ['', 'code', '', true, ['type' => 'sort'], 'sort_code'],
         ];
     }
 }
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
index 957edc559fdcb..b3c60b70ffa8e 100644
--- a/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
@@ -67,7 +67,7 @@ class SuggestionsTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->config = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Config::class)
+        $this->config = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
             ->disableOriginalConstructor()
             ->setMethods(['isElasticsearchEnabled'])
             ->getMock();
diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
index c289d8cd3e4e4..26b6c8c678ade 100644
--- a/app/code/Magento/Elasticsearch6/composer.json
+++ b/app/code/Magento/Elasticsearch6/composer.json
@@ -9,7 +9,7 @@
         "magento/module-search": "*",
         "magento/module-store": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~6.1"
+        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index 25eff42fd3442..011dfa1019738 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -6,6 +6,14 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Elasticsearch\Model\Config">
+        <arguments>
+            <argument name="engineList" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="string">elasticsearch6</item>
+            </argument>
+        </arguments>
+    </type>
+
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">
@@ -44,7 +52,7 @@
                 <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Client\ElasticsearchFactory</item>
             </argument>
             <argument name="clientOptions" xsi:type="array">
-                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Config</item>
+                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch\Model\Config</item>
             </argument>
         </arguments>
     </type>
@@ -158,8 +166,40 @@
     <type name="Magento\Search\Model\Search\PageSizeProvider">
         <arguments>
             <argument name="pageSizeBySearchEngine" xsi:type="array">
-                <item name="elasticsearch6" xsi:type="number">2147483647</item>
+                <item name="elasticsearch6" xsi:type="number">10000</item>
+            </argument>
+        </arguments>
+    </type>
+
+    <virtualType name="elasticsearchLayerCategoryItemCollectionProvider" type="Magento\Elasticsearch\Model\Layer\Category\ItemCollectionProvider">
+        <arguments>
+            <argument name="factories" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="object">elasticsearchCategoryCollectionFactory</item>
+            </argument>
+        </arguments>
+    </virtualType>
+
+    <type name="Magento\CatalogSearch\Model\Search\ItemCollectionProvider">
+        <arguments>
+            <argument name="factories" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="object">elasticsearchAdvancedCollectionFactory</item>
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyProvider">
+        <arguments>
+            <argument name="strategies" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="object">Magento\Elasticsearch\Model\Advanced\ProductCollectionPrepareStrategy</item>
+            </argument>
+        </arguments>
+    </type>
+
+    <virtualType name="elasticsearchLayerSearchItemCollectionProvider" type="Magento\Elasticsearch\Model\Layer\Search\ItemCollectionProvider">
+        <arguments>
+            <argument name="factories" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="object">elasticsearchFulltextSearchCollectionFactory</item>
+            </argument>
+        </arguments>
+    </virtualType>
 </config>
diff --git a/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php b/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
index 0fdce9e9090ac..cb370c27863ca 100644
--- a/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
+++ b/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
@@ -7,6 +7,9 @@
 
 use Magento\Checkout\Model\ConfigProviderInterface;
 
+/**
+ * Class CompositeConfigProvider
+ */
 class CompositeConfigProvider implements ConfigProviderInterface
 {
     /**
@@ -18,13 +21,13 @@ class CompositeConfigProvider implements ConfigProviderInterface
      * @param ConfigProviderInterface[] $configProviders
      */
     public function __construct(
-        array $configProviders
+        array $configProviders = []
     ) {
         $this->configProviders = $configProviders;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig()
     {
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
index 7d065ea50b369..b5917407b60ae 100644
--- a/app/code/Magento/GoogleAnalytics/Block/Ga.php
+++ b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -75,7 +75,8 @@ public function getPageName()
     }
 
     /**
-     * Render regular page tracking javascript code
+     * Render regular page tracking javascript code.
+     *
      * The custom "page name" may be set from layout or somewhere else. It must start from slash.
      *
      * @param string $accountId
diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
index 2af03c71fb1b0..90a207921d51f 100644
--- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
@@ -46,6 +46,6 @@ public function isGoogleAnalyticsAvailable($store = null)
      */
     public function isAnonymizedIpActive($store = null)
     {
-        return $this->scopeConfig->getValue(self::XML_PATH_ANONYMIZE, ScopeInterface::SCOPE_STORE, $store);
+        return (bool)$this->scopeConfig->getValue(self::XML_PATH_ANONYMIZE, ScopeInterface::SCOPE_STORE, $store);
     }
 }
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
new file mode 100644
index 0000000000000..5937267b4a61e
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/VerifyProductTypeOrderActionGroup.xml
@@ -0,0 +1,14 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="VerifyProductTypeOrder">
+        <seeElement stepKey="seeGroupedInOrder" selector="{{AdminProductDropdownOrderSection.groupedProduct}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
index cb268b51f08f9..ba3703e7b0edc 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
@@ -18,7 +18,7 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
     </entity>
     <entity name="ApiGroupedProduct" type="product3">
-        <data key="sku" unique="suffix">api-grouped-product</data>
+        <data key="sku" unique="suffix">apiGroupedProduct</data>
         <data key="type_id">grouped</data>
         <data key="attribute_set_id">4</data>
         <data key="name" unique="suffix">Api Grouped Product</data>
@@ -29,7 +29,7 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="ApiGroupedProduct2" type="product3">
-        <data key="sku" unique="suffix">api-grouped-product</data>
+        <data key="sku" unique="suffix">apiGroupedProduct</data>
         <data key="type_id">grouped</data>
         <data key="attribute_set_id">4</data>
         <data key="name" unique="suffix">Api Grouped Product</data>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.xml
new file mode 100644
index 0000000000000..3efbabd34c1a4
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductDropdownOrderSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductDropdownOrderSection">
+        <element name="groupedProduct" type="text" selector="//li[not(preceding-sibling::li[span[@title='Virtual Product']]) and not(preceding-sibling::li[span[@title='Bundle Product']]) and not(preceding-sibling::li[span[@title='Downloadable Product']]) and not(following-sibling::li[span[@title='Simple Product']]) and not(following-sibling::li[span[@title='Configurable Product']])]/span[@title='Grouped Product']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml
new file mode 100644
index 0000000000000..a9100b4730b8c
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml
@@ -0,0 +1,30 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminImportProductsActionGroup">
+        <arguments>
+            <argument name="behavior" type="string"/>
+            <argument name="importFile" type="string"/>
+            <argument name="importMessage" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
+        <waitForPageLoad stepKey="AdminImportMainSectionLoad"/>
+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="{{behavior}}" stepKey="selectImportOption"/>
+        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
+        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
+        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
+        <waitForPageLoad stepKey="AdminImportMainSectionLoad2"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
+        <waitForPageLoad stepKey="AdminMessagesSection"/>
+        <see selector="{{AdminMessagesSection.notice}}" userInput="{{importMessage}}" stepKey="seeImportMessage"/>
+        </actionGroup>
+    </actionGroups>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
index ad9e7672ce11a..528ad23aaf2bf 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
@@ -11,5 +11,11 @@
         <element name="filterByAttributeCode" type="input" selector="#export_filter_grid_filter_attribute_code"/>
         <element name="resetFilter" type="button" selector="button[data-action='grid-filter-reset']" timeout="30"/>
         <element name="search" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
+        <element name="chooseAttribute" type="checkbox" selector="//*[@name='export_filter[{{var}}]']/ancestor::tr//input[@type='checkbox']" parameterized="true"/>
+        <element name="fillFilter" type="input" selector="//*[@name='export_filter[{{var}}]']/ancestor::tr//input[@type='text']" parameterized="true"/>
+        <element name="continueBtn" type="button" selector="//*[@id='export_filter_container']/button" timeout="30"/>
+        <element name="selectByIndex" type="button" selector="//tr[@data-repeat-index='{{var}}']//button" parameterized="true" timeout="30"/>
+        <element name="download" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Download']" parameterized="true" timeout="30"/>
+        <element name="delete" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Delete']" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
new file mode 100644
index 0000000000000..ceb4e93e4e9aa
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
@@ -0,0 +1,123 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminImportProductsWithAddUpdateBehaviorTest">
+        <annotations>
+            <description value="Verify Magento native import products with add/update behavior."/>
+            <stories value="Import Products"/>
+            <features value="Import/Export"/>
+            <title value="Verify Magento native import products with add/update behavior."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14077"/>
+            <group value="importExport"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create Simple Product1 -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct1">
+                <field key="name">SimpleProductForTest1</field>
+                <field key="sku">SimpleProductForTest1</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Login as Admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Create Website -->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
+                <argument name="newWebsiteName" value="secondWebsite"/>
+                <argument name="websiteCode" value="second_website"/>
+            </actionGroup>
+
+            <!-- Create store group -->
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateStore">
+                <argument name="website" value="secondWebsite"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+
+            <!-- Create store view -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Delete all products that replaced products in the before block post import -->
+            <deleteData stepKey="deleteSimpleProduct1" url="/V1/products/SimpleProductForTest1"/>
+            <deleteData stepKey="deleteSimpleProduct2" url="/V1/products/SimpleProductForTest2"/>
+            <deleteData stepKey="deleteSimpleProduct3" url="/V1/products/SimpleProductForTest3"/>
+
+            <!-- Delete category created in the before block -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!--Delete website created in the before block -->
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite" before="logoutFromAdmin">
+                <argument name="websiteName" value="secondWebsite"/>
+            </actionGroup>
+
+            <!-- Logout -->
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <!-- Import products with add/update behavior -->
+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProducts">
+            <argument name="behavior" value="Add/Update"/>
+            <argument name="importFile" value="catalog_import_products.csv"/>
+            <argument name="importMessage" value="Created: 2, Updated: 1, Deleted: 0"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product1 on grid-->
+        <actionGroup ref="AssertProductOnAdminGridActionGroup" stepKey="assertSimpleProduct1OnAdminGrid">
+            <argument name="product" value="SimpleProductAfterImport1"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product1 on edit page-->
+        <actionGroup ref="AssertProductInfoOnEditPageActionGroup" stepKey="assertSimpleProduct1OnEditPage">
+            <argument name="product" value="SimpleProductAfterImport1"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product2 on grid-->
+        <actionGroup ref="AssertProductOnAdminGridActionGroup" stepKey="assertSimpleProduct2OnAdminGrid">
+            <argument name="product" value="SimpleProductAfterImport2"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product2 on edit page-->
+        <actionGroup ref="AssertProductInfoOnEditPageActionGroup" stepKey="assertSimpleProduct2OnEditPage">
+            <argument name="product" value="SimpleProductAfterImport2"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product3 on grid-->
+        <actionGroup ref="AssertProductOnAdminGridActionGroup" stepKey="assertSimpleProduct3OnAdminGrid">
+            <argument name="product" value="SimpleProductAfterImport3"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product3 on edit page-->
+        <actionGroup ref="AssertProductInfoOnEditPageActionGroup" stepKey="assertSimpleProduct3OnEditPage">
+            <argument name="product" value="SimpleProductAfterImport3"/>
+        </actionGroup>
+
+        <!-- Assert SimpleProduct1 on store front-->
+        <actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct1Validation">
+            <argument name="product" value="SimpleProductAfterImport1"/>
+        </actionGroup>
+        
+        <!-- Assert SimpleProduct2 on store front-->
+        <actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct2Validation">
+            <argument name="product" value="SimpleProductAfterImport2"/>
+        </actionGroup>
+
+        <!-- Assert SimpleProduct3 on store front-->
+        <actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct3Validation">
+            <argument name="product" value="SimpleProductAfterImport3"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
new file mode 100644
index 0000000000000..d63a5546716b1
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
@@ -0,0 +1,45 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminImportProductsWithReplaceBehaviorTest" extends="AdminImportProductsWithAddUpdateBehaviorTest">
+        <annotations>
+            <description value="Verify Magento native import products with replace behavior."/>
+            <stories value="Import Products"/>
+            <features value="Import/Export"/>
+            <title value="Verify Magento native import products with replace behavior."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14076"/>
+            <group value="importExport"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create Simple Product2 -->
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct2">
+                <field key="name">SimpleProductForTest2</field>
+                <field key="sku">SimpleProductForTest2</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Create Simple Product3 -->
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct3">
+                <field key="name">SimpleProductForTest3</field>
+                <field key="sku">SimpleProductForTest3</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <!-- Import products with replace behavior -->
+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProducts">
+            <argument name="behavior" value="Replace"/>
+            <argument name="importFile" value="catalog_import_products.csv"/>
+            <argument name="importMessage" value="Created: 3, Updated: 0, Deleted: 3"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Indexer/Model/Indexer.php b/app/code/Magento/Indexer/Model/Indexer.php
index 87a7cce58e1a5..2821a46f29416 100644
--- a/app/code/Magento/Indexer/Model/Indexer.php
+++ b/app/code/Magento/Indexer/Model/Indexer.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Indexer\Model;
 
 use Magento\Framework\Indexer\ActionFactory;
@@ -14,6 +15,8 @@
 use Magento\Framework\Indexer\StructureFactory;
 
 /**
+ * Indexer model.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Indexer extends \Magento\Framework\DataObject implements IndexerInterface
@@ -361,7 +364,7 @@ public function getLatestUpdated()
                 return $this->getView()->getUpdated();
             }
         }
-        return $this->getState()->getUpdated();
+        return $this->getState()->getUpdated() ?: '';
     }
 
     /**
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
index 6b7cc12218990..ca2da9585f934 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
@@ -164,7 +164,12 @@ public function testGetLatestUpdated($getViewIsEnabled, $getViewGetUpdated, $get
                 }
             }
         } else {
-            $this->assertEquals($getStateGetUpdated, $this->model->getLatestUpdated());
+            $getLatestUpdated = $this->model->getLatestUpdated();
+            $this->assertEquals($getStateGetUpdated, $getLatestUpdated);
+
+            if ($getStateGetUpdated === null) {
+                $this->assertNotNull($getLatestUpdated);
+            }
         }
     }
 
@@ -182,7 +187,8 @@ public function getLatestUpdatedDataProvider()
             [true, '', '06-Jan-1944'],
             [true, '06-Jan-1944', ''],
             [true, '', ''],
-            [true, '06-Jan-1944', '05-Jan-1944']
+            [true, '06-Jan-1944', '05-Jan-1944'],
+            [false, null, null],
         ];
     }
 
diff --git a/app/code/Magento/MediaStorage/Service/ImageResize.php b/app/code/Magento/MediaStorage/Service/ImageResize.php
index 6e3929296e252..aae90512b3d95 100644
--- a/app/code/Magento/MediaStorage/Service/ImageResize.php
+++ b/app/code/Magento/MediaStorage/Service/ImageResize.php
@@ -24,6 +24,8 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
+ * Image resize service.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ImageResize
@@ -123,7 +125,8 @@ public function __construct(
     }
 
     /**
-     * Create resized images of different sizes from an original image
+     * Create resized images of different sizes from an original image.
+     *
      * @param string $originalImageName
      * @throws NotFoundException
      */
@@ -141,7 +144,8 @@ public function resizeFromImageName(string $originalImageName)
     }
 
     /**
-     * Create resized images of different sizes from themes
+     * Create resized images of different sizes from themes.
+     *
      * @param array|null $themes
      * @return \Generator
      * @throws NotFoundException
@@ -169,7 +173,8 @@ public function resizeFromThemes(array $themes = null): \Generator
     }
 
     /**
-     * Search the current theme
+     * Search the current theme.
+     *
      * @return array
      */
     private function getThemesInUse(): array
@@ -187,7 +192,8 @@ private function getThemesInUse(): array
     }
 
     /**
-     * Get view images data from themes
+     * Get view images data from themes.
+     *
      * @param array $themes
      * @return array
      */
@@ -211,7 +217,8 @@ private function getViewImages(array $themes): array
     }
 
     /**
-     * Get unique image index
+     * Get unique image index.
+     *
      * @param array $imageData
      * @return string
      */
@@ -223,7 +230,8 @@ private function getUniqueImageIndex(array $imageData): string
     }
 
     /**
-     * Make image
+     * Make image.
+     *
      * @param string $originalImagePath
      * @param array $imageParams
      * @return Image
@@ -241,7 +249,8 @@ private function makeImage(string $originalImagePath, array $imageParams): Image
     }
 
     /**
-     * Resize image
+     * Resize image.
+     *
      * @param array $viewImage
      * @param string $originalImagePath
      * @param string $originalImageName
@@ -257,9 +266,41 @@ private function resize(array $viewImage, string $originalImagePath, string $ori
             ]
         );
 
+        if (isset($imageParams['watermark_file'])) {
+            if ($imageParams['watermark_height'] !== null) {
+                $image->setWatermarkHeight($imageParams['watermark_height']);
+            }
+
+            if ($imageParams['watermark_width'] !== null) {
+                $image->setWatermarkWidth($imageParams['watermark_width']);
+            }
+
+            if ($imageParams['watermark_position'] !== null) {
+                $image->setWatermarkPosition($imageParams['watermark_position']);
+            }
+
+            if ($imageParams['watermark_image_opacity'] !== null) {
+                $image->setWatermarkImageOpacity($imageParams['watermark_image_opacity']);
+            }
+
+            $image->watermark($this->getWatermarkFilePath($imageParams['watermark_file']));
+        }
+
         if ($imageParams['image_width'] !== null && $imageParams['image_height'] !== null) {
             $image->resize($imageParams['image_width'], $imageParams['image_height']);
         }
         $image->save($imageAsset->getPath());
     }
+
+    /**
+     * Returns watermark file absolute path
+     *
+     * @param string $file
+     * @return string
+     */
+    private function getWatermarkFilePath($file)
+    {
+        $path = $this->imageConfig->getMediaPath('/watermark/' . $file);
+        return $this->mediaDirectory->getAbsolutePath($path);
+    }
 }
diff --git a/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php b/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
new file mode 100644
index 0000000000000..3d5b895575597
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Api;
+
+/**
+ * Interface describes how to describes how to compare poison pill with latest in DB.
+ *
+ * @api
+ */
+interface PoisonPillCompareInterface
+{
+    /**
+     * Check if version of current poison pill is latest.
+     *
+     * @param int $poisonPillVersion
+     * @return bool
+     */
+    public function isLatestVersion(int $poisonPillVersion): bool;
+}
diff --git a/app/code/Magento/MessageQueue/Api/PoisonPillPutInterface.php b/app/code/Magento/MessageQueue/Api/PoisonPillPutInterface.php
new file mode 100644
index 0000000000000..02293c99bb3f4
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Api/PoisonPillPutInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Api;
+
+/**
+ * Command interface describes how to create new version on poison pill.
+ *
+ * @api
+ */
+interface PoisonPillPutInterface
+{
+    /**
+     * Put new version of poison pill inside DB.
+     *
+     * @return int
+     * @throws \Exception
+     */
+    public function put(): int;
+}
diff --git a/app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php b/app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php
new file mode 100644
index 0000000000000..db97990ebbad5
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Api;
+
+/**
+ * Describes how to get latest version of poison pill.
+ *
+ * @api
+ */
+interface PoisonPillReadInterface
+{
+    /**
+     * Returns get latest version of poison pill.
+     *
+     * @return int
+     */
+    public function getLatestVersion(): int;
+}
diff --git a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
new file mode 100644
index 0000000000000..f37f2157c3575
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Model;
+
+use Magento\Framework\MessageQueue\CallbackInvokerInterface;
+use Magento\Framework\MessageQueue\QueueInterface;
+use Magento\MessageQueue\Api\PoisonPillCompareInterface;
+use Magento\MessageQueue\Api\PoisonPillReadInterface;
+
+/**
+ * Callback invoker
+ */
+class CallbackInvoker implements CallbackInvokerInterface
+{
+    /**
+     * @var PoisonPillReadInterface $poisonPillRead
+     */
+    private $poisonPillRead;
+
+    /**
+     * @var int $poisonPillVersion
+     */
+    private $poisonPillVersion;
+
+    /**
+     * @var PoisonPillCompareInterface
+     */
+    private $poisonPillCompare;
+
+    /**
+     * @param PoisonPillReadInterface $poisonPillRead
+     * @param PoisonPillCompareInterface $poisonPillCompare
+     */
+    public function __construct(
+        PoisonPillReadInterface $poisonPillRead,
+        PoisonPillCompareInterface $poisonPillCompare
+    ) {
+        $this->poisonPillRead = $poisonPillRead;
+        $this->poisonPillCompare = $poisonPillCompare;
+    }
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.ExitExpression)
+     */
+    public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
+    {
+        $this->poisonPillVersion = $this->poisonPillRead->getLatestVersion();
+        for ($i = $maxNumberOfMessages; $i > 0; $i--) {
+            do {
+                $message = $queue->dequeue();
+            } while ($message === null && (sleep(1) === 0));
+            if (false === $this->poisonPillCompare->isLatestVersion($this->poisonPillVersion)) {
+                $queue->reject($message);
+                exit(0);
+            }
+            $callback($message);
+        }
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php b/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
new file mode 100644
index 0000000000000..a8e40ea495002
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Model;
+
+use Magento\MessageQueue\Api\PoisonPillCompareInterface;
+use Magento\MessageQueue\Api\PoisonPillReadInterface;
+
+/**
+ * Poison pill compare
+ */
+class PoisonPillCompare implements PoisonPillCompareInterface
+{
+    /**
+     * @var PoisonPillReadInterface
+     */
+    private $poisonPillRead;
+
+    /**
+     * PoisonPillCompare constructor.
+     * @param PoisonPillReadInterface $poisonPillRead
+     */
+    public function __construct(
+        PoisonPillReadInterface $poisonPillRead
+    ) {
+        $this->poisonPillRead = $poisonPillRead;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isLatestVersion(int $poisonPillVersion): bool
+    {
+        return $poisonPillVersion === $this->poisonPillRead->getLatestVersion();
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
new file mode 100644
index 0000000000000..283fff8ace7c7
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Model\ResourceModel;
+
+use Magento\MessageQueue\Api\PoisonPillReadInterface;
+use Magento\MessageQueue\Api\PoisonPillPutInterface;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
+/**
+ * PoisonPill.
+ */
+class PoisonPill extends AbstractDb implements PoisonPillPutInterface, PoisonPillReadInterface
+{
+    /**
+     * Table name.
+     */
+    const QUEUE_POISON_PILL_TABLE = 'queue_poison_pill';
+
+    /**
+     * PoisonPill constructor.
+     *
+     * @param Context $context
+     * @param string|null $connectionName
+     */
+    public function __construct(
+        Context $context,
+        string $connectionName = null
+    ) {
+        parent::__construct($context, $connectionName);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        $this->_init(self::QUEUE_POISON_PILL_TABLE, 'version');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function put(): int
+    {
+        $connection = $this->getConnection();
+        $table = $this->getMainTable();
+        $connection->insert($table, []);
+        return (int)$connection->lastInsertId($table);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getLatestVersion() : int
+    {
+        $select = $this->getConnection()->select()->from(
+            $this->getTable(self::QUEUE_POISON_PILL_TABLE),
+            'version'
+        )->order(
+            'version ' . \Magento\Framework\DB\Select::SQL_DESC
+        )->limit(
+            1
+        );
+
+        $version = (int)$this->getConnection()->fetchOne($select);
+
+        return $version;
+    }
+}
diff --git a/app/code/Magento/MessageQueue/etc/db_schema.xml b/app/code/Magento/MessageQueue/etc/db_schema.xml
index 7a20d2bd4df5d..9cdf414dd06e1 100644
--- a/app/code/Magento/MessageQueue/etc/db_schema.xml
+++ b/app/code/Magento/MessageQueue/etc/db_schema.xml
@@ -21,4 +21,12 @@
             <column name="message_code"/>
         </constraint>
     </table>
+    <table name="queue_poison_pill" resource="default" engine="innodb"
+           comment="Sequence table for poison pill versions">
+        <column xsi:type="int" name="version" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Poison Pill version."/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="version"/>
+        </constraint>
+    </table>
 </schema>
diff --git a/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
index f31981d2ec40f..d9d623a994b37 100644
--- a/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
+++ b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
@@ -9,5 +9,13 @@
             "PRIMARY": true,
             "QUEUE_LOCK_MESSAGE_CODE": true
         }
+    },
+    "queue_poison_pill": {
+        "column": {
+            "version": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/MessageQueue/etc/di.xml b/app/code/Magento/MessageQueue/etc/di.xml
index c8f2edb862613..22cfea976a722 100644
--- a/app/code/Magento/MessageQueue/etc/di.xml
+++ b/app/code/Magento/MessageQueue/etc/di.xml
@@ -13,6 +13,10 @@
     <preference for="Magento\Framework\MessageQueue\EnvelopeInterface" type="Magento\Framework\MessageQueue\Envelope"/>
     <preference for="Magento\Framework\MessageQueue\ConsumerInterface" type="Magento\Framework\MessageQueue\Consumer"/>
     <preference for="Magento\Framework\MessageQueue\MergedMessageInterface" type="Magento\Framework\MessageQueue\MergedMessage"/>
+    <preference for="Magento\MessageQueue\Api\PoisonPillCompareInterface" type="Magento\MessageQueue\Model\PoisonPillCompare"/>
+    <preference for="Magento\MessageQueue\Api\PoisonPillPutInterface" type="Magento\MessageQueue\Model\ResourceModel\PoisonPill"/>
+    <preference for="Magento\MessageQueue\Api\PoisonPillReadInterface" type="Magento\MessageQueue\Model\ResourceModel\PoisonPill"/>
+    <preference for="Magento\Framework\MessageQueue\CallbackInvokerInterface" type="Magento\MessageQueue\Model\CallbackInvoker"/>
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index 393383bb2e772..2f6dd2da9bbc4 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -7,14 +7,17 @@
 
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
+use Magento\Framework\App\ObjectManager;
 use Magento\Msrp\Model\Product\Attribute\Source\Type;
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
  * Msrp data helper
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Data extends AbstractHelper
 {
@@ -43,6 +46,11 @@ class Data extends AbstractHelper
      */
     protected $productRepository;
 
+    /**
+     * @var MsrpPriceCalculatorInterface
+     */
+    private $msrpPriceCalculator;
+
     /**
      * @param Context $context
      * @param StoreManagerInterface $storeManager
@@ -51,6 +59,7 @@ class Data extends AbstractHelper
      * @param \Magento\Msrp\Model\Config $config
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param ProductRepositoryInterface $productRepository
+     * @param MsrpPriceCalculatorInterface|null $msrpPriceCalculator
      */
     public function __construct(
         Context $context,
@@ -59,7 +68,8 @@ public function __construct(
         \Magento\Msrp\Model\Msrp $msrp,
         \Magento\Msrp\Model\Config $config,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        ProductRepositoryInterface $productRepository
+        ProductRepositoryInterface $productRepository,
+        MsrpPriceCalculatorInterface $msrpPriceCalculator = null
     ) {
         parent::__construct($context);
         $this->storeManager = $storeManager;
@@ -68,6 +78,8 @@ public function __construct(
         $this->config = $config;
         $this->priceCurrency = $priceCurrency;
         $this->productRepository = $productRepository;
+        $this->msrpPriceCalculator = $msrpPriceCalculator
+            ?: ObjectManager::getInstance()->get(MsrpPriceCalculatorInterface::class);
     }
 
     /**
@@ -78,6 +90,7 @@ public function __construct(
      * @return bool
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function canApplyMsrp($product, $visibility = null)
     {
@@ -111,6 +124,7 @@ public function canApplyMsrp($product, $visibility = null)
      *
      * @param Product $product
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getMsrpPriceMessage($product)
     {
@@ -128,6 +142,7 @@ public function getMsrpPriceMessage($product)
      *
      * @param int|Product $product
      * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function isShowPriceOnGesture($product)
     {
@@ -139,6 +154,7 @@ public function isShowPriceOnGesture($product)
      *
      * @param int|Product $product
      * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function isShowBeforeOrderConfirm($product)
     {
@@ -149,31 +165,16 @@ public function isShowBeforeOrderConfirm($product)
      * Check if any MAP price is larger than as low as value.
      *
      * @param int|Product $product
-     * @return bool|float
+     * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function isMinimalPriceLessMsrp($product)
     {
         if (is_numeric($product)) {
             $product = $this->productRepository->getById($product, false, $this->storeManager->getStore()->getId());
         }
-        $msrp = $product->getMsrp();
+        $msrp = $this->msrpPriceCalculator->getMsrpPriceValue($product);
         $price = $product->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE);
-        if ($msrp === null) {
-            if ($product->getTypeId() === \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
-                $msrp = $product->getTypeInstance()->getChildrenMsrp($product);
-            } elseif ($product->getTypeId() === Configurable::TYPE_CODE) {
-                $prices = [];
-                foreach ($product->getTypeInstance()->getUsedProducts($product) as $item) {
-                    if ($item->getMsrp() !== null) {
-                        $prices[] = $item->getMsrp();
-                    }
-                }
-
-                $msrp = $prices ? max($prices) : 0;
-            } else {
-                return false;
-            }
-        }
         if ($msrp) {
             $msrp = $this->priceCurrency->convertAndRound($msrp);
         }
diff --git a/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php
new file mode 100644
index 0000000000000..3d1e5ef0b8e6c
--- /dev/null
+++ b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Msrp\Pricing;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * @inheritdoc
+ */
+class MsrpPriceCalculator implements MsrpPriceCalculatorInterface
+{
+    /**
+     * @var MsrpPriceCalculatorInterface[]
+     */
+    private $msrpPriceCalculators;
+
+    /**
+     * @param array $msrpPriceCalculators
+     */
+    public function __construct(array $msrpPriceCalculators)
+    {
+        $this->msrpPriceCalculators = $this->getMsrpPriceCalculators($msrpPriceCalculators);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMsrpPriceValue(ProductInterface $product): float
+    {
+        $productType = $product->getTypeId();
+        if (isset($this->msrpPriceCalculators[$productType])) {
+            $priceCalculator = $this->msrpPriceCalculators[$productType];
+            $msrp = $priceCalculator->getMsrpPriceValue($product);
+        } else {
+            $msrp = (float)$product->getMsrp();
+        }
+
+        return $msrp;
+    }
+
+    /**
+     * Convert the configuration of MSRP price calculators.
+     *
+     * @param array $msrpPriceCalculatorsConfig
+     * @return array
+     */
+    private function getMsrpPriceCalculators(array $msrpPriceCalculatorsConfig): array
+    {
+        $msrpPriceCalculators = [];
+        foreach ($msrpPriceCalculatorsConfig as $msrpPriceCalculator) {
+            if (isset($msrpPriceCalculator['productType'], $msrpPriceCalculator['priceCalculator'])) {
+                $msrpPriceCalculators[$msrpPriceCalculator['productType']] =
+                    $msrpPriceCalculator['priceCalculator'];
+            }
+        }
+        return $msrpPriceCalculators;
+    }
+}
diff --git a/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
new file mode 100644
index 0000000000000..c50a381a2efa4
--- /dev/null
+++ b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Msrp\Pricing;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Provide information about MSRP price of a product.
+ */
+interface MsrpPriceCalculatorInterface
+{
+    /**
+     * Return the value of MSRP product price.
+     *
+     * @param ProductInterface $product
+     * @return float
+     */
+    public function getMsrpPriceValue(ProductInterface $product): float;
+}
diff --git a/app/code/Magento/Msrp/Pricing/Render/PriceBox.php b/app/code/Magento/Msrp/Pricing/Render/PriceBox.php
new file mode 100644
index 0000000000000..892c0bcb51244
--- /dev/null
+++ b/app/code/Magento/Msrp/Pricing/Render/PriceBox.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Msrp\Pricing\Render;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Math\Random;
+use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\Render\RendererPool;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
+
+/**
+ * MSRP price box render.
+ */
+class PriceBox extends \Magento\Catalog\Pricing\Render\PriceBox
+{
+    /**
+     * @var MsrpPriceCalculatorInterface
+     */
+    private $msrpPriceCalculator;
+
+    /**
+     * Constructor
+     *
+     * @param Context $context
+     * @param Product $saleableItem
+     * @param PriceInterface $price
+     * @param RendererPool $rendererPool
+     * @param Data $jsonHelper
+     * @param Random $mathRandom
+     * @param MsrpPriceCalculatorInterface $msrpPriceCalculator
+     */
+    public function __construct(
+        Context $context,
+        Product $saleableItem,
+        PriceInterface $price,
+        RendererPool $rendererPool,
+        Data $jsonHelper,
+        Random $mathRandom,
+        MsrpPriceCalculatorInterface $msrpPriceCalculator
+    ) {
+        $this->msrpPriceCalculator = $msrpPriceCalculator;
+        parent::__construct($context, $saleableItem, $price, $rendererPool, $jsonHelper, $mathRandom);
+    }
+
+    /**
+     * Return MSRP price calculator.
+     *
+     * @return MsrpPriceCalculatorInterface
+     */
+    public function getMsrpPriceCalculator(): MsrpPriceCalculatorInterface
+    {
+        return $this->msrpPriceCalculator;
+    }
+}
diff --git a/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php b/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
index 19f46b06ac5af..e4cd411a2e0b8 100644
--- a/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Msrp\Test\Unit\Helper;
 
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
+
 /**
  * Class DataTest
  */
@@ -26,6 +28,14 @@ class DataTest extends \PHPUnit\Framework\TestCase
      */
     protected $productMock;
 
+    /**
+     * @var MsrpPriceCalculatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $msrpPriceCalculator;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->priceCurrencyMock = $this->createMock(\Magento\Framework\Pricing\PriceCurrencyInterface::class);
@@ -33,6 +43,8 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getMsrp', 'getPriceInfo', '__wakeup'])
             ->getMock();
+        $this->msrpPriceCalculator = $this->getMockBuilder(MsrpPriceCalculatorInterface::class)
+            ->getMockForAbstractClass();
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
@@ -40,10 +52,14 @@ protected function setUp()
             \Magento\Msrp\Helper\Data::class,
             [
                 'priceCurrency' => $this->priceCurrencyMock,
+                'msrpPriceCalculator' => $this->msrpPriceCalculator,
             ]
         );
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
     public function testIsMinimalPriceLessMsrp()
     {
         $msrp = 120;
@@ -73,12 +89,13 @@ function ($arg) {
             ->with(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)
             ->will($this->returnValue($finalPriceMock));
 
-        $this->productMock->expects($this->any())
-            ->method('getMsrp')
-            ->will($this->returnValue($msrp));
+        $this->msrpPriceCalculator
+            ->expects($this->any())
+            ->method('getMsrpPriceValue')
+            ->willReturn($msrp);
         $this->productMock->expects($this->any())
             ->method('getPriceInfo')
-            ->will($this->returnValue($priceInfoMock));
+            ->willReturn($priceInfoMock);
 
         $result = $this->helper->isMinimalPriceLessMsrp($this->productMock);
         $this->assertTrue($result, "isMinimalPriceLessMsrp returned incorrect value");
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index e3099aa2f14d6..a2e6da6de5387 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -10,8 +10,6 @@
         "magento/module-catalog": "*",
         "magento/module-downloadable": "*",
         "magento/module-eav": "*",
-        "magento/module-grouped-product": "*",
-        "magento/module-configurable-product": "*",
         "magento/module-store": "*",
         "magento/module-tax": "*"
     },
diff --git a/app/code/Magento/Msrp/etc/di.xml b/app/code/Magento/Msrp/etc/di.xml
index 6f197f769d412..b8392b0bb0fe4 100644
--- a/app/code/Magento/Msrp/etc/di.xml
+++ b/app/code/Magento/Msrp/etc/di.xml
@@ -7,6 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="\Magento\Msrp\Api\Data\ProductRender\MsrpPriceInfoInterface" type="\Magento\Msrp\Model\ProductRender\MsrpPriceInfo" />
+    <preference for="\Magento\Msrp\Pricing\MsrpPriceCalculatorInterface" type="\Magento\Msrp\Pricing\MsrpPriceCalculator"/>
     <virtualType name="Magento\Catalog\Pricing\Price\Pool">
         <arguments>
             <argument name="prices" xsi:type="array">
diff --git a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
index 9e2dd20638646..b8a3910bf21bc 100644
--- a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
+++ b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
@@ -11,7 +11,7 @@
             <argument name="default" xsi:type="array">
                 <item name="prices" xsi:type="array">
                     <item name="msrp_price" xsi:type="array">
-                        <item name="render_class" xsi:type="string">Magento\Catalog\Pricing\Render\PriceBox</item>
+                        <item name="render_class" xsi:type="string">Magento\Msrp\Pricing\Render\PriceBox</item>
                         <item name="render_template" xsi:type="string">Magento_Msrp::product/price/msrp.phtml</item>
                     </item>
                 </item>
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index a951c14cf4c70..a428df57ab113 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -9,7 +9,7 @@
 /**
  * Template for displaying product price at product view page, gift registry and wish-list
  *
- * @var $block \Magento\Catalog\Pricing\Render\PriceBox
+ * @var $block \Magento\Msrp\Pricing\Render\PriceBox
  */
 ?>
 <?php
@@ -21,19 +21,7 @@ $priceType = $block->getPrice();
 $product = $block->getSaleableItem();
 $productId = $product->getId();
 
-$amount = 0;
-if ($product->getMsrp()) {
-    $amount = $product->getMsrp();
-} elseif ($product->getTypeId() === \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
-    $amount = $product->getTypeInstance()->getChildrenMsrp($product);
-} elseif ($product->getTypeId() === \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
-    foreach ($product->getTypeInstance()->getUsedProducts($product) as $item) {
-        if ($item->getMsrp() !== null) {
-            $prices[] = $item->getMsrp();
-        }
-    }
-    $amount = $prices ? max($prices) : 0;
-}
+$amount = $block->getMsrpPriceCalculator()->getMsrpPriceValue($product);
 
 $msrpPrice = $block->renderAmount(
     $priceType->getCustomAmount($amount),
diff --git a/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php b/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
new file mode 100644
index 0000000000000..b6f5194ab8cbe
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MsrpConfigurableProduct\Pricing;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
+
+/**
+ * {@inheritdoc}. Provide information for a Configurable product.
+ */
+class MsrpPriceCalculator implements MsrpPriceCalculatorInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getMsrpPriceValue(ProductInterface $product): float
+    {
+        /** @var Product $product */
+        if ($product->getTypeId() !== Configurable::TYPE_CODE) {
+            return 0;
+        }
+
+        /** @var Configurable $configurableProduct */
+        $configurableProduct = $product->getTypeInstance();
+        $msrp = 0;
+        $prices = [];
+        foreach ($configurableProduct->getUsedProducts($product) as $item) {
+            if ($item->getMsrp() !== null) {
+                $prices[] = $item->getMsrp();
+            }
+        }
+        if ($prices) {
+            $msrp = (float)max($prices);
+        }
+
+        return  $msrp;
+    }
+}
diff --git a/app/code/Magento/MsrpConfigurableProduct/README.md b/app/code/Magento/MsrpConfigurableProduct/README.md
new file mode 100644
index 0000000000000..8911b6e9e6667
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/README.md
@@ -0,0 +1,3 @@
+# MsrpConfigurableProduct
+
+**MsrpConfigurableProduct** provides type and resolver information for the Msrp module from the ConfigurableProduct module.
\ No newline at end of file
diff --git a/app/code/Magento/MsrpConfigurableProduct/composer.json b/app/code/Magento/MsrpConfigurableProduct/composer.json
new file mode 100644
index 0000000000000..00c3cf6b03078
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "magento/module-msrp-configurable-product",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-msrp": "*",
+        "magento/module-configurable-product": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MsrpConfigurableProduct\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MsrpConfigurableProduct/etc/di.xml b/app/code/Magento/MsrpConfigurableProduct/etc/di.xml
new file mode 100644
index 0000000000000..ea33c81ff7cf5
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/etc/di.xml
@@ -0,0 +1,19 @@
+<?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\Msrp\Pricing\MsrpPriceCalculator">
+        <arguments>
+            <argument name="msrpPriceCalculators" xsi:type="array">
+                <item name="configurable" xsi:type="array">
+                    <item name="productType" xsi:type="const">\Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE</item>
+                    <item name="priceCalculator" xsi:type="object">\Magento\MsrpConfigurableProduct\Pricing\MsrpPriceCalculator</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/MsrpConfigurableProduct/etc/module.xml b/app/code/Magento/MsrpConfigurableProduct/etc/module.xml
new file mode 100644
index 0000000000000..b00e363b0b269
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/etc/module.xml
@@ -0,0 +1,16 @@
+<?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:Module/etc/module.xsd">
+    <module name="Magento_MsrpConfigurableProduct" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_Msrp"/>
+            <module name="Magento_ConfigurableProduct"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/MsrpConfigurableProduct/registration.php b/app/code/Magento/MsrpConfigurableProduct/registration.php
new file mode 100644
index 0000000000000..d4d58ec3c013b
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MsrpConfigurableProduct', __DIR__);
diff --git a/app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php b/app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php
new file mode 100644
index 0000000000000..b99f328a8b200
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MsrpGroupedProduct\Pricing;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
+
+/**
+ * {@inheritdoc}. Provide information for a Grouped product.
+ */
+class MsrpPriceCalculator implements MsrpPriceCalculatorInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getMsrpPriceValue(ProductInterface $product): float
+    {
+        /** @var Product $product */
+        if ($product->getTypeId() !== Grouped::TYPE_CODE) {
+            return 0;
+        }
+
+        /** @var Grouped $groupedProduct */
+        $groupedProduct = $product->getTypeInstance();
+
+        return $groupedProduct->getChildrenMsrp($product);
+    }
+}
diff --git a/app/code/Magento/MsrpGroupedProduct/README.md b/app/code/Magento/MsrpGroupedProduct/README.md
new file mode 100644
index 0000000000000..d597ba7fc18a7
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/README.md
@@ -0,0 +1,3 @@
+# MsrpGroupedProduct
+
+**MsrpGroupedProduct** provides type and resolver information for the Msrp module from the GroupedProduct module.
\ No newline at end of file
diff --git a/app/code/Magento/MsrpGroupedProduct/composer.json b/app/code/Magento/MsrpGroupedProduct/composer.json
new file mode 100644
index 0000000000000..a626f199ad6cc
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "magento/module-msrp-grouped-product",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-msrp": "*",
+        "magento/module-grouped-product": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MsrpGroupedProduct\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MsrpGroupedProduct/etc/di.xml b/app/code/Magento/MsrpGroupedProduct/etc/di.xml
new file mode 100644
index 0000000000000..29b25f15bc2c1
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/etc/di.xml
@@ -0,0 +1,19 @@
+<?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\Msrp\Pricing\MsrpPriceCalculator">
+        <arguments>
+            <argument name="msrpPriceCalculators" xsi:type="array">
+                <item name="grouped" xsi:type="array">
+                    <item name="productType" xsi:type="const">\Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE</item>
+                    <item name="priceCalculator" xsi:type="object">\Magento\MsrpGroupedProduct\Pricing\MsrpPriceCalculator</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/MsrpGroupedProduct/etc/module.xml b/app/code/Magento/MsrpGroupedProduct/etc/module.xml
new file mode 100644
index 0000000000000..898dd904b5dfb
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/etc/module.xml
@@ -0,0 +1,16 @@
+<?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:Module/etc/module.xsd">
+    <module name="Magento_MsrpGroupedProduct" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_Msrp"/>
+            <module name="Magento_GroupedProduct"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/MsrpGroupedProduct/registration.php b/app/code/Magento/MsrpGroupedProduct/registration.php
new file mode 100644
index 0000000000000..c5a261e66c640
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MsrpGroupedProduct', __DIR__);
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
index 4e338c2d1df34..c27717f4c7793 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
@@ -4,13 +4,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Newsletter\Controller\Subscriber;
 
-class Confirm extends \Magento\Newsletter\Controller\Subscriber
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Confirm subscription controller.
+ */
+class Confirm extends \Magento\Newsletter\Controller\Subscriber implements HttpGetActionInterface
 {
     /**
-     * Subscription confirm action
-     * @return void
+     * Subscription confirm action.
+     *
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -23,17 +30,17 @@ public function execute()
 
             if ($subscriber->getId() && $subscriber->getCode()) {
                 if ($subscriber->confirm($code)) {
-                    $this->messageManager->addSuccess(__('Your subscription has been confirmed.'));
+                    $this->messageManager->addSuccessMessage(__('Your subscription has been confirmed.'));
                 } else {
-                    $this->messageManager->addError(__('This is an invalid subscription confirmation code.'));
+                    $this->messageManager->addErrorMessage(__('This is an invalid subscription confirmation code.'));
                 }
             } else {
-                $this->messageManager->addError(__('This is an invalid subscription ID.'));
+                $this->messageManager->addErrorMessage(__('This is an invalid subscription ID.'));
             }
         }
-
-        $resultRedirect = $this->resultRedirectFactory->create();
-        $resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
-        return $resultRedirect;
+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+        $redirectUrl = $this->_storeManager->getStore()->getBaseUrl();
+        return $redirect->setUrl($redirectUrl);
     }
 }
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index 4f46c84894f12..7557f1610b4f4 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Newsletter\Controller\Subscriber;
 
 use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
@@ -131,7 +132,7 @@ protected function validateEmailFormat($email)
     /**
      * New subscription action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -160,7 +161,10 @@ public function execute()
                 $this->messageManager->addExceptionMessage($e, __('Something went wrong with the subscription.'));
             }
         }
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+        $redirectUrl = $this->_redirect->getRedirectUrl();
+        return $redirect->setUrl($redirectUrl);
     }
 
     /**
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
index 88fa128162700..e37a3786e140a 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Newsletter\Controller\Subscriber;
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
@@ -15,7 +16,7 @@ class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber implements H
     /**
      * Unsubscribe newsletter.
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -25,14 +26,14 @@ public function execute()
         if ($id && $code) {
             try {
                 $this->_subscriberFactory->create()->load($id)->setCheckCode($code)->unsubscribe();
-                $this->messageManager->addSuccess(__('You unsubscribed.'));
+                $this->messageManager->addSuccessMessage(__('You unsubscribed.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addException($e, $e->getMessage());
+                $this->messageManager->addErrorMessage($e, $e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('Something went wrong while unsubscribing you.'));
+                $this->messageManager->addErrorMessage($e, __('Something went wrong while unsubscribing you.'));
             }
         }
-        /** @var \Magento\Backend\Model\View\Result\Redirect $redirect */
+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
         $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
         $redirectUrl = $this->_redirect->getRedirectUrl();
         return $redirect->setUrl($redirectUrl);
diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
index 035013e572833..309bfadab41b3 100644
--- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
+++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
@@ -6,13 +6,11 @@
 namespace Magento\Newsletter\Model\Plugin;
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
-use Magento\Customer\Api\Data\CustomerExtensionInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Framework\Api\ExtensionAttributesFactory;
-use Magento\Framework\App\ObjectManager;
 use Magento\Newsletter\Model\ResourceModel\Subscriber;
-use Magento\Newsletter\Model\SubscriberFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Api\Data\CustomerExtensionInterface;
 
 /**
  * Newsletter Plugin for customer
@@ -41,29 +39,21 @@ class CustomerPlugin
      */
     private $customerSubscriptionStatus = [];
 
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
     /**
      * Initialize dependencies.
      *
      * @param SubscriberFactory $subscriberFactory
      * @param ExtensionAttributesFactory $extensionFactory
      * @param Subscriber $subscriberResource
-     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         SubscriberFactory $subscriberFactory,
         ExtensionAttributesFactory $extensionFactory,
-        Subscriber $subscriberResource,
-        StoreManagerInterface $storeManager = null
+        Subscriber $subscriberResource
     ) {
         $this->subscriberFactory = $subscriberFactory;
         $this->extensionFactory = $extensionFactory;
         $this->subscriberResource = $subscriberResource;
-        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -164,8 +154,7 @@ public function afterDelete(CustomerRepository $subject, $result, CustomerInterf
     public function afterGetById(CustomerRepository $subject, CustomerInterface $customer)
     {
         $extensionAttributes = $customer->getExtensionAttributes();
-        $storeId = $this->storeManager->getStore()->getId();
-        $customer->setStoreId($storeId);
+
         if ($extensionAttributes === null) {
             /** @var CustomerExtensionInterface $extensionAttributes */
             $extensionAttributes = $this->extensionFactory->create(CustomerInterface::class);
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
index 3be28cacc93e0..e809b7e37a432 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
@@ -10,8 +10,6 @@
 use Magento\Customer\Api\Data\CustomerExtensionInterface;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Newsletter\Model\ResourceModel\Subscriber;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManagerInterface;
 
 class CustomerPluginTest extends \PHPUnit\Framework\TestCase
 {
@@ -55,11 +53,6 @@ class CustomerPluginTest extends \PHPUnit\Framework\TestCase
      */
     private $customerMock;
 
-    /**
-     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $storeManagerMock;
-
     protected function setUp()
     {
         $this->subscriberFactory = $this->getMockBuilder(\Magento\Newsletter\Model\SubscriberFactory::class)
@@ -94,8 +87,6 @@ protected function setUp()
             ->setMethods(['getExtensionAttributes'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
-
         $this->subscriberFactory->expects($this->any())->method('create')->willReturn($this->subscriber);
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
@@ -105,7 +96,6 @@ protected function setUp()
                 'subscriberFactory' => $this->subscriberFactory,
                 'extensionFactory' => $this->extensionFactoryMock,
                 'subscriberResource' => $this->subscriberResourceMock,
-                'storeManager' => $this->storeManagerMock,
             ]
         );
     }
@@ -216,7 +206,6 @@ public function testAfterGetByIdCreatesExtensionAttributesIfItIsNotSet(
     ) {
         $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
         $subscriber = [$subscriberStatusKey => $subscriberStatusValue];
-        $this->prepareStoreData();
 
         $this->extensionFactoryMock->expects($this->any())
             ->method('create')
@@ -244,7 +233,6 @@ public function testAfterGetByIdSetsIsSubscribedFlagIfItIsNotSet()
     {
         $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
         $subscriber = ['subscriber_id' => 1, 'subscriber_status' => 1];
-        $this->prepareStoreData();
 
         $this->customerMock->expects($this->any())
             ->method('getExtensionAttributes')
@@ -279,17 +267,4 @@ public function afterGetByIdDataProvider()
             [null, null, false],
         ];
     }
-
-    /**
-     * Prepare store information
-     *
-     * @return void
-     */
-    private function prepareStoreData()
-    {
-        $storeId = 1;
-        $storeMock = $this->createMock(Store::class);
-        $storeMock->expects($this->any())->method('getId')->willReturn($storeId);
-        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
-    }
 }
diff --git a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
index 34a77095d524d..ee0c32633569a 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
@@ -30,5 +30,6 @@
         <element name="pageCacheCheckbox" type="checkbox" selector="input[value='full_page']"/>
         <element name="webServicesConfigCheckbox" type="checkbox" selector="input[value='config_webservice']"/>
         <element name="translationsCheckbox" type="checkbox" selector="input[value='translate']"/>
+        <element name="additionalCacheButton" type="button" selector="//*[@id='container']//button[contains(., '{{cacheType}}')]" parameterized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
new file mode 100644
index 0000000000000..bd6f7ba362bf4
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
@@ -0,0 +1,35 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="FlushStaticFilesCacheButtonVisibilityTest">
+        <annotations>
+            <features value="PageCache"/>
+            <stories value="Page Cache"/>
+            <title value="Check visibility of flush static files cache button"/>
+            <description value="Flush Static Files Cache button visibility"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-15454"/>
+            <group value="production_mode_only"/>
+            <group value="pagecache"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Log in to Admin Panel -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!-- Open Cache Management page -->
+        <amOnPage url="{{AdminCacheManagementPage.url}}" stepKey="amOnPageCacheManagement"/>
+        <waitForPageLoad stepKey="waitForPageCacheManagementLoad"/>
+
+        <!-- Check 'Flush Static Files Cache' not visible in production mode. -->
+        <dontSee selector="{{AdminCacheManagementSection.additionalCacheButton('Flush Static Files Cache')}}" stepKey="dontSeeFlushStaticFilesButton" />
+    </test>
+</tests>
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
index c5871ddc3a373..a3c9e7b39217d 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
@@ -9,7 +9,7 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="NewProductsListWidgetSimpleProductTest">
-        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" before="amOnCmsPage"/>
     </test>
     <test name="NewProductsListWidgetConfigurableProductTest">
         <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
@@ -18,7 +18,7 @@
         <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
     </test>
     <test name="NewProductsListWidgetVirtualProductTest">
-        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" before="amOnCmsPage"/>
     </test>
     <test name="NewProductsListWidgetBundleProductTest">
         <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
index cb1b3388dc06a..fc3a45e1e1397 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/ShippingOptionsCallback.php
@@ -6,7 +6,17 @@
  */
 namespace Magento\Paypal\Controller\Express\AbstractExpress;
 
-class ShippingOptionsCallback extends \Magento\Paypal\Controller\Express\AbstractExpress
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Paypal\Controller\Express\AbstractExpress;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Returns shipping rates by server-to-server request from PayPal.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ShippingOptionsCallback extends AbstractExpress implements CsrfAwareActionInterface
 {
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
@@ -65,4 +75,21 @@ public function execute()
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
 }
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index 38ba0983514b0..72f166e8d07c1 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -1076,6 +1076,7 @@ protected static function cmpShippingOptions(DataObject $option1, DataObject $op
      */
     protected function _matchShippingMethodCode(Address $address, $selectedCode)
     {
+        $address->collectShippingRates();
         $options = $this->_prepareShippingOptions($address, false);
         foreach ($options as $option) {
             if ($selectedCode === $option['code'] // the proper case as outlined in documentation
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
index 97c7fbc471e97..32c2fab40e97a 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
@@ -8,12 +8,15 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="OpenPayPalButtonCheckoutPage">
-        <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn}}" stepKey="clickPayPalConfigureBtn"/>
-        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab}}" stepKey="waitForAdvancedSettingTab"/>
-        <click selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab}}" stepKey="openAdvancedSettingTab"/>
-        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.frontendExperienceSettingsTab}}" stepKey="waitForFrontendExperienceSettingsTab"/>
-        <click selector="{{PayPalAdvancedSettingConfigSection.frontendExperienceSettingsTab}}" stepKey="openFrontendExperienceSettingsTab"/>
-        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.checkoutPageTab}}" stepKey="waitForCheckoutPageTab"/>
-        <click selector="{{PayPalAdvancedSettingConfigSection.checkoutPageTab}}" stepKey="openCheckoutPageTab"/>
+        <arguments>
+            <argument name="countryCode" type="string" defaultValue="us"/>
+        </arguments>
+        <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab(countryCode)}}" stepKey="waitForAdvancedSettingTab"/>
+        <click selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab(countryCode)}}" stepKey="openAdvancedSettingTab"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.frontendExperienceSettingsTab(countryCode)}}" stepKey="waitForFrontendExperienceSettingsTab"/>
+        <click selector="{{PayPalAdvancedSettingConfigSection.frontendExperienceSettingsTab(countryCode)}}" stepKey="openFrontendExperienceSettingsTab"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.checkoutPageTab(countryCode)}}" stepKey="waitForCheckoutPageTab"/>
+        <click selector="{{PayPalAdvancedSettingConfigSection.checkoutPageTab(countryCode)}}" stepKey="openCheckoutPageTab"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml
new file mode 100644
index 0000000000000..08ca6c7834384
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml
@@ -0,0 +1,40 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="EnablePayPalConfiguration">
+        <arguments>
+            <argument name="payPalConfigType"/>
+            <argument name="countryCode" type="string" defaultValue="us"/>
+        </arguments>
+        <waitForElementVisible selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForOtherPayPalPaymentsSection"/>
+        <conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="clickOtherPayPalPaymentsSection"/>
+        <waitForElementVisible selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="waitForWPSExpressConfigureBtn"/>
+        <click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn"/>
+        <waitForElementVisible selector="{{payPalConfigType.enableSolution(countryCode)}}" stepKey="waitForWPSExpressEnable"/>
+        <selectOption selector="{{payPalConfigType.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableWPSExpressSolution"/>
+        <seeInPopup userInput="There is already another PayPal solution enabled. Enable this solution instead?" stepKey="seeAlertMessage"/>
+        <acceptPopup stepKey="acceptEnablePopUp"/>
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+    </actionGroup>
+    <actionGroup name="CheckEnableOptionPayPalConfiguration">
+        <arguments>
+            <argument name="payPalConfigType"/>
+            <argument name="enabledOption" type="string"/>
+            <argument name="countryCode" type="string" defaultValue="us"/>
+        </arguments>
+        <waitForElementVisible selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForOtherPayPalPaymentsSection"/>
+        <conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="clickOtherPayPalPaymentsSection"/>
+        <waitForElementVisible selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="waitForWPSExpressConfigureBtn"/>
+        <click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn1"/>
+        <waitForElementVisible selector="{{payPalConfigType.enableSolution(countryCode)}}" stepKey="waitForWPSExpressEnable"/>
+        <seeOptionIsSelected selector="{{payPalConfigType.enableSolution(countryCode)}}" userInput="{{enabledOption}}" stepKey="seeSelectedOption"/>
+        <click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn2"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
index 7bf26aceb316a..bae517ffe2f3e 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
@@ -8,18 +8,22 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ConfigPayPalExpressCheckout">
+        <arguments>
+            <argument name="credentials" defaultValue="_CREDS"/>
+            <argument name="countryCode" type="string" defaultValue="us"/>
+        </arguments>
         <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn}}" stepKey="clickPayPalConfigureBtn"/>
-        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab}}" stepKey="waitForAdvancedSettingTab"/>
-        <fillField selector ="{{PayPalExpressCheckoutConfigSection.email}}" userInput="{{_CREDS.paypal_express_email}}" stepKey="inputEmailAssociatedWithPayPalMerchantAccount"/>
-        <selectOption selector ="{{PayPalExpressCheckoutConfigSection.apiMethod}}" userInput="API Signature" stepKey="inputAPIAuthenticationMethods"/>
-        <fillField selector ="{{PayPalExpressCheckoutConfigSection.username}}" userInput="{{_CREDS.paypal_express_api_username}}" stepKey="inputAPIUsername"/>
-        <fillField selector ="{{PayPalExpressCheckoutConfigSection.password}}" userInput="{{_CREDS.paypal_express_api_password}}" stepKey="inputAPIPassword"/>
-        <fillField selector ="{{PayPalExpressCheckoutConfigSection.signature}}" userInput="{{_CREDS.paypal_express_api_signature}}" stepKey="inputAPISignature"/>
-        <selectOption selector ="{{PayPalExpressCheckoutConfigSection.sandboxMode}}" userInput="Yes" stepKey="enableSandboxMode"/>
-        <selectOption selector="{{PayPalExpressCheckoutConfigSection.enableSolution}}" userInput="Yes" stepKey="enableSolution"/>
-        <fillField selector ="{{PayPalExpressCheckoutConfigSection.merchantID}}" userInput="{{_CREDS.paypal_express_merchantID}}" stepKey="inputMerchantID"/>
+        <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab(countryCode)}}" stepKey="waitForAdvancedSettingTab"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.email(countryCode)}}" userInput="{{credentials.paypal_express_email}}" stepKey="inputEmailAssociatedWithPayPalMerchantAccount"/>
+        <selectOption selector ="{{PayPalExpressCheckoutConfigSection.apiMethod(countryCode)}}" userInput="API Signature" stepKey="inputAPIAuthenticationMethods"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.username(countryCode)}}" userInput="{{credentials.paypal_express_api_username}}" stepKey="inputAPIUsername"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.password(countryCode)}}" userInput="{{credentials.paypal_express_api_password}}" stepKey="inputAPIPassword"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.signature(countryCode)}}" userInput="{{credentials.paypal_express_api_signature}}" stepKey="inputAPISignature"/>
+        <selectOption selector ="{{PayPalExpressCheckoutConfigSection.sandboxMode(countryCode)}}" userInput="Yes" stepKey="enableSandboxMode"/>
+        <selectOption selector="{{PayPalExpressCheckoutConfigSection.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableSolution"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.merchantID(countryCode)}}" userInput="{{credentials.paypal_express_merchantID}}" stepKey="inputMerchantID"/>
         <!--Save configuration-->
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
     </actionGroup>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
index d97e60043cc5d..ae34476e9ac0b 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
@@ -38,6 +38,9 @@
     <entity name="SampleUseProxy" type="use_proxy">
         <data key="value">0</data>
     </entity>
+    <entity name="SampleMerchantID" type="use_proxy">
+        <data key="value">someMerchantId</data>
+    </entity>
 
     <!-- default configuration used to restore Magento config -->
     <entity name="DefaultPayPalConfig" type="paypal_config_state">
@@ -89,4 +92,11 @@
         <data key="silver">silver</data>
         <data key="black">black</data>
     </entity>
+    <entity name="SamplePaypalExpressConfig" type="paypal_express_config">
+        <data key="paypal_express_email">myBusinessAccount@magento.com</data>
+        <data key="paypal_express_api_username">myApiUsername.magento.com</data>
+        <data key="paypal_express_api_password">somePassword</data>
+        <data key="paypal_express_api_signature">someApiSignature</data>
+        <data key="paypal_express_merchantID">someMerchantId</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml
new file mode 100644
index 0000000000000..ca8438d5ee06a
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml
@@ -0,0 +1,31 @@
+<?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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="OtherPayPalPaymentsConfigSection">
+        <element name="expandTab" type="button" selector="#payment_{{countryCode}}_other_paypal_payment_solutions-head" parameterized="true"/>
+        <element name="expandedTab" type="button" selector="#payment_{{countryCode}}_other_paypal_payment_solutions-head.open" parameterized="true"/>
+    </section>
+    <section name="WPSExpressConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express-head" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_enable_express_checkout" parameterized="true"/>
+    </section>
+    <section name="PaymentsProHostedWithExpressCheckoutConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout-head" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_enable" parameterized="true"/>
+    </section>
+    <section name="WPSOtherConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_other-head" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_other_express_checkout_required_enable_express_checkout" parameterized="true"/>
+    </section>
+    <section name="WebsitePaymentsPlusConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_{{countryCode}}-head" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_{{countryCode}}_pphs_required_settings_pphs_enable" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
index 3ac0bb2707556..85f94cd8691a5 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
@@ -9,20 +9,24 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="PayPalExpressCheckoutConfigSection">
-        <element name="configureBtn" type="button" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us-head"/>
-        <element name="email" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_business_account" />
-        <element name="apiMethod" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_authentication"/>
-        <element name="username" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_username"/>
-        <element name="password" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_password"/>
-        <element name="signature" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_signature"/>
-        <element name="sandboxMode" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_sandbox_flag"/>
-        <element name="enableSolution" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_enable_express_checkout"/>
-        <element name="merchantID" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_merchant_id"/>
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}-head" parameterized="true"/>
+        <element name="email" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_business_account" parameterized="true"/>
+        <element name="apiMethod" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_authentication" parameterized="true"/>
+        <element name="username" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_username" parameterized="true"/>
+        <element name="password" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_password" parameterized="true"/>
+        <element name="signature" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_signature" parameterized="true"/>
+        <element name="sandboxMode" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_sandbox_flag" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_enable_express_checkout" parameterized="true"/>
+        <element name="merchantID" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_merchant_id" parameterized="true"/>
+    </section>
+    <section name="PayPalExpressCheckoutOtherCountryConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_express_checkout_other-head" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_express_checkout_other_express_checkout_required_enable_express_checkout" parameterized="true"/>
     </section>
     <section name="PayPalAdvancedSettingConfigSection">
-        <element name="advancedSettingTab" type="button" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced-head"/>
-        <element name="frontendExperienceSettingsTab" type="button" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend-head"/>
-        <element name="checkoutPageTab" type="button" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button-head"/>
+        <element name="advancedSettingTab" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced-head" parameterized="true"/>
+        <element name="frontendExperienceSettingsTab" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced_express_checkout_frontend-head" parameterized="true"/>
+        <element name="checkoutPageTab" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button-head" parameterized="true"/>
        </section>
     <section name="ButtonCustomization">
         <element name="customizeDrpDown" type="button" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button_checkout_page_button_customize']//select[contains(@data-ui-id, 'button-customize')]"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PaymentsConfigSection.xml
new file mode 100644
index 0000000000000..35162cb7d619d
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PaymentsConfigSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="PaymentsConfigSection">
+        <element name="merchantCountry" type="select" selector="//select[@name='groups[account][fields][merchant_country][value]']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
new file mode 100644
index 0000000000000..b485fcb2a8f9a
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
@@ -0,0 +1,276 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in United Kingdom"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country United Kingdom"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="ConfigPayPalExpressCheckout" stepKey="ConfigPayPalExpress">
+                <argument name="credentials" value="SamplePaypalExpressConfig"/>
+            </actionGroup>
+        </before>
+        <after>
+            <magentoCLI command="config:set paypal/general/merchant_country US" stepKey="setMerchantCountry"/>
+            <magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePayPalExpress"/>
+            <magentoCLI command="config:set payment/wps_express/active 0" stepKey="disableWPSExpress"/>
+            <magentoCLI command="config:set payment/hosted_pro/active 0" stepKey="disableHostedProExpress"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Change Merchant Country -->
+        <comment userInput="Change Merchant Country" stepKey="changeMerchantCountryComment"/>
+        <waitForElementVisible selector="{{PaymentsConfigSection.merchantCountry}}" stepKey="waitForMerchantCountry"/>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="United Kingdom" stepKey="setMerchantCountry"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <!-- Enable WPS Express -->
+        <comment userInput="Enable WPS Express" stepKey="enableWPSExpressComment"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+        <!-- Check only the correct solution is enabled -->
+        <comment userInput="Check only the correct solution is enabled" stepKey="checkOnlyTheCorrectSolutionIsEnabledComment1"/>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+        <!-- Enable Pro Hosted With Express Checkout -->
+        <comment userInput="Enable Pro Hosted With Express Checkout" stepKey="enableProHostedWithExpressCheckoutComment"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="PaymentsProHostedWithExpressCheckoutConfigSection"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+        <!-- Check only the correct solution is enabled -->
+        <comment userInput="Check only the correct solution is enabled" stepKey="checkOnlyTheCorrectSolutionIsEnabledComment2"/>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="PaymentsProHostedWithExpressCheckoutConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+    </test>
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInJapan" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in Japan"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Japan"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Japan" stepKey="setMerchantCountry"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+    </test>
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInFrance" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in France"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country France"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="France" stepKey="setMerchantCountry"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+    </test>
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInHongKong" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in Hong Kong"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Hong Kong"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Hong Kong SAR China" stepKey="setMerchantCountry"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+    </test>
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInItaly" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in Italy"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Italy"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Italy" stepKey="setMerchantCountry"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+    </test>
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInSpain" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in Spain"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Spain"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Spain" stepKey="setMerchantCountry"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
index 565962518881b..d8b765b9b4d22 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
@@ -15,7 +15,7 @@
                 <predicate name="confirm"
                            message="There is already another PayPal solution enabled. Enable this solution instead?"
                            event="deactivate-rule"
-                        >
+                >
                     <argument name="wps_express">wps_express</argument>
                 </predicate>
             </event>
@@ -39,16 +39,16 @@
                 <predicate name="confirm"
                            message="There is already another PayPal solution enabled. Enable this solution instead?"
                            event="deactivate-rule"
-                        >
+                >
                     <argument name="payments_pro_hosted_solution_with_express_checkout">payments_pro_hosted_solution_with_express_checkout</argument>
-                    <argument name="express_checkout_us">express_checkout_us</argument>
+                    <argument name="express_checkout_gb">express_checkout_gb</argument>
                 </predicate>
             </event>
         </events>
         <relation target="payments_pro_hosted_solution_with_express_checkout">
             <rule type="disable" event="activate-rule"/>
         </relation>
-        <relation target="express_checkout_us">
+        <relation target="express_checkout_gb">
             <rule type="disable" event="activate-rule"/>
         </relation>
         <relation target=":self">
@@ -56,19 +56,19 @@
             <rule type="simpleDisable" event="deactivate-rule"/>
             <rule type="conflict" event=":load">
                 <argument name="payments_pro_hosted_solution_with_express_checkout">payments_pro_hosted_solution_with_express_checkout</argument>
-                <argument name="express_checkout_us">express_checkout_us</argument>
+                <argument name="express_checkout_gb">express_checkout_gb</argument>
             </rule>
         </relation>
     </payment>
     <!-- Express Checkout -->
-    <payment id="express_checkout_us">
+    <payment id="express_checkout_gb">
         <events selector="[data-enable='payment']">
             <event value="0" name="deactivate-rule"/>
             <event value="1" name="activate-rule">
                 <predicate name="confirm"
                            message="There is already another PayPal solution enabled. Enable this solution instead?"
                            event="deactivate-rule"
-                        >
+                >
                     <argument name="wps_express">wps_express</argument>
                 </predicate>
             </event>
@@ -98,4 +98,4 @@
             <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
-</rules>
+</rules>
\ No newline at end of file
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 abecec395865d..392a815ed963c 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -256,9 +256,8 @@ protected function _assignProducts(): self
         foreach ($this as $item) {
             /** @var ProductInterface $product */
             $product = $productCollection->getItemById($item->getProductId());
-            $isValidProduct = $this->isValidProduct($product);
             $qtyOptions = [];
-            if ($isValidProduct) {
+            if ($product && $this->isValidProduct($product)) {
                 $product->setCustomOptions([]);
                 $optionProductIds = $this->getOptionProductIds($item, $product, $productCollection);
                 foreach ($optionProductIds as $optionProductId) {
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index 90dae1ec2adca..706bed674b4a9 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-quote": "*"
+        "magento/module-quote": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
index 1b32866ed883c..6868ce3f7f1ff 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -67,6 +67,11 @@ public function execute(Quote $cart, array $cartItemData): void
     {
         $sku = $this->extractSku($cartItemData);
         $qty = $this->extractQty($cartItemData);
+        if ($qty <= 0) {
+            throw new GraphQlInputException(
+                __('Please enter a number greater than 0 in this field.')
+            );
+        }
         $customizableOptions = $this->extractCustomizableOptions($cartItemData);
 
         try {
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php
index 370501e9c6e8e..dd6478b4873c6 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php
@@ -11,9 +11,9 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\BillingAddressManagementInterface;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
 
 /**
  * Set billing address for a specified shopping cart
@@ -38,22 +38,22 @@ public function __construct(
      * Assign billing address to cart
      *
      * @param CartInterface $cart
-     * @param QuoteAddress $billingAddress
+     * @param AddressInterface $billingAddress
      * @param bool $useForShipping
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(
         CartInterface $cart,
-        QuoteAddress $billingAddress,
+        AddressInterface $billingAddress,
         bool $useForShipping
     ): void {
         try {
             $this->billingAddressManagement->assign($cart->getId(), $billingAddress, $useForShipping);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()));
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
         } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
+            throw new GraphQlInputException(__($e->getMessage()), $e);
         }
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
index 47f90edb04be8..527999b245a4c 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
@@ -11,8 +11,8 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Model\ShippingAddressManagementInterface;
 
 /**
@@ -38,20 +38,20 @@ public function __construct(
      * Assign shipping address to cart
      *
      * @param CartInterface $cart
-     * @param QuoteAddress $shippingAddress
+     * @param AddressInterface $shippingAddress
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(
         CartInterface $cart,
-        QuoteAddress $shippingAddress
+        AddressInterface $shippingAddress
     ): void {
         try {
             $this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()));
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
         } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
+            throw new GraphQlInputException(__($e->getMessage()), $e);
         }
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingMethodToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingMethodToCart.php
new file mode 100644
index 0000000000000..5b30c0774c22f
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingMethodToCart.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
+use Magento\Checkout\Api\ShippingInformationManagementInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Assign shipping method to cart
+ */
+class AssignShippingMethodToCart
+{
+    /**
+     * @var ShippingInformationInterfaceFactory
+     */
+    private $shippingInformationFactory;
+
+    /**
+     * @var ShippingInformationManagementInterface
+     */
+    private $shippingInformationManagement;
+
+    /**
+     * @param ShippingInformationInterfaceFactory $shippingInformationFactory
+     * @param ShippingInformationManagementInterface $shippingInformationManagement
+     */
+    public function __construct(
+        ShippingInformationInterfaceFactory $shippingInformationFactory,
+        ShippingInformationManagementInterface $shippingInformationManagement
+    ) {
+        $this->shippingInformationFactory = $shippingInformationFactory;
+        $this->shippingInformationManagement = $shippingInformationManagement;
+    }
+
+    /**
+     * Assign shipping method to cart
+     *
+     * @param CartInterface $cart
+     * @param AddressInterface $quoteAddress
+     * @param string $carrierCode
+     * @param string $methodCode
+     * @throws GraphQlInputException
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(
+        CartInterface $cart,
+        AddressInterface $quoteAddress,
+        string $carrierCode,
+        string $methodCode
+    ): void {
+        /** @var ShippingInformationInterface $shippingInformation */
+        $shippingInformation = $this->shippingInformationFactory->create([
+            'data' => [
+                /* If the address is not a shipping address (but billing) the system will find the proper shipping
+                   address for the selected cart and set the information there (actual for single shipping address) */
+                ShippingInformationInterface::SHIPPING_ADDRESS => $quoteAddress,
+                ShippingInformationInterface::SHIPPING_CARRIER_CODE => $carrierCode,
+                ShippingInformationInterface::SHIPPING_METHOD_CODE => $methodCode,
+            ],
+        ]);
+
+        try {
+            $this->shippingInformationManagement->saveAddressInformation($cart->getId(), $shippingInformation);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
similarity index 80%
rename from app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php
rename to app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
index a52745a8bb744..840dedb4f274e 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
@@ -7,14 +7,15 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
+use Magento\Customer\Model\Address\AbstractAddress;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 
 /**
- * Extract the necessary address fields from an Address model
+ * Extract address fields from an Quote Address model
  */
-class ExtractDataFromAddress
+class ExtractQuoteAddressData
 {
     /**
      * @var ExtensibleDataObjectConverter
@@ -40,8 +41,17 @@ public function execute(QuoteAddress $address): array
         $addressData = $this->dataObjectConverter->toFlatArray($address, [], AddressInterface::class);
         $addressData['model'] = $address;
 
+        if ($address->getAddressType() == AbstractAddress::TYPE_SHIPPING) {
+            $addressType = 'SHIPPING';
+        } elseif ($address->getAddressType() == AbstractAddress::TYPE_BILLING) {
+            $addressType = 'BILLING';
+        } else {
+            $addressType = null;
+        }
+
         $addressData = array_merge($addressData, [
             'address_id' => $address->getId(),
+            'address_type' => $addressType,
             'country' => [
                 'code' => $address->getCountryId(),
                 'label' => $address->getCountry()
@@ -51,12 +61,6 @@ public function execute(QuoteAddress $address): array
                 'label' => $address->getRegion()
             ],
             'street' => $address->getStreet(),
-            'selected_shipping_method' => [
-                'code' => $address->getShippingMethod(),
-                'label' => $address->getShippingDescription(),
-                'free_shipping' => $address->getFreeShipping(),
-                'amount' => $address->getShippingAmount()
-            ],
             'items_weight' => $address->getWeight(),
             'customer_notes' => $address->getCustomerNotes()
         ]);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index 21df2271cc7f3..145e9c01980a5 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -69,6 +69,12 @@ public function execute(string $cartHash, ?int $customerId): Quote
             );
         }
 
+        if (false === (bool)$cart->getIsActive()) {
+            throw new GraphQlNoSuchEntityException(
+                __('Current user does not have an active cart.')
+            );
+        }
+
         $cartCustomerId = (int)$cart->getCustomerId();
 
         /* Guest cart, allow operations */
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php
new file mode 100644
index 0000000000000..1fb737d964139
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Model\ResourceModel\Quote\Address as AddressResource;
+
+/**
+ * Get quote address
+ */
+class GetQuoteAddress
+{
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $quoteAddressFactory;
+
+    /**
+     * @var AddressResource
+     */
+    private $quoteAddressResource;
+
+    /**
+     * @param AddressInterfaceFactory $quoteAddressFactory
+     * @param AddressResource $quoteAddressResource
+     */
+    public function __construct(
+        AddressInterfaceFactory $quoteAddressFactory,
+        AddressResource $quoteAddressResource
+    ) {
+        $this->quoteAddressFactory = $quoteAddressFactory;
+        $this->quoteAddressResource = $quoteAddressResource;
+    }
+
+    /**
+     * Get quote address
+     *
+     * @param int $quoteAddressId
+     * @param int|null $customerId
+     * @return AddressInterface
+     * @throws GraphQlInputException
+     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlAuthorizationException
+     */
+    public function execute(int $quoteAddressId, ?int $customerId): AddressInterface
+    {
+        $quoteAddress = $this->quoteAddressFactory->create();
+
+        $this->quoteAddressResource->load($quoteAddress, $quoteAddressId);
+        if (null === $quoteAddress->getId()) {
+            throw new GraphQlNoSuchEntityException(
+                __('Could not find a cart address with ID "%cart_address_id"', ['cart_address_id' => $quoteAddressId])
+            );
+        }
+
+        $quoteAddressCustomerId = (int)$quoteAddress->getCustomerId();
+
+        /* Guest cart, allow operations */
+        if (!$quoteAddressCustomerId && null === $customerId) {
+            return $quoteAddress;
+        }
+
+        if ($quoteAddressCustomerId !== $customerId) {
+            throw new GraphQlAuthorizationException(
+                __(
+                    'The current user cannot use cart address with ID "%cart_address_id"',
+                    ['cart_address_id' => $quoteAddressId]
+                )
+            );
+        }
+        return $quoteAddress;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
index 7dfea0836e8d6..76bdc74611131 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
@@ -60,7 +60,7 @@ public function createBasedOnCustomerAddress(CustomerAddress $customerAddress):
         try {
             $quoteAddress->importCustomerAddressData($customerAddress);
         } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
+            throw new GraphQlInputException(__($e->getMessage()), $e);
         }
         return $quoteAddress;
     }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
index 04b7bfcfe0e62..31524ea023222 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -7,9 +7,8 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -26,9 +25,9 @@ class SetBillingAddressOnCart
     private $quoteAddressFactory;
 
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var GetCustomerAddress
@@ -42,18 +41,18 @@ class SetBillingAddressOnCart
 
     /**
      * @param QuoteAddressFactory $quoteAddressFactory
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param GetCustomerAddress $getCustomerAddress
      * @param AssignBillingAddressToCart $assignBillingAddressToCart
      */
     public function __construct(
         QuoteAddressFactory $quoteAddressFactory,
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         GetCustomerAddress $getCustomerAddress,
         AssignBillingAddressToCart $assignBillingAddressToCart
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->getCustomerAddress = $getCustomerAddress;
         $this->assignBillingAddressToCart = $assignBillingAddressToCart;
     }
@@ -63,19 +62,17 @@ public function __construct(
      *
      * @param ContextInterface $context
      * @param CartInterface $cart
-     * @param array $billingAddress
+     * @param array $billingAddressInput
      * @return void
      * @throws GraphQlInputException
-     * @throws GraphQlAuthenticationException
-     * @throws GraphQlAuthorizationException
      * @throws GraphQlNoSuchEntityException
      */
-    public function execute(ContextInterface $context, CartInterface $cart, array $billingAddress): void
+    public function execute(ContextInterface $context, CartInterface $cart, array $billingAddressInput): void
     {
-        $customerAddressId = $billingAddress['customer_address_id'] ?? null;
-        $addressInput = $billingAddress['address'] ?? null;
-        $useForShipping = isset($billingAddress['use_for_shipping'])
-            ? (bool)$billingAddress['use_for_shipping'] : false;
+        $customerAddressId = $billingAddressInput['customer_address_id'] ?? null;
+        $addressInput = $billingAddressInput['address'] ?? null;
+        $useForShipping = isset($billingAddressInput['use_for_shipping'])
+            ? (bool)$billingAddressInput['use_for_shipping'] : false;
 
         if (null === $customerAddressId && null === $addressInput) {
             throw new GraphQlInputException(
@@ -99,8 +96,8 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
         if (null === $customerAddressId) {
             $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
         } else {
-            $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());
-            $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$context->getUserId());
+            $customer = $this->getCustomer->execute($context);
+            $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
             $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
         }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
similarity index 74%
rename from app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressOnCart.php
rename to app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index 1a14424853491..bbca7721754cb 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -7,7 +7,8 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
@@ -15,7 +16,7 @@
 /**
  * Set single shipping address for a specified shopping cart
  */
-class SetShippingAddressOnCart implements SetShippingAddressesOnCartInterface
+class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
 {
     /**
      * @var QuoteAddressFactory
@@ -23,9 +24,9 @@ class SetShippingAddressOnCart implements SetShippingAddressesOnCartInterface
     private $quoteAddressFactory;
 
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var GetCustomerAddress
@@ -39,18 +40,18 @@ class SetShippingAddressOnCart implements SetShippingAddressesOnCartInterface
 
     /**
      * @param QuoteAddressFactory $quoteAddressFactory
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param GetCustomerAddress $getCustomerAddress
      * @param AssignShippingAddressToCart $assignShippingAddressToCart
      */
     public function __construct(
         QuoteAddressFactory $quoteAddressFactory,
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         GetCustomerAddress $getCustomerAddress,
         AssignShippingAddressToCart $assignShippingAddressToCart
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->getCustomerAddress = $getCustomerAddress;
         $this->assignShippingAddressToCart = $assignShippingAddressToCart;
     }
@@ -58,16 +59,16 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddresses): void
+    public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddressesInput): void
     {
-        if (count($shippingAddresses) > 1) {
+        if (count($shippingAddressesInput) > 1) {
             throw new GraphQlInputException(
                 __('You cannot specify multiple shipping addresses.')
             );
         }
-        $shippingAddress = current($shippingAddresses);
-        $customerAddressId = $shippingAddress['customer_address_id'] ?? null;
-        $addressInput = $shippingAddress['address'] ?? null;
+        $shippingAddressInput = current($shippingAddressesInput);
+        $customerAddressId = $shippingAddressInput['customer_address_id'] ?? null;
+        $addressInput = $shippingAddressInput['address'] ?? null;
 
         if (null === $customerAddressId && null === $addressInput) {
             throw new GraphQlInputException(
@@ -84,8 +85,8 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
         if (null === $customerAddressId) {
             $shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
         } else {
-            $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());
-            $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$context->getUserId());
+            $customer = $this->getCustomer->execute($context);
+            $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
             $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
         }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php
index 81da47933e812..eb0f3522102cf 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php
@@ -27,12 +27,12 @@ interface SetShippingAddressesOnCartInterface
      *
      * @param ContextInterface $context
      * @param CartInterface $cart
-     * @param array $shippingAddresses
+     * @param array $shippingAddressesInput
      * @return void
      * @throws GraphQlInputException
      * @throws GraphQlAuthorizationException
      * @throws GraphQlAuthenticationException
      * @throws GraphQlNoSuchEntityException
      */
-    public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddresses): void;
+    public function execute(ContextInterface $context, CartInterface $cart, array $shippingAddressesInput): void;
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodOnCart.php
deleted file mode 100644
index a630b2d07c7df..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodOnCart.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\QuoteGraphQl\Model\Cart;
-
-use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Exception\StateException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\Quote\AddressFactory as QuoteAddressFactory;
-use Magento\Quote\Model\ResourceModel\Quote\Address as QuoteAddressResource;
-use Magento\Checkout\Model\ShippingInformationFactory;
-use Magento\Checkout\Api\ShippingInformationManagementInterface;
-use Magento\Checkout\Model\ShippingInformation;
-
-/**
- * Class SetShippingMethodsOnCart
- *
- * Set shipping method for a specified shopping cart address
- */
-class SetShippingMethodOnCart
-{
-    /**
-     * @var ShippingInformationFactory
-     */
-    private $shippingInformationFactory;
-
-    /**
-     * @var QuoteAddressFactory
-     */
-    private $quoteAddressFactory;
-
-    /**
-     * @var QuoteAddressResource
-     */
-    private $quoteAddressResource;
-
-    /**
-     * @var ShippingInformationManagementInterface
-     */
-    private $shippingInformationManagement;
-
-    /**
-     * @param ShippingInformationManagementInterface $shippingInformationManagement
-     * @param QuoteAddressFactory $quoteAddressFactory
-     * @param QuoteAddressResource $quoteAddressResource
-     * @param ShippingInformationFactory $shippingInformationFactory
-     */
-    public function __construct(
-        ShippingInformationManagementInterface $shippingInformationManagement,
-        QuoteAddressFactory $quoteAddressFactory,
-        QuoteAddressResource $quoteAddressResource,
-        ShippingInformationFactory $shippingInformationFactory
-    ) {
-        $this->shippingInformationManagement = $shippingInformationManagement;
-        $this->quoteAddressResource = $quoteAddressResource;
-        $this->quoteAddressFactory = $quoteAddressFactory;
-        $this->shippingInformationFactory = $shippingInformationFactory;
-    }
-
-    /**
-     * Sets shipping method for a specified shopping cart address
-     *
-     * @param Quote $cart
-     * @param int $cartAddressId
-     * @param string $carrierCode
-     * @param string $methodCode
-     * @throws GraphQlInputException
-     * @throws GraphQlNoSuchEntityException
-     */
-    public function execute(Quote $cart, int $cartAddressId, string $carrierCode, string $methodCode): void
-    {
-        $quoteAddress = $this->quoteAddressFactory->create();
-        $this->quoteAddressResource->load($quoteAddress, $cartAddressId);
-
-        /** @var ShippingInformation $shippingInformation */
-        $shippingInformation = $this->shippingInformationFactory->create();
-
-        /* If the address is not a shipping address (but billing) the system will find the proper shipping address for
-           the selected cart and set the information there (actual for single shipping address) */
-        $shippingInformation->setShippingAddress($quoteAddress);
-        $shippingInformation->setShippingCarrierCode($carrierCode);
-        $shippingInformation->setShippingMethodCode($methodCode);
-
-        try {
-            $this->shippingInformationManagement->saveAddressInformation($cart->getId(), $shippingInformation);
-        } catch (NoSuchEntityException $exception) {
-            throw new GraphQlNoSuchEntityException(__($exception->getMessage()));
-        } catch (StateException $exception) {
-            throw new GraphQlInputException(__($exception->getMessage()));
-        } catch (InputException $exception) {
-            throw new GraphQlInputException(__($exception->getMessage()));
-        }
-    }
-}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
new file mode 100644
index 0000000000000..37e0118423745
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Set single shipping method for a specified shopping cart
+ */
+class SetShippingMethodsOnCart implements SetShippingMethodsOnCartInterface
+{
+    /**
+     * @var GetQuoteAddress
+     */
+    private $getQuoteAddress;
+
+    /**
+     * @var AssignShippingMethodToCart
+     */
+    private $assignShippingMethodToCart;
+
+    /**
+     * @param GetQuoteAddress $getQuoteAddress
+     * @param AssignShippingMethodToCart $assignShippingMethodToCart
+     */
+    public function __construct(
+        GetQuoteAddress $getQuoteAddress,
+        AssignShippingMethodToCart $assignShippingMethodToCart
+    ) {
+        $this->getQuoteAddress = $getQuoteAddress;
+        $this->assignShippingMethodToCart = $assignShippingMethodToCart;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(ContextInterface $context, CartInterface $cart, array $shippingMethodsInput): void
+    {
+        if (count($shippingMethodsInput) > 1) {
+            throw new GraphQlInputException(
+                __('You cannot specify multiple shipping methods.')
+            );
+        }
+        $shippingMethodInput = current($shippingMethodsInput);
+
+        if (!isset($shippingMethodInput['cart_address_id']) || empty($shippingMethodInput['cart_address_id'])) {
+            throw new GraphQlInputException(__('Required parameter "cart_address_id" is missing.'));
+        }
+        $cartAddressId = $shippingMethodInput['cart_address_id'];
+
+        if (!isset($shippingMethodInput['carrier_code']) || empty($shippingMethodInput['carrier_code'])) {
+            throw new GraphQlInputException(__('Required parameter "carrier_code" is missing.'));
+        }
+        $carrierCode = $shippingMethodInput['carrier_code'];
+
+        if (!isset($shippingMethodInput['method_code']) || empty($shippingMethodInput['method_code'])) {
+            throw new GraphQlInputException(__('Required parameter "method_code" is missing.'));
+        }
+        $methodCode = $shippingMethodInput['method_code'];
+
+        $quoteAddress = $this->getQuoteAddress->execute($cartAddressId, $context->getUserId());
+
+        $this->assignShippingMethodToCart->execute($cart, $quoteAddress, $carrierCode, $methodCode);
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCartInterface.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCartInterface.php
new file mode 100644
index 0000000000000..fa6c6cf0923e4
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCartInterface.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Extension point for setting shipping methods for a specified shopping cart
+ *
+ * All objects that are responsible for setting shipping methods on a cart via GraphQl
+ * should implement this interface.
+ */
+interface SetShippingMethodsOnCartInterface
+{
+    /**
+     * Set shipping methods for a specified shopping cart
+     *
+     * @param ContextInterface $context
+     * @param CartInterface $cart
+     * @param array $shippingMethodsInput
+     * @return void
+     * @throws GraphQlInputException
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlAuthenticationException
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(ContextInterface $context, CartInterface $cart, array $shippingMethodsInput): void;
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Text.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Text.php
index 4b29eb6a4a663..96f11badac82e 100644
--- a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Text.php
+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Text.php
@@ -42,6 +42,7 @@ public function getData(
     ): array {
         /** @var TextOptionType $optionTypeRenderer */
         $optionTypeRenderer = $option->groupFactory($option->getType());
+        $optionTypeRenderer->setOption($option);
         $priceValueUnits = $this->priceUnitLabel->getData($option->getPriceType());
 
         $selectedOptionValueData = [
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
index a334e7482ca47..5429d5333b25b 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
@@ -50,12 +50,12 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        if (!isset($args['input']['cart_id'])) {
+        if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
         }
         $maskedCartId = $args['input']['cart_id'];
 
-        if (!isset($args['input']['coupon_code'])) {
+        if (!isset($args['input']['coupon_code']) || empty($args['input']['coupon_code'])) {
             throw new GraphQlInputException(__('Required parameter "coupon_code" is missing'));
         }
         $couponCode = $args['input']['coupon_code'];
@@ -74,10 +74,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         try {
             $this->couponManagement->set($cartId, $couponCode);
-        } catch (NoSuchEntityException $exception) {
-            throw new GraphQlNoSuchEntityException(__($exception->getMessage()));
-        } catch (CouldNotSaveException $exception) {
-            throw new LocalizedException(__($exception->getMessage()));
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        } catch (CouldNotSaveException $e) {
+            throw new LocalizedException(__($e->getMessage()), $e);
         }
 
         return [
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
index a03533ecefffa..a6bb0b0d04df1 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
@@ -11,7 +11,8 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromAddress;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
 
 /**
  * @inheritdoc
@@ -19,16 +20,16 @@
 class BillingAddress implements ResolverInterface
 {
     /**
-     * @var ExtractDataFromAddress
+     * @var ExtractQuoteAddressData
      */
-    private $extractDataFromAddress;
+    private $extractQuoteAddressData;
 
     /**
-     * @param ExtractDataFromAddress $extractDataFromAddress
+     * @param ExtractQuoteAddressData $extractQuoteAddressData
      */
-    public function __construct(ExtractDataFromAddress $extractDataFromAddress)
+    public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
     {
-        $this->extractDataFromAddress = $extractDataFromAddress;
+        $this->extractQuoteAddressData = $extractQuoteAddressData;
     }
 
     /**
@@ -39,6 +40,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
+        /** @var CartInterface $cart */
         $cart = $value['model'];
 
         $billingAddress = $cart->getBillingAddress();
@@ -46,7 +48,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             return null;
         }
 
-        $addressData = $this->extractDataFromAddress->execute($billingAddress);
+        $addressData = $this->extractQuoteAddressData->execute($billingAddress);
         return $addressData;
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
index 2df31841366a1..db74b1fa4174b 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
@@ -37,7 +37,7 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        if (!isset($args['cart_id'])) {
+        if (!isset($args['cart_id']) || empty($args['cart_id'])) {
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
         }
         $maskedCartId = $args['cart_id'];
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
index 730c927c32a0c..5a708ceaedc28 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
@@ -50,7 +50,7 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        if (!isset($args['input']['cart_id'])) {
+        if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
         }
         $maskedCartId = $args['input']['cart_id'];
@@ -61,10 +61,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         try {
             $this->couponManagement->remove($cartId);
-        } catch (NoSuchEntityException $exception) {
-            throw new GraphQlNoSuchEntityException(__($exception->getMessage()));
-        } catch (CouldNotDeleteException $exception) {
-            throw new LocalizedException(__($exception->getMessage()));
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        } catch (CouldNotDeleteException $e) {
+            throw new LocalizedException(__($e->getMessage()), $e);
         }
 
         return [
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php
index 1838f17369ffc..63e66f121f555 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php
@@ -14,7 +14,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Quote\Api\GuestCartItemRepositoryInterface;
+use Magento\Quote\Api\CartItemRepositoryInterface;
 use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
 
 /**
@@ -23,25 +23,25 @@
 class RemoveItemFromCart implements ResolverInterface
 {
     /**
-     * @var GuestCartItemRepositoryInterface
+     * @var GetCartForUser
      */
-    private $guestCartItemRepository;
+    private $getCartForUser;
 
     /**
-     * @var GetCartForUser
+     * @var CartItemRepositoryInterface
      */
-    private $getCartForUser;
+    private $cartItemRepository;
 
     /**
-     * @param GuestCartItemRepositoryInterface $guestCartItemRepository
      * @param GetCartForUser $getCartForUser
+     * @param CartItemRepositoryInterface $cartItemRepository
      */
     public function __construct(
-        GuestCartItemRepositoryInterface $guestCartItemRepository,
-        GetCartForUser $getCartForUser
+        GetCartForUser $getCartForUser,
+        CartItemRepositoryInterface $cartItemRepository
     ) {
-        $this->guestCartItemRepository = $guestCartItemRepository;
         $this->getCartForUser = $getCartForUser;
+        $this->cartItemRepository = $cartItemRepository;
     }
 
     /**
@@ -49,24 +49,24 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        if (!isset($args['input']['cart_id'])) {
-            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+        if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
         }
         $maskedCartId = $args['input']['cart_id'];
 
-        if (!isset($args['input']['cart_item_id'])) {
-            throw new GraphQlInputException(__('Required parameter "cart_item_id" is missing'));
+        if (!isset($args['input']['cart_item_id']) || empty($args['input']['cart_item_id'])) {
+            throw new GraphQlInputException(__('Required parameter "cart_item_id" is missing.'));
         }
         $itemId = $args['input']['cart_item_id'];
 
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
 
         try {
-            $this->guestCartItemRepository->deleteById($maskedCartId, $itemId);
+            $this->cartItemRepository->deleteById((int)$cart->getId(), $itemId);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()));
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
         } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
+            throw new GraphQlInputException(__($e->getMessage()), $e);
         }
 
         return [
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
index ffd1bf37f4771..d1dcb4a48a76b 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
@@ -60,12 +60,12 @@ public function __construct(
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
         if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
-            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
         }
         $maskedCartId = $args['input']['cart_id'];
 
         if (!isset($args['input']['payment_method']['code']) || empty($args['input']['payment_method']['code'])) {
-            throw new GraphQlInputException(__('Required parameter "payment_method" is missing'));
+            throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
         }
         $paymentMethodCode = $args['input']['payment_method']['code'];
 
@@ -86,9 +86,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         try {
             $this->paymentMethodManagement->set($cart->getId(), $payment);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()));
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
         } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
+            throw new GraphQlInputException(__($e->getMessage()), $e);
         }
 
         return [
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
index f2e5be797dbd6..e69ba47e7adf5 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php
@@ -11,9 +11,8 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\Stdlib\ArrayManager;
 use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-use Magento\QuoteGraphQl\Model\Cart\SetShippingMethodOnCart;
+use Magento\QuoteGraphQl\Model\Cart\SetShippingMethodsOnCartInterface;
 
 /**
  * Mutation resolver for setting shipping methods for shopping cart
@@ -21,33 +20,25 @@
 class SetShippingMethodsOnCart implements ResolverInterface
 {
     /**
-     * @var SetShippingMethodOnCart
-     */
-    private $setShippingMethodOnCart;
-
-    /**
-     * @var ArrayManager
+     * @var GetCartForUser
      */
-    private $arrayManager;
+    private $getCartForUser;
 
     /**
-     * @var GetCartForUser
+     * @var SetShippingMethodsOnCartInterface
      */
-    private $getCartForUser;
+    private $setShippingMethodsOnCart;
 
     /**
-     * @param ArrayManager $arrayManager
      * @param GetCartForUser $getCartForUser
-     * @param SetShippingMethodOnCart $setShippingMethodOnCart
+     * @param SetShippingMethodsOnCartInterface $setShippingMethodsOnCart
      */
     public function __construct(
-        ArrayManager $arrayManager,
         GetCartForUser $getCartForUser,
-        SetShippingMethodOnCart $setShippingMethodOnCart
+        SetShippingMethodsOnCartInterface $setShippingMethodsOnCart
     ) {
-        $this->arrayManager = $arrayManager;
         $this->getCartForUser = $getCartForUser;
-        $this->setShippingMethodOnCart = $setShippingMethodOnCart;
+        $this->setShippingMethodsOnCart = $setShippingMethodsOnCart;
     }
 
     /**
@@ -55,37 +46,18 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        $shippingMethods = $this->arrayManager->get('input/shipping_methods', $args);
-        $maskedCartId = $this->arrayManager->get('input/cart_id', $args);
-
-        if (!$maskedCartId) {
+        if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
         }
-        if (!$shippingMethods) {
-            throw new GraphQlInputException(__('Required parameter "shipping_methods" is missing'));
-        }
+        $maskedCartId = $args['input']['cart_id'];
 
-        $shippingMethod = reset($shippingMethods); // This point can be extended for multishipping
-
-        if (!isset($shippingMethod['cart_address_id']) || empty($shippingMethod['cart_address_id'])) {
-            throw new GraphQlInputException(__('Required parameter "cart_address_id" is missing'));
-        }
-        if (!isset($shippingMethod['carrier_code']) || empty($shippingMethod['carrier_code'])) {
-            throw new GraphQlInputException(__('Required parameter "shipping_carrier_code" is missing'));
-        }
-        if (!isset($shippingMethod['method_code']) || empty($shippingMethod['method_code'])) {
-            throw new GraphQlInputException(__('Required parameter "shipping_method_code" is missing'));
+        if (!isset($args['input']['shipping_methods']) || empty($args['input']['shipping_methods'])) {
+            throw new GraphQlInputException(__('Required parameter "shipping_methods" is missing'));
         }
+        $shippingMethods = $args['input']['shipping_methods'];
 
-        $userId = $context->getUserId();
-        $cart = $this->getCartForUser->execute((string) $maskedCartId, $userId);
-
-        $this->setShippingMethodOnCart->execute(
-            $cart,
-            $shippingMethod['cart_address_id'],
-            $shippingMethod['carrier_code'],
-            $shippingMethod['method_code']
-        );
+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
+        $this->setShippingMethodsOnCart->execute($context, $cart, $shippingMethods);
 
         return [
             'cart' => [
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAdress/AvailableShippingMethods.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/AvailableShippingMethods.php
similarity index 97%
rename from app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAdress/AvailableShippingMethods.php
rename to app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/AvailableShippingMethods.php
index 7804b8defe378..a9e0ba59d15d9 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAdress/AvailableShippingMethods.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/AvailableShippingMethods.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\QuoteGraphQl\Model\Resolver\ShippingAdress;
+namespace Magento\QuoteGraphQl\Model\Resolver\ShippingAddress;
 
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\Exception\LocalizedException;
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php
new file mode 100644
index 0000000000000..c58affa064c89
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver\ShippingAddress;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * @inheritdoc
+ */
+class SelectedShippingMethod implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        $address = $value['model'];
+
+        if ($address->getShippingMethod()) {
+            list($carrierCode, $methodCode) = explode('_', $address->getShippingMethod(), 2);
+            $shippingAmount = $address->getShippingAmount();
+        }
+
+        return [
+            'carrier_code' => $carrierCode ?? null,
+            'method_code' => $methodCode ?? null,
+            'label' => $address->getShippingDescription(),
+            'amount' => $shippingAmount ?? null,
+        ];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
index 3a55ef9ae25a8..eb3b0966740eb 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
@@ -11,7 +11,8 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromAddress;
+use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
 
 /**
  * @inheritdoc
@@ -19,16 +20,16 @@
 class ShippingAddresses implements ResolverInterface
 {
     /**
-     * @var ExtractDataFromAddress
+     * @var ExtractQuoteAddressData
      */
-    private $extractDataFromAddress;
+    private $extractQuoteAddressData;
 
     /**
-     * @param ExtractDataFromAddress $extractDataFromAddress
+     * @param ExtractQuoteAddressData $extractQuoteAddressData
      */
-    public function __construct(ExtractDataFromAddress $extractDataFromAddress)
+    public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
     {
-        $this->extractDataFromAddress = $extractDataFromAddress;
+        $this->extractQuoteAddressData = $extractQuoteAddressData;
     }
 
     /**
@@ -39,6 +40,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
+        /** @var Quote $cart */
         $cart = $value['model'];
 
         $addressesData = [];
@@ -46,7 +48,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         if (count($shippingAddresses)) {
             foreach ($shippingAddresses as $shippingAddress) {
-                $addressesData[] = $this->extractDataFromAddress->execute($shippingAddress);
+                $addressesData[] = $this->extractQuoteAddressData->execute($shippingAddress);
             }
         }
         return $addressesData;
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
new file mode 100644
index 0000000000000..78a07506556c0
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Api\CartItemRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+
+/**
+ * @inheritdoc
+ */
+class UpdateCartItems implements ResolverInterface
+{
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @var CartItemRepositoryInterface
+     */
+    private $cartItemRepository;
+
+    /**
+     * @param GetCartForUser $getCartForUser
+     * @param CartItemRepositoryInterface $cartItemRepository
+     */
+    public function __construct(
+        GetCartForUser $getCartForUser,
+        CartItemRepositoryInterface $cartItemRepository
+    ) {
+        $this->getCartForUser = $getCartForUser;
+        $this->cartItemRepository = $cartItemRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
+        }
+        $maskedCartId = $args['input']['cart_id'];
+
+        if (!isset($args['input']['cart_items']) || empty($args['input']['cart_items'])
+            || !is_array($args['input']['cart_items'])
+        ) {
+            throw new GraphQlInputException(__('Required parameter "cart_items" is missing.'));
+        }
+        $cartItems = $args['input']['cart_items'];
+
+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
+
+        try {
+            $this->processCartItems($cart, $cartItems);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+
+        return [
+            'cart' => [
+                'model' => $cart,
+            ],
+        ];
+    }
+
+    /**
+     * Process cart items
+     *
+     * @param Quote $cart
+     * @param array $items
+     * @throws GraphQlInputException
+     * @throws LocalizedException
+     */
+    private function processCartItems(Quote $cart, array $items): void
+    {
+        foreach ($items as $item) {
+            if (!isset($item['cart_item_id']) || empty($item['cart_item_id'])) {
+                throw new GraphQlInputException(__('Required parameter "cart_item_id" for "cart_items" is missing.'));
+            }
+            $itemId = $item['cart_item_id'];
+
+            if (!isset($item['quantity'])) {
+                throw new GraphQlInputException(__('Required parameter "quantity" for "cart_items" is missing.'));
+            }
+            $qty = (float)$item['quantity'];
+
+            $cartItem = $cart->getItemById($itemId);
+            if ($cartItem === false) {
+                throw new GraphQlNoSuchEntityException(
+                    __('Could not find cart item with id: %1.', $item['cart_item_id'])
+                );
+            }
+
+            if ($qty <= 0.0) {
+                $this->cartItemRepository->deleteById((int)$cart->getId(), $itemId);
+            } else {
+                $cartItem->setQty($qty);
+                $this->cartItemRepository->save($cartItem);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml b/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
index 86bc954ae4ac4..c7389cf667845 100644
--- a/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/QuoteGraphQl/etc/graphql/di.xml
@@ -7,5 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\QuoteGraphQl\Model\Cart\SetShippingAddressesOnCartInterface"
-                type="Magento\QuoteGraphQl\Model\Cart\SetShippingAddressOnCart" />
+                type="Magento\QuoteGraphQl\Model\Cart\SetShippingAddressesOnCart"/>
+    <preference for="Magento\QuoteGraphQl\Model\Cart\SetShippingMethodsOnCartInterface"
+                type="Magento\QuoteGraphQl\Model\Cart\SetShippingMethodsOnCart"/>
 </config>
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index cf9cb78742195..9ec3492f64531 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -11,6 +11,7 @@ type Mutation {
     addVirtualProductsToCart(input: AddVirtualProductsToCartInput): AddVirtualProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
     applyCouponToCart(input: ApplyCouponToCartInput): ApplyCouponToCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ApplyCouponToCart")
     removeCouponFromCart(input: RemoveCouponFromCartInput): RemoveCouponFromCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\RemoveCouponFromCart")
+    updateCartItems(input: UpdateCartItemsInput): UpdateCartItemsOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\UpdateCartItems")
     removeItemFromCart(input: RemoveItemFromCartInput): RemoveItemFromCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\RemoveItemFromCart")
     setShippingAddressesOnCart(input: SetShippingAddressesOnCartInput): SetShippingAddressesOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingAddressesOnCart")
     setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetBillingAddressOnCart")
@@ -54,6 +55,16 @@ input ApplyCouponToCartInput {
     coupon_code: String!
 }
 
+input UpdateCartItemsInput {
+    cart_id: String!
+    cart_items: [CartItemQuantityInput!]!
+}
+
+input CartItemQuantityInput {
+    cart_item_id: Int!
+    quantity: Float!
+}
+
 input RemoveItemFromCartInput {
     cart_id: String!
     cart_item_id: Int!
@@ -67,12 +78,6 @@ input SetShippingAddressesOnCartInput {
 input ShippingAddressInput {
     customer_address_id: Int # If provided then will be used address from address book
     address: CartAddressInput
-    cart_items: [CartItemQuantityInput!]
-}
-
-input CartItemQuantityInput {
-    cart_item_id: Int!
-    quantity: Float!
 }
 
 input SetBillingAddressOnCartInput {
@@ -101,10 +106,10 @@ input CartAddressInput {
 
 input SetShippingMethodsOnCartInput {
     cart_id: String!
-    shipping_methods: [ShippingMethodForAddressInput!]!
+    shipping_methods: [ShippingMethodInput!]!
 }
 
-input ShippingMethodForAddressInput {
+input ShippingMethodInput {
     cart_address_id: Int!
     carrier_code: String!
     method_code: String!
@@ -122,10 +127,6 @@ input SetPaymentMethodOnCartInput {
 input PaymentMethodInput {
     code: String! @doc(description:"Payment method code")
     purchase_order_number: String @doc(description:"Purchase order number")
-    additional_data: PaymentMethodAdditionalDataInput
-}
-
-input PaymentMethodAdditionalDataInput {
 }
 
 type SetPaymentMethodOnCartOutput {
@@ -173,8 +174,8 @@ type CartAddress {
     country: CartAddressCountry
     telephone: String
     address_type: AdressTypeEnum
-    available_shipping_methods: [AvailableShippingMethod] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAdress\\AvailableShippingMethods")
-    selected_shipping_method: SelectedShippingMethod
+    available_shipping_methods: [AvailableShippingMethod] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\AvailableShippingMethods")
+    selected_shipping_method: SelectedShippingMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\SelectedShippingMethod")
     items_weight: Float
     customer_notes: String
     cart_items: [CartItemQuantity]
@@ -196,7 +197,10 @@ type CartAddressCountry {
 }
 
 type SelectedShippingMethod {
-    amount: Float!
+    carrier_code: String
+    method_code: String
+    label: String
+    amount: Float
 }
 
 type AvailableShippingMethod {
@@ -219,10 +223,6 @@ type AvailablePaymentMethod {
 type SelectedPaymentMethod {
     code: String @doc(description: "The payment method code")
     purchase_order_number: String @doc(description: "The purchase order number.")
-    additional_data: SelectedPaymentMethodAdditionalData
-}
-
-type SelectedPaymentMethodAdditionalData {
 }
 
 enum AdressTypeEnum {
@@ -250,6 +250,10 @@ type AddVirtualProductsToCartOutput {
     cart: Cart!
 }
 
+type UpdateCartItemsOutput {
+    cart: Cart!
+}
+
 type RemoveItemFromCartOutput {
     cart: Cart!
 }
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index fd9adbe734101..da7ab97a1b211 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -445,7 +445,7 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
                 break;
 
             case 'custom':
-                $dateStart = $customStart ? $customStart : $dateEnd;
+                $dateStart = $customStart ? $customStart : $dateStart;
                 $dateEnd = $customEnd ? $customEnd : $dateEnd;
                 break;
 
diff --git a/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php b/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php
index 6256194cef53b..f35d6eac27ea8 100644
--- a/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php
+++ b/app/code/Magento/Review/Observer/CatalogBlockProductCollectionBeforeToHtmlObserver.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Review block observer.
+ */
 class CatalogBlockProductCollectionBeforeToHtmlObserver implements ObserverInterface
 {
     /**
@@ -35,7 +38,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     {
         $productCollection = $observer->getEvent()->getCollection();
         if ($productCollection instanceof \Magento\Framework\Data\Collection) {
-            $productCollection->load();
+            if (!$productCollection->isLoaded()) {
+                $productCollection->load();
+            }
             $this->_reviewFactory->create()->appendSummary($productCollection);
         }
 
diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
index 73f534451580c..a82d4328ca159 100644
--- a/app/code/Magento/ReviewAnalytics/composer.json
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-review": "*"
+        "magento/module-review": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Robots/Model/Config/Value.php b/app/code/Magento/Robots/Model/Config/Value.php
index c4e17e55f1262..16a5a486e1078 100644
--- a/app/code/Magento/Robots/Model/Config/Value.php
+++ b/app/code/Magento/Robots/Model/Config/Value.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Robots\Model\Config;
 
 use Magento\Framework\App\Cache\TypeListInterface;
@@ -32,12 +33,11 @@ class Value extends ConfigValue implements IdentityInterface
     const CACHE_TAG = 'robots';
 
     /**
-     * Model cache tag for clear cache in after save and after delete
+     * @inheritdoc
      *
-     * @var string
      * @since 100.2.0
      */
-    protected $_cacheTag = true;
+    protected $_cacheTag = [self::CACHE_TAG];
 
     /**
      * @var StoreManagerInterface
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index d15c218a60b47..6b87c1fe39d8b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -6,6 +6,7 @@
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
 
 /**
  * Sales Order Create Form Abstract Block
@@ -57,8 +58,7 @@ public function __construct(
     }
 
     /**
-     * Prepare global layout
-     * Add renderers to \Magento\Framework\Data\Form
+     * Prepare global layout. Add renderers to \Magento\Framework\Data\Form
      *
      * @return $this
      */
@@ -152,7 +152,7 @@ protected function _addAdditionalFormElementData(\Magento\Framework\Data\Form\El
     /**
      * Add rendering EAV attributes to Form element
      *
-     * @param \Magento\Customer\Api\Data\AttributeMetadataInterface[] $attributes
+     * @param AttributeMetadataInterface[] $attributes
      * @param \Magento\Framework\Data\Form\AbstractForm $form
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -176,8 +176,8 @@ protected function _addAttributesToForm($attributes, \Magento\Framework\Data\For
                     [
                         'name' => $attribute->getAttributeCode(),
                         'label' => __($attribute->getStoreLabel()),
-                        'class' => $attribute->getFrontendClass(),
-                        'required' => $attribute->isRequired()
+                        'class' => $this->getValidationClasses($attribute),
+                        'required' => $attribute->isRequired(),
                     ]
                 );
                 if ($inputType == 'multiline') {
@@ -227,4 +227,58 @@ public function getFormValues()
     {
         return [];
     }
+
+    /**
+     * Retrieve frontend classes according validation rules
+     *
+     * @param AttributeMetadataInterface $attribute
+     *
+     * @return string
+     */
+    private function getValidationClasses(AttributeMetadataInterface $attribute) : string
+    {
+        $out = [];
+        $out[] = $attribute->getFrontendClass();
+
+        $textClasses = $this->getTextLengthValidateClasses($attribute);
+        if (!empty($textClasses)) {
+            $out = array_merge($out, $textClasses);
+        }
+
+        $out = !empty($out) ? implode(' ', array_unique(array_filter($out))) : '';
+        return $out;
+    }
+
+    /**
+     * Retrieve validation classes by min_text_length and max_text_length rules
+     *
+     * @param AttributeMetadataInterface $attribute
+     *
+     * @return array
+     */
+    private function getTextLengthValidateClasses(AttributeMetadataInterface $attribute) : array
+    {
+        $classes = [];
+
+        $validateRules = $attribute->getValidationRules();
+        if (!empty($validateRules)) {
+            foreach ($validateRules as $rule) {
+                switch ($rule->getName()) {
+                    case 'min_text_length':
+                        $classes[] = 'minimum-length-' . $rule->getValue();
+                        break;
+
+                    case 'max_text_length':
+                        $classes[] = 'maximum-length-' . $rule->getValue();
+                        break;
+                }
+            }
+
+            if (!empty($classes)) {
+                $classes[] = 'validate-length';
+            }
+        }
+
+        return $classes;
+    }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index c2a0eadf7b67a..03915c0499367 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -132,9 +132,7 @@ protected function _prepareForm()
         $this->_addAttributesToForm($attributes, $fieldset);
 
         $this->_form->addFieldNameSuffix('order[account]');
-
-        $formValues = $this->extractValuesFromAttributes($attributes);
-        $this->_form->setValues($formValues);
+        $this->_form->setValues($this->extractValuesFromAttributes($attributes));
 
         return $this;
     }
diff --git a/app/code/Magento/Sales/Controller/Guest/Form.php b/app/code/Magento/Sales/Controller/Guest/Form.php
index 8b4467cb538fa..04bb66f3d5b6e 100644
--- a/app/code/Magento/Sales/Controller/Guest/Form.php
+++ b/app/code/Magento/Sales/Controller/Guest/Form.php
@@ -4,40 +4,72 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Controller\Guest;
 
-class Form extends \Magento\Framework\App\Action\Action
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Sales\Helper\Guest as GuestHelper;
+
+/**
+ * Class Form
+ */
+class Form extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
 {
     /**
-     * @var \Magento\Framework\View\Result\PageFactory
+     * @var PageFactory
      */
     protected $resultPageFactory;
 
     /**
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @var CustomerSession|null
+     */
+    private $customerSession;
+
+    /**
+     * @var GuestHelper|null
+     */
+    private $guestHelper;
+
+    /**
+     * @param Context $context
+     * @param PageFactory $resultPageFactory
+     * @param CustomerSession|null $customerSession
+     * @param GuestHelper|null $guestHelper
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory
+        Context $context,
+        PageFactory $resultPageFactory,
+        CustomerSession $customerSession = null,
+        GuestHelper $guestHelper = null
     ) {
         parent::__construct($context);
         $this->resultPageFactory = $resultPageFactory;
+        $this->customerSession = $customerSession ?: ObjectManager::getInstance()->get(CustomerSession::class);
+        $this->guestHelper = $guestHelper ?: ObjectManager::getInstance()->get(GuestHelper::class);
     }
 
     /**
      * Order view form page
      *
-     * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
+     * @return Redirect|Page
      */
     public function execute()
     {
-        if ($this->_objectManager->get(\Magento\Customer\Model\Session::class)->isLoggedIn()) {
+        if ($this->customerSession->isLoggedIn()) {
             return $this->resultRedirectFactory->create()->setPath('customer/account/');
         }
+
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getConfig()->getTitle()->set(__('Orders and Returns'));
-        $this->_objectManager->get(\Magento\Sales\Helper\Guest::class)->getBreadcrumbs($resultPage);
+        $this->guestHelper->getBreadcrumbs($resultPage);
+
         return $resultPage;
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Address/Validator.php b/app/code/Magento/Sales/Model/Order/Address/Validator.php
index 31cb5bb1f60ca..5d3186781e7d7 100644
--- a/app/code/Magento/Sales/Model/Order/Address/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Address/Validator.php
@@ -49,8 +49,8 @@ class Validator
 
     /**
      * @param DirectoryHelper $directoryHelper
-     * @param CountryFactory  $countryFactory
-     * @param EavConfig       $eavConfig
+     * @param CountryFactory $countryFactory
+     * @param EavConfig $eavConfig
      */
     public function __construct(
         DirectoryHelper $directoryHelper,
@@ -61,6 +61,17 @@ public function __construct(
         $this->countryFactory = $countryFactory;
         $this->eavConfig = $eavConfig ?: ObjectManager::getInstance()
             ->get(EavConfig::class);
+    }
+
+    /**
+     * Validate address.
+     *
+     * @param \Magento\Sales\Model\Order\Address $address
+     * @return array
+     */
+    public function validate(Address $address)
+    {
+        $warnings = [];
 
         if ($this->isTelephoneRequired()) {
             $this->required['telephone'] = 'Phone Number';
@@ -73,16 +84,7 @@ public function __construct(
         if ($this->isFaxRequired()) {
             $this->required['fax'] = 'Fax';
         }
-    }
 
-    /**
-     *
-     * @param \Magento\Sales\Model\Order\Address $address
-     * @return array
-     */
-    public function validate(Address $address)
-    {
-        $warnings = [];
         foreach ($this->required as $code => $label) {
             if (!$address->hasData($code)) {
                 $warnings[] = sprintf('"%s" is required. Enter and try again.', $label);
@@ -195,7 +197,10 @@ protected function isStateRequired($countryId)
     }
 
     /**
+     * Check whether telephone is required for address.
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isTelephoneRequired()
     {
@@ -203,7 +208,10 @@ protected function isTelephoneRequired()
     }
 
     /**
+     * Check whether company is required for address.
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isCompanyRequired()
     {
@@ -211,7 +219,10 @@ protected function isCompanyRequired()
     }
 
     /**
+     * Check whether telephone is required for address.
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isFaxRequired()
     {
diff --git a/app/code/Magento/Sales/Model/Service/InvoiceService.php b/app/code/Magento/Sales/Model/Service/InvoiceService.php
index ba6ae7eb14ba7..02242e92c8bf5 100644
--- a/app/code/Magento/Sales/Model/Service/InvoiceService.php
+++ b/app/code/Magento/Sales/Model/Service/InvoiceService.php
@@ -190,6 +190,11 @@ private function prepareItemsQty(Order $order, array $qtys = [])
                 if ($orderItem->getProductType() == Type::TYPE_BUNDLE && !$orderItem->isShipSeparately()) {
                     $qtys[$orderItem->getId()] = $orderItem->getQtyOrdered() - $orderItem->getQtyInvoiced();
                 } else {
+                    $parentItem = $orderItem->getParentItem();
+                    $parentItemId = $parentItem ? $parentItem->getId() : null;
+                    if ($parentItemId && isset($qtys[$parentItemId])) {
+                        $qtys[$orderItem->getId()] = $qtys[$parentItemId];
+                    }
                     continue;
                 }
             }
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
index 2716e860243bf..a75690536e760 100644
--- a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
+++ b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
@@ -8,15 +8,15 @@
 
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\State;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Sales\Model\OrderFactory;
-use Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory as AddressCollectionFactory;
-use Magento\Framework\App\ResourceConnection;
-use Magento\Sales\Setup\SalesSetupFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Setup\SalesSetupFactory;
 
+/**
+ * Fills quote_address_id in table sales_order_address if it is empty.
+ */
 class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, PatchVersionInterface
 {
     /**
@@ -24,11 +24,6 @@ class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, Patch
      */
     private $moduleDataSetup;
 
-    /**
-     * @var SalesSetupFactory
-     */
-    private $salesSetupFactory;
-
     /**
      * @var State
      */
@@ -40,44 +35,22 @@ class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, Patch
     private $eavConfig;
 
     /**
-     * @var AddressCollectionFactory
-     */
-    private $addressCollectionFactory;
-
-    /**
-     * @var OrderFactory
-     */
-    private $orderFactory;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * PatchInitial constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param State $state
+     * @param Config $eavConfig
      */
     public function __construct(
         ModuleDataSetupInterface $moduleDataSetup,
-        SalesSetupFactory $salesSetupFactory,
         State $state,
-        Config $eavConfig,
-        AddressCollectionFactory $addressCollectionFactory,
-        OrderFactory $orderFactory,
-        QuoteFactory $quoteFactory
+        Config $eavConfig
     ) {
         $this->moduleDataSetup = $moduleDataSetup;
-        $this->salesSetupFactory = $salesSetupFactory;
         $this->state = $state;
         $this->eavConfig = $eavConfig;
-        $this->addressCollectionFactory = $addressCollectionFactory;
-        $this->orderFactory = $orderFactory;
-        $this->quoteFactory = $quoteFactory;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -96,32 +69,12 @@ public function apply()
      */
     public function fillQuoteAddressIdInSalesOrderAddress(ModuleDataSetupInterface $setup)
     {
-        $addressTable = $setup->getTable('sales_order_address');
-        $updateOrderAddress = $setup->getConnection()
-            ->select()
-            ->joinInner(
-                ['sales_order' => $setup->getTable('sales_order')],
-                $addressTable . '.parent_id = sales_order.entity_id',
-                ['quote_address_id' => 'quote_address.address_id']
-            )
-            ->joinInner(
-                ['quote_address' => $setup->getTable('quote_address')],
-                'sales_order.quote_id = quote_address.quote_id 
-                AND ' . $addressTable . '.address_type = quote_address.address_type',
-                []
-            )
-            ->where(
-                $addressTable . '.quote_address_id IS NULL'
-            );
-        $updateOrderAddress = $setup->getConnection()->updateFromSelect(
-            $updateOrderAddress,
-            $addressTable
-        );
-        $setup->getConnection()->query($updateOrderAddress);
+        $this->fillQuoteAddressIdInSalesOrderAddressByType($setup, Address::TYPE_SHIPPING);
+        $this->fillQuoteAddressIdInSalesOrderAddressByType($setup, Address::TYPE_BILLING);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -131,7 +84,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -139,10 +92,99 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
         return [];
     }
+
+    /**
+     * Fill quote_address_id in sales_order_address by type.
+     *
+     * @param ModuleDataSetupInterface $setup
+     * @param string $addressType
+     * @throws \Zend_Db_Statement_Exception
+     */
+    private function fillQuoteAddressIdInSalesOrderAddressByType(ModuleDataSetupInterface $setup, $addressType)
+    {
+        $salesConnection = $setup->getConnection('sales');
+
+        $orderTable = $setup->getTable('sales_order', 'sales');
+        $orderAddressTable = $setup->getTable('sales_order_address', 'sales');
+
+        $query = $salesConnection
+            ->select()
+            ->from(
+                ['sales_order_address' => $orderAddressTable],
+                ['entity_id', 'address_type']
+            )
+            ->joinInner(
+                ['sales_order' => $orderTable],
+                'sales_order_address.parent_id = sales_order.entity_id',
+                ['quote_id' => 'sales_order.quote_id']
+            )
+            ->where('sales_order_address.quote_address_id IS NULL')
+            ->where('sales_order_address.address_type = ?', $addressType)
+            ->order('sales_order_address.entity_id');
+
+        $batchSize = 5000;
+        $result = $salesConnection->query($query);
+        $count = $result->rowCount();
+        $batches = ceil($count / $batchSize);
+
+        for ($batch = $batches; $batch > 0; $batch--) {
+            $query->limitPage($batch, $batchSize);
+            $result = $salesConnection->fetchAssoc($query);
+
+            $this->fillQuoteAddressIdInSalesOrderAddressProcessBatch($setup, $result, $addressType);
+        }
+    }
+
+    /**
+     * Process filling quote_address_id in sales_order_address in batch.
+     *
+     * @param ModuleDataSetupInterface $setup
+     * @param array $orderAddresses
+     * @param string $addressType
+     */
+    private function fillQuoteAddressIdInSalesOrderAddressProcessBatch(
+        ModuleDataSetupInterface $setup,
+        array $orderAddresses,
+        $addressType
+    ) {
+        $salesConnection = $setup->getConnection('sales');
+        $quoteConnection = $setup->getConnection('checkout');
+
+        $quoteAddressTable = $setup->getTable('quote_address', 'checkout');
+        $quoteTable = $setup->getTable('quote', 'checkout');
+        $salesOrderAddressTable = $setup->getTable('sales_order_address', 'sales');
+
+        $query = $quoteConnection
+            ->select()
+            ->from(
+                ['quote_address' => $quoteAddressTable],
+                ['quote_id', 'address_id']
+            )
+            ->joinInner(
+                ['quote' => $quoteTable],
+                'quote_address.quote_id = quote.entity_id',
+                []
+            )
+            ->where('quote.entity_id in (?)', array_column($orderAddresses, 'quote_id'))
+            ->where('address_type = ?', $addressType);
+
+        $quoteAddresses = $quoteConnection->fetchAssoc($query);
+
+        foreach ($orderAddresses as $orderAddress) {
+            $bind = [
+                'quote_address_id' => $quoteAddresses[$orderAddress['quote_id']]['address_id'] ?? null,
+            ];
+            $where = [
+                'entity_id = ?' => $orderAddress['entity_id']
+            ];
+
+            $salesConnection->update($salesOrderAddressTable, $bind, $where);
+        }
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index c814a886a2b33..0061411d576e2 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -44,7 +44,6 @@
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
         <waitForPageLoad stepKey="waitForNewInvoicePageLoad"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForSuccessMessageLoad"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
         <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
@@ -58,9 +57,17 @@
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
     </actionGroup>
 
-    <actionGroup name="submitInvoiceIntoOrder">
+    <actionGroup name="StartCreateInvoiceFromOrderPage">
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
+        <seeInCurrentUrl url="{{AdminInvoiceNewPage.url}}" stepKey="seeNewInvoiceUrl"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoicePageTitle"/>
+    </actionGroup>
+
+    <actionGroup name="SubmitInvoice">
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageInvoice"/>
-        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPageInvoice"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index aea04c8abfa60..0e09f3933c1aa 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -18,7 +18,8 @@
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
         <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
-        <click selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectDefaultStoreView"/>
+        <conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
+        <waitForPageLoad stepKey="waitForCreateOrderPageLoadAfterStoreSelect" />
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
     </actionGroup>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
index eed9f80c251c8..a116a23dc02cd 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
@@ -14,7 +14,6 @@
             <argument name="orderId" type="string"/>
         </arguments>
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
-        <waitForPageLoad stepKey="waitForOrderGridLoad"/>
         <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
         <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
         <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
@@ -74,4 +73,9 @@
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.enabledFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
     </actionGroup>
+
+    <actionGroup name="OpenOrderById" extends="filterOrderGridById">
+        <click selector="{{AdminDataGridTableSection.firstRow}}" after="clickOrderApplyFilters" stepKey="openOrderViewPage"/>
+        <waitForPageLoad after="openOrderViewPage" stepKey="waitForOrderViewPageOpened"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
new file mode 100644
index 0000000000000..8108577145421
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
@@ -0,0 +1,22 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Fill Order status form and click save -->
+    <actionGroup name="AdminOrderStatusFormFillAndSave">
+        <arguments>
+            <argument name="status" type="string" />
+            <argument name="label" type="string" />
+        </arguments>
+
+        <fillField stepKey="fillStatusCode" selector="{{AdminOrderStatusFormSection.statusCodeField}}" userInput="{{status}}"/>
+        <fillField stepKey="fillStatusLabel" selector="{{AdminOrderStatusFormSection.statusLabelField}}" userInput="{{label}}"/>
+        <click stepKey="clickSaveStatus" selector="{{AdminMainActionsSection.save}}"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
new file mode 100644
index 0000000000000..5f69f52987688
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Search order status grid for item with a specific code and validate data -->
+    <actionGroup name="AssertOrderStatusExistsInGrid">
+        <arguments>
+            <argument name="status" type="string" />
+            <argument name="label" type="string" />
+        </arguments>
+
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminOrderStatusGridSection.statusCodeFilterField}}" userInput="{{status}}" stepKey="fillStatusFilter"/>
+        <click selector="{{AdminSecondaryGridSection.searchButton}}" stepKey="clickSearch"/>
+        <see selector="{{AdminOrderStatusGridSection.statusCodeDataColumn}}" userInput="{{status}}" stepKey="seeStatusCodeInGrid"/>
+        <see selector="{{AdminOrderStatusGridSection.statusLabelDataColumn}}" userInput="{{label}}" stepKey="seeStatusLabelInGrid"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
new file mode 100644
index 0000000000000..5b4c3115744c9
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Assert that order status is not saved with duplication error message -->
+    <actionGroup name="AssertOrderStatusFormSaveDuplicateError">
+        <see selector="{{AdminMessagesSection.error}}" userInput="We found another order status with the same order status code." stepKey="seeError"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
new file mode 100644
index 0000000000000..d82f4b9dd25e8
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Assert that order status saved with success message -->
+    <actionGroup name="AssertOrderStatusFormSaveSuccess">
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the order status." stepKey="seeSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
new file mode 100644
index 0000000000000..aecd7fcf1b703
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
@@ -0,0 +1,23 @@
+<?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="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="defaultOrderStatus">
+        <data key="status" unique="suffix">order_status</data>
+        <data key="label" unique="suffix">orderLabel</data>
+    </entity>
+    <entity name="duplicatingCodeOrderStatus">
+        <data key="status">pending</data>
+        <data key="label" unique="suffix">orderLabel</data>
+    </entity>
+    <entity name="duplicatingLabelOrderStatus">
+        <data key="status" unique="suffix">order_status</data>
+        <data key="label">Suspected Fraud</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml
new file mode 100644
index 0000000000000..b158e4923074a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.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="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminOrderStatusPage" url="sales/order_status" area="admin" module="Magento_Sales">
+        <section name="AdminOrderStatusFormSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
index bc7fc8145af33..011500fac3f69 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminInvoiceMainActionsSection">
-        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary"/>
+        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary" timeout="60"/>
         <element name="openNewCreditMemoFromInvoice" type="button" selector=".action-default.scalable.credit-memo"/>
         <element name="submitNewRefundFromInvoice" type="button" selector=".action-default.scalable.save.submit-button refund primary"/>
     </section>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml
new file mode 100644
index 0000000000000..1058b2d6f2177
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderStatusFormSection">
+        <element name="statusCodeField" type="text" selector="#edit_form [name=status]"/>
+        <element name="statusLabelField" type="text" selector="#edit_form [name=label]"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
new file mode 100644
index 0000000000000..b624639281187
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderStatusGridSection">
+        <element name="statusCodeFilterField" type="input" selector="[data-role=filter-form] [name=status]"/>
+        <element name="statusCodeDataColumn" type="input" selector="[data-role=row] [data-column=status]"/>
+        <element name="statusLabelDataColumn" type="input" selector="[data-role=row] [data-column=label]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
index 9180636db7821..e405173429b2c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
@@ -25,6 +25,7 @@
             </createData>
             <!-- Enable *Free Shipping* -->
             <createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -33,62 +34,53 @@
             <createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="Simple_US_Customer.email"/>
+            </actionGroup>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <actionGroup ref="logout" stepKey="logOut"/>
         </after>
 
-        <!-- Flush Magento Cache -->
-        <magentoCLI stepKey="flushCache" command="cache:flush"/>
-
         <!--Proceed to Admin panel > SALES > Orders. Created order should be in Processing status-->
-        <amOnPage url="{{AdminOrderCreatePage.url}}" stepKey="navigateToSalesOrderPage"/>
-        <waitForPageLoad stepKey="waitForSalesOrderPageLoaded"/>
-
-        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
-        <waitForElementVisible stepKey="waitForNewOrderPageOpened" selector="{{NewOrderSection.submitOrder}}"/>
-        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+        <actionGroup ref="navigateToNewOrderPageNewCustomer" stepKey="navigateToNewOrderPage"/>
 
         <!--Check if order can be submitted without the required fields including email address-->
-        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="seeNewOrderPageTitle"/>
-        <actionGroup ref="addSimpleProductToOrder" stepKey="addFirstProductToOrder" after="scrollToTopOfOrderFormPage">
+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addFirstProductToOrder">
             <argument name="product" value="$$createProduct$$"/>
         </actionGroup>
 
         <!--Click *Custom Price* link, enter 0 and click *Update Items and Quantities* button-->
         <click selector="{{AdminOrderFormItemsSection.customPriceCheckbox}}" stepKey="clickCustomPriceCheckbox"/>
-        <waitForElementVisible stepKey="waitForPriceFieldAppears" selector="{{AdminOrderFormItemsSection.customPriceField}}"/>
+        <waitForElementVisible selector="{{AdminOrderFormItemsSection.customPriceField}}" stepKey="waitForPriceFieldAppears"/>
         <fillField selector="{{AdminOrderFormItemsSection.customPriceField}}" userInput="0" stepKey="fillCustomPriceField"/>
         <click selector="{{AdminOrderFormItemsSection.updateItemsAndQuantities}}" stepKey="clickUpdateItemsAndQuantitiesButton"/>
 
         <!--Fill customer group and customer email-->
-        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="clickUpdateItemsAndQuantitiesButton"/>
-        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail"/>
 
         <!--Fill customer address information-->
-        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
             <argument name="customer" value="Simple_US_Customer"/>
             <argument name="address" value="US_Address_TX"/>
         </actionGroup>
 
         <!-- Select Free shipping -->
-        <actionGroup ref="orderSelectFreeShipping" stepKey="selectFreeShippingOption" after="fillCustomerAddress"/>
+        <actionGroup ref="orderSelectFreeShipping" stepKey="selectFreeShippingOption"/>
 
         <!--Click *Submit Order* button-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="selectFreeShippingOption"/>
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
 
         <!--Click *Invoice* button-->
-        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
-        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
-        <waitForPageLoad stepKey="waitForInvoicePageOpened"/>
-
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForInvoiceSaved"/>
-        <see userInput="The invoice has been created." stepKey="seeCorrectMessage"/>
+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
 
         <!--Verify that *Credit Memo* button is displayed-->
         <seeElement selector="{{AdminOrderFormItemsSection.creditMemo}}" stepKey="seeCreditMemo"/>
         <click selector="{{AdminOrderFormItemsSection.creditMemo}}" stepKey="clickCreditMemoItem"/>
         <waitForPageLoad stepKey="waitForCreditMemoPageLoaded"/>
-        <see stepKey="seeNewMemoPage" userInput="New Memo"/>
-        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeUrlOnPage"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoPageTitle"/>
+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeNewMemoUrlOnPage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml
new file mode 100644
index 0000000000000..85ef563e10db7
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml
@@ -0,0 +1,38 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminChangeCustomerGroupInNewOrder">
+        <annotations>
+            <title value="Customer account group cannot be selected while creating a new customer in order"/>
+            <stories value="MC-15290: Customer account group cannot be selected while creating a new customer in order"/>
+            <description value="Customer account group cannot be selected while creating a new customer in order"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-15290"/>
+            <useCaseId value="MC-15289"/>
+            <group value="sales"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        
+        <actionGroup ref="navigateToNewOrderPageNewCustomerSingleStore" stepKey="openNewOrder"/>
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="Retailer" stepKey="selectCustomerGroup"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <grabValueFrom selector="{{AdminOrderFormAccountSection.group}}" stepKey="grabGroupValue"/>
+        <assertEquals stepKey="assertValueIsStillSelected">
+            <actualResult type="variable">$grabGroupValue</actualResult>
+            <expectedResult type="string">3</expectedResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
index 7c83f35468ce6..f869841153aea 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
@@ -81,7 +81,7 @@
         <fillField selector="{{AdminInvoiceItemsSection.qtyToInvoiceColumn}}" userInput="5" stepKey="ChangeQtyToInvoice"/>
         <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQunatity"/>
         <waitForPageLoad stepKey="waitPageToBeLoaded"/>
-        <actionGroup ref="submitInvoiceIntoOrder" stepKey="submitInvoice"/>
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
 
         <!--Verify invoiced items qty in ship tab-->
         <actionGroup ref="goToShipmentIntoOrder" stepKey="goToShipment"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
index 099cf7fbce914..ce66409ed9b3c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -71,7 +71,6 @@
         <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForInvoicePageLoad"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
         <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml
new file mode 100644
index 0000000000000..40a731410a899
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml
@@ -0,0 +1,39 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateOrderStatusDuplicatingCodeTest">
+        <annotations>
+            <stories value="Create order status"/>
+            <title value="Create order status with duplicating code"/>
+            <description value="Receive error when creating order status with the code which is already exist"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-15432" />
+            <group value="sales"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to new order status page -->
+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
+
+        <!-- Fill the form and validate message -->
+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
+            <argument name="status" value="{{duplicatingCodeOrderStatus.status}}"/>
+            <argument name="label" value="{{duplicatingCodeOrderStatus.label}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertOrderStatusFormSaveDuplicateError" stepKey="seeFormSaveDuplicateError"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
new file mode 100644
index 0000000000000..d1381bbb1efb0
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
@@ -0,0 +1,45 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateOrderStatusDuplicatingLabelTest">
+        <annotations>
+            <stories value="Create order status"/>
+            <title value="Create order status with duplicating label"/>
+            <description value="Create an order status and get success message"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-15433" />
+            <group value="sales"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to new order status page -->
+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
+
+        <!-- Fill the form and validate message -->
+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
+            <argument name="status" value="{{duplicatingLabelOrderStatus.status}}"/>
+            <argument name="label" value="{{duplicatingLabelOrderStatus.label}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertOrderStatusFormSaveSuccess" stepKey="seeFormSaveSuccess"/>
+
+        <!-- Verify the order status grid page shows the order status we just created -->
+        <actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="searchCreatedOrderStatus">
+            <argument name="status" value="{{duplicatingLabelOrderStatus.status}}"/>
+            <argument name="label" value="{{duplicatingLabelOrderStatus.label}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
new file mode 100644
index 0000000000000..c2daaac84dd42
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
@@ -0,0 +1,45 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateOrderStatusTest">
+        <annotations>
+            <stories value="Create custom order status"/>
+            <title value="Create custom order status"/>
+            <description value="Tests opening admin order status page, create a new order status with success message"/>
+            <testCaseId value="MC-15431" />
+            <severity value="AVERAGE"/>
+            <group value="sales"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to new order status page -->
+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
+
+        <!-- Fill the form and validate message -->
+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertOrderStatusFormSaveSuccess" stepKey="seeFormSaveSuccess"/>
+
+        <!-- Verify the order status grid page shows the order status we just created -->
+        <actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="searchCreatedOrderStatus">
+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
new file mode 100644
index 0000000000000..d418751c736e1
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
@@ -0,0 +1,88 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSubmitsOrderWithAndWithoutFieldsValidationTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Create orders"/>
+            <title value="Fields validation is required to create an order from Admin Panel"/>
+            <description value="Admin should not be able to submit orders without invalid address fields"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <!--Create order via Admin-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
+        <!--<actionGroup ref="navigateToNewOrderPageNewCustomer" stepKey="navigateToNewOrderPage"/>-->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+
+        <!--Check if order can be submitted without the required fields including email address-->
+        <actionGroup ref="checkRequiredFieldsNewOrderForm" stepKey="checkRequiredFieldsNewOrder" after="seeNewOrderPageTitle"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="checkRequiredFieldsNewOrder"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder" after="scrollToTopOfOrderFormPage">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+
+        <!--Fill customer group and customer email-->
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="addSimpleProductToOrder"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
+
+        <!--Fill wrong customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillWrongCustomerAddress" after="fillCustomerEmail">
+            <argument name="customer" value="Simple_US_Customer_Incorrect_Name"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+        <!-- Select shipping -->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"
+                     after="fillWrongCustomerAddress"/>
+
+        <!--Verify totals on Order page-->
+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping" after="seeOrderSubTotal"/>
+        <scrollTo selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="scrollToOrderGrandTotal"/>
+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal" after="scrollToOrderGrandTotal"/>
+
+        <!--Submit Order and verify information-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrderWrong"
+               after="seeCorrectGrandTotal"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.firstNameError}}"
+             userInput="Please enter less or equal than 255 symbols." stepKey="firstNameError"
+             after="clickSubmitOrderWrong"/>
+
+        <!--Fill correct customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="firstNameError">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <!-- Select shipping -->
+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickShipping" after="fillCustomerAddress"/>
+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="selectShipping" after="clickShipping"/>
+
+        <!--Submit Order and verify information-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="selectShipping"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 5a5dd925a3098..68fcd17122bd2 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -1015,4 +1015,9 @@
     <preference
             for="Magento\Sales\Api\OrderCustomerDelegateInterface"
             type="Magento\Sales\Model\Order\OrderCustomerDelegate" />
+    <type name="Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker">
+        <arguments>
+            <argument name="productAvailabilityChecks" xsi:type="array" />
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new.html b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
index 8af49f322c682..84f5acb29ea3b 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
@@ -53,7 +53,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
index df1677f56a500..bb181126724da 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
@@ -51,7 +51,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
new file mode 100644
index 0000000000000..91414663951d3
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="sales_email_order_shipment_renderers"/>
+    <body>
+        <block class="Magento\Framework\View\Element\Template" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml"/>
+    </body>
+</page>
\ No newline at end of file
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
index 64424c8f5bc61..b77dcd7e71c65 100644
--- a/app/code/Magento/SalesAnalytics/composer.json
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-sales": "*"
+        "magento/module-sales": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
index 5802115d44b5e..3e592cf061dfc 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 
 /**
  * Orders data reslover
@@ -24,20 +24,20 @@ class Orders implements ResolverInterface
     private $collectionFactory;
 
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @param CollectionFactoryInterface $collectionFactory
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      */
     public function __construct(
         CollectionFactoryInterface $collectionFactory,
-        CheckCustomerAccount $checkCustomerAccount
+        GetCustomer $getCustomer
     ) {
         $this->collectionFactory = $collectionFactory;
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
     }
 
     /**
@@ -50,11 +50,10 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $customerId = $context->getUserId();
-        $this->checkCustomerAccount->execute($customerId, $context->getUserType());
+        $customer = $this->getCustomer->execute($context);
 
         $items = [];
-        $orders = $this->collectionFactory->create($customerId);
+        $orders = $this->collectionFactory->create($customer->getId());
 
         /** @var \Magento\Sales\Model\Order $order */
         foreach ($orders as $order) {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
index 5e6f3847c8e31..3e7b6ea281501 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -9,6 +9,9 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Quote\Model\Quote\Address;
+use Magento\SalesRule\Api\Data\CouponInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
 
 /**
  * Sales Rules resource collection model.
@@ -107,12 +110,15 @@ protected function mapAssociatedEntities($entityType, $objectField)
 
         $associatedEntities = $this->getConnection()->fetchAll($select);
 
-        array_map(function ($associatedEntity) use ($entityInfo, $ruleIdField, $objectField) {
-            $item = $this->getItemByColumnValue($ruleIdField, $associatedEntity[$ruleIdField]);
-            $itemAssociatedValue = $item->getData($objectField) === null ? [] : $item->getData($objectField);
-            $itemAssociatedValue[] = $associatedEntity[$entityInfo['entity_id_field']];
-            $item->setData($objectField, $itemAssociatedValue);
-        }, $associatedEntities);
+        array_map(
+            function ($associatedEntity) use ($entityInfo, $ruleIdField, $objectField) {
+                $item = $this->getItemByColumnValue($ruleIdField, $associatedEntity[$ruleIdField]);
+                $itemAssociatedValue = $item->getData($objectField) ?? [];
+                $itemAssociatedValue[] = $associatedEntity[$entityInfo['entity_id_field']];
+                $item->setData($objectField, $itemAssociatedValue);
+            },
+            $associatedEntities
+        );
     }
 
     /**
@@ -141,6 +147,7 @@ protected function _afterLoad()
      * @param string $couponCode
      * @param string|null $now
      * @param Address $address allow extensions to further filter out rules based on quote address
+     * @throws \Zend_Db_Select_Exception
      * @use $this->addWebsiteGroupDateFilter()
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return $this
@@ -153,32 +160,24 @@ public function setValidationFilter(
         Address $address = null
     ) {
         if (!$this->getFlag('validation_filter')) {
-            /* We need to overwrite joinLeft if coupon is applied */
-            $this->getSelect()->reset();
-            parent::_initSelect();
+            $this->prepareSelect($websiteId, $customerGroupId, $now);
 
-            $this->addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now);
-            $select = $this->getSelect();
+            $noCouponRules = $this->getNoCouponCodeSelect();
 
-            $connection = $this->getConnection();
-            if (strlen($couponCode)) {
-                $noCouponWhereCondition = $connection->quoteInto(
-                    'main_table.coupon_type = ?',
-                    \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
-                );
-                $relatedRulesIds = $this->getCouponRelatedRuleIds($couponCode);
-
-                $select->where(
-                    $noCouponWhereCondition . ' OR main_table.rule_id IN (?)',
-                    $relatedRulesIds,
-                    Select::TYPE_CONDITION
-                );
+            if ($couponCode) {
+                $couponRules = $this->getCouponCodeSelect($couponCode);
+
+                $allAllowedRules = $this->getConnection()->select();
+                $allAllowedRules->union([$noCouponRules, $couponRules], Select::SQL_UNION_ALL);
+
+                $wrapper = $this->getConnection()->select();
+                $wrapper->from($allAllowedRules);
+
+                $this->_select = $wrapper;
             } else {
-                $this->addFieldToFilter(
-                    'main_table.coupon_type',
-                    \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
-                );
+                $this->_select = $noCouponRules;
             }
+
             $this->setOrder('sort_order', self::SORT_ORDER_ASC);
             $this->setFlag('validation_filter', true);
         }
@@ -187,72 +186,98 @@ public function setValidationFilter(
     }
 
     /**
-     * Get rules ids related to coupon code
+     * Recreate the default select object for specific needs of salesrule evaluation with coupon codes.
      *
-     * @param string $couponCode
-     * @return array
+     * @param int $websiteId
+     * @param int $customerGroupId
+     * @param string $now
      */
-    private function getCouponRelatedRuleIds(string $couponCode): array
+    private function prepareSelect($websiteId, $customerGroupId, $now)
     {
-        $connection = $this->getConnection();
-        $select = $connection->select()->from(
-            ['main_table' => $this->getTable('salesrule')],
-            'rule_id'
+        $this->getSelect()->reset();
+        parent::_initSelect();
+
+        $this->addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now);
+    }
+
+    /**
+     * Return select object to determine all active rules not needing a coupon code.
+     *
+     * @return Select
+     */
+    private function getNoCouponCodeSelect()
+    {
+        $noCouponSelect = clone $this->getSelect();
+
+        $noCouponSelect->where(
+            'main_table.coupon_type = ?',
+            Rule::COUPON_TYPE_NO_COUPON
         );
-        $select->joinLeft(
-            ['rule_coupons' => $this->getTable('salesrule_coupon')],
-            $connection->quoteInto(
-                'main_table.rule_id = rule_coupons.rule_id AND main_table.coupon_type != ?',
-                \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
-                null
-            )
+
+        $noCouponSelect->columns([Coupon::KEY_CODE => new \Zend_Db_Expr('NULL')]);
+
+        return $noCouponSelect;
+    }
+
+    /**
+     * Determine all active rules that are valid for the given coupon code.
+     *
+     * @param string $couponCode
+     * @return Select
+     */
+    private function getCouponCodeSelect($couponCode)
+    {
+        $couponSelect = clone $this->getSelect();
+
+        $this->joinCouponTable($couponCode, $couponSelect);
+
+        $notExpired = $this->getConnection()->quoteInto(
+            '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
+            $this->_date->date()->format('Y-m-d')
         );
 
-        $autoGeneratedCouponCondition = [
-            $connection->quoteInto(
-                "main_table.coupon_type = ?",
-                \Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO
-            ),
-            $connection->quoteInto(
-                "rule_coupons.type = ?",
-                \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
-            ),
-        ];
-
-        $orWhereConditions = [
-            "(" . implode($autoGeneratedCouponCondition, " AND ") . ")",
-            $connection->quoteInto(
-                '(main_table.coupon_type = ? AND main_table.use_auto_generation = 1 AND rule_coupons.type = 1)',
-                \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC
-            ),
-            $connection->quoteInto(
-                '(main_table.coupon_type = ? AND main_table.use_auto_generation = 0 AND rule_coupons.type = 0)',
-                \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC
-            ),
-        ];
-
-        $andWhereConditions = [
-            $connection->quoteInto(
-                'rule_coupons.code = ?',
-                $couponCode
-            ),
-            $connection->quoteInto(
-                '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
-                $this->_date->date()->format('Y-m-d')
-            ),
-        ];
-
-        $orWhereCondition = implode(' OR ', $orWhereConditions);
-        $andWhereCondition = implode(' AND ', $andWhereConditions);
-
-        $select->where(
-            '(' . $orWhereCondition . ') AND ' . $andWhereCondition,
+        $isAutogenerated =
+            $this->getConnection()->quoteInto('main_table.coupon_type = ?', Rule::COUPON_TYPE_AUTO)
+            . ' AND ' .
+            $this->getConnection()->quoteInto('rule_coupons.type = ?', CouponInterface::TYPE_GENERATED);
+
+        $isValidSpecific =
+            $this->getConnection()->quoteInto('(main_table.coupon_type = ?)', Rule::COUPON_TYPE_SPECIFIC)
+            . ' AND (' .
+            '(main_table.use_auto_generation = 1 AND rule_coupons.type = 1)'
+            . ' OR ' .
+            '(main_table.use_auto_generation = 0 AND rule_coupons.type = 0)'
+            . ')';
+
+        $couponSelect->where(
+            "$notExpired AND ($isAutogenerated OR $isValidSpecific)",
             null,
             Select::TYPE_CONDITION
         );
-        $select->group('main_table.rule_id');
 
-        return $connection->fetchCol($select);
+        return $couponSelect;
+    }
+
+    /**
+     * Join coupong table to select.
+     *
+     * @param string $couponCode
+     * @param Select $couponSelect
+     */
+    private function joinCouponTable($couponCode, Select $couponSelect)
+    {
+        $couponJoinCondition =
+            'main_table.rule_id = rule_coupons.rule_id'
+            . ' AND ' .
+            $this->getConnection()->quoteInto('main_table.coupon_type <> ?', Rule::COUPON_TYPE_NO_COUPON)
+            . ' AND ' .
+            $this->getConnection()->quoteInto('rule_coupons.code = ?', $couponCode);
+
+        $couponSelect->joinInner(
+            ['rule_coupons' => $this->getTable('salesrule_coupon')],
+            $couponJoinCondition,
+            [Coupon::KEY_CODE]
+        );
     }
 
     /**
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
index 89ec2b84572fc..cf6301cb31a9c 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
@@ -61,6 +61,7 @@ public function __construct(
     public function loadAttributeOptions()
     {
         $attributes = [
+            'base_subtotal_with_discount' => __('Subtotal (Excl. Tax)'),
             'base_subtotal' => __('Subtotal'),
             'total_qty' => __('Total Items Quantity'),
             'weight' => __('Total Weight'),
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index 5c0f97ae0b08b..ea0221d8f072d 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -182,6 +182,8 @@ protected function _getRules(Address $address = null)
     }
 
     /**
+     * Address id getter.
+     *
      * @param Address $address
      * @return string
      */
@@ -327,21 +329,7 @@ public function processShippingAmount(Address $address)
                     $baseDiscountAmount = $rule->getDiscountAmount();
                     break;
                 case \Magento\SalesRule\Model\Rule::CART_FIXED_ACTION:
-                    $cartRules = $address->getCartFixedRules();
-                    if (!isset($cartRules[$rule->getId()])) {
-                        $cartRules[$rule->getId()] = $rule->getDiscountAmount();
-                    }
-                    if ($cartRules[$rule->getId()] > 0) {
-                        $quoteAmount = $this->priceCurrency->convert($cartRules[$rule->getId()], $quote->getStore());
-                        $discountAmount = min($shippingAmount - $address->getShippingDiscountAmount(), $quoteAmount);
-                        $baseDiscountAmount = min(
-                            $baseShippingAmount - $address->getBaseShippingDiscountAmount(),
-                            $cartRules[$rule->getId()]
-                        );
-                        $cartRules[$rule->getId()] -= $baseDiscountAmount;
-                    }
-
-                    $address->setCartFixedRules($cartRules);
+                    // Shouldn't be proceed according to MAGETWO-96403
                     break;
             }
 
@@ -519,6 +507,8 @@ public function sortItemsByPriority($items, Address $address = null)
     }
 
     /**
+     * Rule total items getter.
+     *
      * @param int $key
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -533,6 +523,8 @@ public function getRuleItemTotalsInfo($key)
     }
 
     /**
+     * Decrease rule items count.
+     *
      * @param int $key
      * @return $this
      */
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
index fbcc871a69b97..ab085dc5ae137 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
@@ -21,26 +21,30 @@
         </annotations>
 
         <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-
             <!--Create category and product-->
             <createData entity="_defaultCategory" stepKey="defaultCategory"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct">
                 <field key="price">200</field>
                 <field key="quantity">500</field>
             </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
+
         <after>
             <!--Delete created data-->
             <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
 
-            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+            <actionGroup ref="deleteProductBySku" stepKey="deleteBundleProduct">
                 <argument name="sku" value="{{BundleProduct.sku}}"/>
             </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters"/>
+
             <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
                 <argument name="ruleName" value="{{PriceRuleWithCondition.name}}"/>
             </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters1"/>
 
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
@@ -57,12 +61,14 @@
         <pressKey selector="{{AdminProductFormSection.productSku}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="enter"/>
 
         <!--Off dynamic price and set value-->
+        <scrollToTopOfPage stepKey="scrollToTopOfThePageToSeePriceTypeElement"/>
         <click  selector="{{AdminProductFormBundleSection.dynamicPrice}}" stepKey="offDynamicPrice"/>
         <fillField selector="{{AdminProductFormBundleSection.priceField}}" userInput="0" stepKey="setProductPrice"/>
 
         <!-- Add category to product -->
         <click selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="dropDownCategories"/>
         <fillField selector="{{AdminProductFormBundleSection.searchForCategory}}" userInput="$$defaultCategory.name$$" stepKey="searchForCategory"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.selectCategory}}" stepKey="waitForElementLoaded"/>
         <click selector="{{AdminProductFormBundleSection.selectCategory}}" stepKey="selectCategory"/>
         <click selector="{{AdminProductFormBundleSection.categoriesLabel}}" stepKey="clickOnCategoriesLabelToCloseOptions"/>
 
@@ -92,7 +98,7 @@
         </actionGroup>
 
         <!--Go to Storefront and add product to cart and checkout from cart-->
-        <amOnPage url="/$$simpleProduct.name$$.html" stepKey="GoToProduct"/>
+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="2" stepKey="setQuantity"/>
         <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="AddProductToCard">
             <argument name="productName" value="$$simpleProduct.name$$"/>
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
index 42448565791c5..e86068946ca78 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
@@ -5,6 +5,13 @@
  */
 namespace Magento\SalesRule\Test\Unit\Model;
 
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Quote\Model\Quote;
+use Magento\SalesRule\Model\Rule;
+use Magento\SalesRule\Model\Validator;
+use Magento\Store\Model\Store;
+use PHPUnit\Framework\MockObject\MockObject;
+
 /**
  * Class ValidatorTest
  * @@SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -17,50 +24,55 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
     protected $helper;
 
     /**
-     * @var \Magento\SalesRule\Model\Validator
+     * @var Validator
      */
     protected $model;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote\Item|MockObject
      */
     protected $item;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote\Address|MockObject
      */
     protected $addressMock;
 
     /**
-     * @var \Magento\SalesRule\Model\RulesApplier|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\RulesApplier|MockObject
      */
     protected $rulesApplier;
 
     /**
-     * @var \Magento\SalesRule\Model\Validator\Pool|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Validator\Pool|MockObject
      */
     protected $validators;
 
     /**
-     * @var \Magento\SalesRule\Model\Utility|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Utility|MockObject
      */
     protected $utility;
 
     /**
-     * @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection|MockObject
      */
     protected $ruleCollection;
 
     /**
-     * @var \Magento\Catalog\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Catalog\Helper\Data|MockObject
      */
     protected $catalogData;
 
     /**
-     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Message\ManagerInterface|MockObject
      */
     protected $messageManager;
 
+    /**
+     * @var PriceCurrencyInterface|MockObject
+     */
+    private $priceCurrency;
+
     protected function setUp()
     {
         $this->helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -74,6 +86,7 @@ protected function setUp()
             ->setMethods(
                 [
                     'getShippingAmountForDiscount',
+                    'getBaseShippingAmountForDiscount',
                     'getQuote',
                     'getCustomAttributesCodes',
                     'setCartFixedRules'
@@ -81,7 +94,7 @@ protected function setUp()
             )
             ->getMock();
 
-        /** @var \Magento\Quote\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+        /** @var \Magento\Quote\Model\Quote\Item\AbstractItem|MockObject $item */
         $this->item = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Item::class,
             ['__wakeup', 'getAddress', 'getParentItemId']
@@ -100,10 +113,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $ruleCollectionFactoryMock = $this->prepareRuleCollectionMock($this->ruleCollection);
+        $this->priceCurrency = $this->getMockBuilder(PriceCurrencyInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        /** @var \Magento\SalesRule\Model\Validator|\PHPUnit_Framework_MockObject_MockObject $validator */
+        /** @var Validator|MockObject $validator */
         $this->model = $this->helper->getObject(
-            \Magento\SalesRule\Model\Validator::class,
+            Validator::class,
             [
                 'context' => $context,
                 'registry' => $registry,
@@ -112,7 +128,8 @@ protected function setUp()
                 'utility' => $this->utility,
                 'rulesApplier' => $this->rulesApplier,
                 'validators' => $this->validators,
-                'messageManager' => $this->messageManager
+                'messageManager' => $this->messageManager,
+                'priceCurrency' => $this->priceCurrency
             ]
         );
         $this->model->setWebsiteId(1);
@@ -131,7 +148,7 @@ protected function setUp()
     }
 
     /**
-     * @return \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\Quote\Model\Quote\Item|MockObject
      */
     protected function getQuoteItemMock()
     {
@@ -145,8 +162,8 @@ protected function getQuoteItemMock()
         $itemSimple = $this->createPartialMock(\Magento\Quote\Model\Quote\Item::class, ['getAddress', '__wakeup']);
         $itemSimple->expects($this->any())->method('getAddress')->will($this->returnValue($this->addressMock));
 
-        /** @var $quote \Magento\Quote\Model\Quote */
-        $quote = $this->createPartialMock(\Magento\Quote\Model\Quote::class, ['getStoreId', '__wakeup']);
+        /** @var $quote Quote */
+        $quote = $this->createPartialMock(Quote::class, ['getStoreId', '__wakeup']);
         $quote->expects($this->any())->method('getStoreId')->will($this->returnValue(1));
 
         $itemData = include $fixturePath . 'quote_item_downloadable.php';
@@ -168,7 +185,7 @@ public function testCanApplyRules()
             $this->model->getCouponCode()
         );
         $item = $this->getQuoteItemMock();
-        $rule = $this->createMock(\Magento\SalesRule\Model\Rule::class);
+        $rule = $this->createMock(Rule::class);
         $actionsCollection = $this->createPartialMock(\Magento\Rule\Model\Action\Collection::class, ['validate']);
         $actionsCollection->expects($this->any())
             ->method('validate')
@@ -278,7 +295,7 @@ public function testApplyRulesThatAppliedRuleIdsAreCollected()
     public function testInit()
     {
         $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Validator::class,
+            Validator::class,
             $this->model->init(
                 $this->model->getWebsiteId(),
                 $this->model->getCustomerGroupId(),
@@ -314,7 +331,7 @@ public function testCanApplyDiscount()
     public function testInitTotalsCanApplyDiscount()
     {
         $rule = $this->createPartialMock(
-            \Magento\SalesRule\Model\Rule::class,
+            Rule::class,
             ['getSimpleAction', 'getActions', 'getId']
         );
         $item1 = $this->getMockForAbstractClass(
@@ -337,7 +354,7 @@ public function testInitTotalsCanApplyDiscount()
 
         $rule->expects($this->any())
             ->method('getSimpleAction')
-            ->willReturn(\Magento\SalesRule\Model\Rule::CART_FIXED_ACTION);
+            ->willReturn(Rule::CART_FIXED_ACTION);
         $iterator = new \ArrayIterator([$rule]);
         $this->ruleCollection->expects($this->once())->method('getIterator')->willReturn($iterator);
         $validator = $this->getMockBuilder(\Magento\Framework\Validator\AbstractValidator::class)
@@ -392,7 +409,7 @@ public function testInitTotalsNoItems()
 
     /**
      * @param $ruleCollection
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
     protected function prepareRuleCollectionMock($ruleCollection)
     {
@@ -427,14 +444,14 @@ public function testProcessShippingAmountNoRules()
             $this->model->getCouponCode()
         );
         $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Validator::class,
+            Validator::class,
             $this->model->processShippingAmount($this->setupAddressMock())
         );
     }
 
     public function testProcessShippingAmountProcessDisabled()
     {
-        $ruleMock = $this->getMockBuilder(\Magento\SalesRule\Model\Rule::class)
+        $ruleMock = $this->getMockBuilder(Rule::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
@@ -448,51 +465,54 @@ public function testProcessShippingAmountProcessDisabled()
             $this->model->getCouponCode()
         );
         $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Validator::class,
+            Validator::class,
             $this->model->processShippingAmount($this->setupAddressMock())
         );
     }
 
     /**
+     * Tests shipping amounts according to rule simple action.
+     *
      * @param string $action
+     * @param int $ruleDiscount
+     * @param int $shippingDiscount
      * @dataProvider dataProviderActions
      */
-    public function testProcessShippingAmountActions($action)
+    public function testProcessShippingAmountActions($action, $ruleDiscount, $shippingDiscount): void
     {
-        $discountAmount = 50;
+        $shippingAmount = 5;
 
-        $ruleMock = $this->getMockBuilder(\Magento\SalesRule\Model\Rule::class)
+        $ruleMock = $this->getMockBuilder(Rule::class)
             ->disableOriginalConstructor()
             ->setMethods(['getApplyToShipping', 'getSimpleAction', 'getDiscountAmount'])
             ->getMock();
-        $ruleMock->expects($this->any())
-            ->method('getApplyToShipping')
+        $ruleMock->method('getApplyToShipping')
             ->willReturn(true);
-        $ruleMock->expects($this->any())
-            ->method('getDiscountAmount')
-            ->willReturn($discountAmount);
-        $ruleMock->expects($this->any())
-            ->method('getSimpleAction')
+        $ruleMock->method('getDiscountAmount')
+            ->willReturn($ruleDiscount);
+        $ruleMock->method('getSimpleAction')
             ->willReturn($action);
 
         $iterator = new \ArrayIterator([$ruleMock]);
-        $this->ruleCollection->expects($this->any())
-            ->method('getIterator')
+        $this->ruleCollection->method('getIterator')
             ->willReturn($iterator);
 
-        $this->utility->expects($this->any())
-            ->method('canProcessRule')
+        $this->utility->method('canProcessRule')
             ->willReturn(true);
 
+        $this->priceCurrency->method('convert')
+            ->willReturn($ruleDiscount);
+
         $this->model->init(
             $this->model->getWebsiteId(),
             $this->model->getCustomerGroupId(),
             $this->model->getCouponCode()
         );
-        $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Validator::class,
-            $this->model->processShippingAmount($this->setupAddressMock(5))
-        );
+
+        $addressMock = $this->setupAddressMock($shippingAmount);
+
+        self::assertInstanceOf(Validator::class, $this->model->processShippingAmount($addressMock));
+        self::assertEquals($shippingDiscount, $addressMock->getShippingDiscountAmount());
     }
 
     /**
@@ -501,44 +521,48 @@ public function testProcessShippingAmountActions($action)
     public static function dataProviderActions()
     {
         return [
-            [\Magento\SalesRule\Model\Rule::TO_PERCENT_ACTION],
-            [\Magento\SalesRule\Model\Rule::BY_PERCENT_ACTION],
-            [\Magento\SalesRule\Model\Rule::TO_FIXED_ACTION],
-            [\Magento\SalesRule\Model\Rule::BY_FIXED_ACTION],
-            [\Magento\SalesRule\Model\Rule::CART_FIXED_ACTION],
+            [Rule::TO_PERCENT_ACTION, 50, 2.5],
+            [Rule::BY_PERCENT_ACTION, 50, 2.5],
+            [Rule::TO_FIXED_ACTION, 5, 0],
+            [Rule::BY_FIXED_ACTION, 5, 5],
+            [Rule::CART_FIXED_ACTION, 5, 0],
         ];
     }
 
     /**
      * @param null|int $shippingAmount
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
     protected function setupAddressMock($shippingAmount = null)
     {
-        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        $storeMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+
+        $quoteMock = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->setMethods(['setAppliedRuleIds', 'getStore'])
             ->getMock();
-        $quoteMock->expects($this->any())
-            ->method('getStore')
+
+        $quoteMock->method('getStore')
             ->willReturn($storeMock);
-        $quoteMock->expects($this->any())
-            ->method('setAppliedRuleIds')
+
+        $quoteMock->method('setAppliedRuleIds')
             ->willReturnSelf();
 
-        $this->addressMock->expects($this->any())
-            ->method('getShippingAmountForDiscount')
+        $this->addressMock->method('getShippingAmountForDiscount')
             ->willReturn($shippingAmount);
-        $this->addressMock->expects($this->any())
-            ->method('getQuote')
+
+        $this->addressMock->method('getBaseShippingAmountForDiscount')
+            ->willReturn($shippingAmount);
+
+        $this->addressMock->method('getQuote')
             ->willReturn($quoteMock);
-        $this->addressMock->expects($this->any())
-            ->method('getCustomAttributesCodes')
+
+        $this->addressMock->method('getCustomAttributesCodes')
             ->willReturn([]);
+
         return $this->addressMock;
     }
 
@@ -546,7 +570,7 @@ public function testReset()
     {
         $this->utility->expects($this->once())
             ->method('resetRoundingDeltas');
-        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+        $quoteMock = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
         $addressMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address::class)
@@ -560,6 +584,6 @@ public function testReset()
             $this->model->getCustomerGroupId(),
             $this->model->getCouponCode()
         );
-        $this->assertInstanceOf(\Magento\SalesRule\Model\Validator::class, $this->model->reset($addressMock));
+        $this->assertInstanceOf(Validator::class, $this->model->reset($addressMock));
     }
 }
diff --git a/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml b/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
index 9b579f47759a6..570eb0bf151f0 100644
--- a/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
+++ b/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
@@ -452,7 +452,7 @@
                 <dataScope>discount_step</dataScope>
             </settings>
         </field>
-        <field name="apply_to_shipping" component="Magento_Ui/js/form/element/single-checkbox-toggle-notice" formElement="checkbox">
+        <field name="apply_to_shipping" component="Magento_SalesRule/js/form/element/apply_to_shipping" formElement="checkbox">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="source" xsi:type="string">sales_rule</item>
diff --git a/app/code/Magento/SalesRule/view/adminhtml/web/js/form/element/apply_to_shipping.js b/app/code/Magento/SalesRule/view/adminhtml/web/js/form/element/apply_to_shipping.js
new file mode 100644
index 0000000000000..dfb3f909345b3
--- /dev/null
+++ b/app/code/Magento/SalesRule/view/adminhtml/web/js/form/element/apply_to_shipping.js
@@ -0,0 +1,37 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/single-checkbox-toggle-notice'
+], function (Checkbox) {
+    'use strict';
+
+    return Checkbox.extend({
+        defaults: {
+            imports: {
+                toggleDisabled: '${ $.parentName }.simple_action:value'
+            }
+        },
+
+        /**
+         * Toggle element disabled state according to simple action value.
+         *
+         * @param {String} action
+         */
+        toggleDisabled: function (action) {
+            switch (action) {
+                case 'cart_fixed':
+                    this.disabled(true);
+                    break;
+                default:
+                    this.disabled(false);
+            }
+
+            if (this.disabled()) {
+                this.checked(false);
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
index 46e794a1954cf..45eee0a4001d1 100644
--- a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
+++ b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
@@ -87,7 +87,7 @@ private function queryByPhrase($phrase)
     {
         $matchQuery = $this->fullTextSelect->getMatchQuery(
             ['synonyms' => 'synonyms'],
-            $phrase,
+            $this->escapePhrase($phrase),
             Fulltext::FULLTEXT_MODE_BOOLEAN
         );
         $query = $this->getConnection()->select()->from(
@@ -97,6 +97,18 @@ private function queryByPhrase($phrase)
         return $this->getConnection()->fetchAll($query);
     }
 
+    /**
+     * Cut trailing plus or minus sign, and @ symbol, using of which causes InnoDB to report a syntax error.
+     *
+     * @see https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html
+     * @param string $phrase
+     * @return string
+     */
+    private function escapePhrase(string $phrase): string
+    {
+        return preg_replace('/@+|[@+-]+$/', '', $phrase);
+    }
+
     /**
      * A private helper function to retrieve matching synonym groups per scope
      *
diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml
new file mode 100644
index 0000000000000..e0b3d4b850bbb
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml
@@ -0,0 +1,30 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Filter by search query and select -->
+    <actionGroup name="searchTermFilterBySearchQuery">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+        </arguments>
+        <click selector="{{AdminCatalogSearchTermIndexSection.resetFilterButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForResetFilter"/>
+        <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResultLoad"/>
+        <checkOption selector="{{AdminCatalogSearchTermIndexSection.searchTermRowCheckboxBySearchQuery(searchQuery)}}" stepKey="checkCheckBox"/>
+    </actionGroup>
+
+    <!-- Delete search term -->
+    <actionGroup name="deleteSearchTerm">
+        <selectOption selector="{{AdminCatalogSearchTermIndexSection.massActions}}" userInput="delete" stepKey="selectDeleteOption"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.submit}}" stepKey="clickSubmitButton"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.okButton}}" stepKey="clickOkButton"/>
+        <waitForElementVisible selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml b/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml
new file mode 100644
index 0000000000000..1518adad01347
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.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="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SearchTerm" type="searchTerm">
+        <data key="query_text" unique="suffix">Query text</data>
+        <data key="store_id">1</data>
+        <data key="redirect" unique="suffix">http://example.com/</data>
+        <data key="display_in_terms">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Search/Test/Mftf/Metadata/search_term-meta.xml b/app/code/Magento/Search/Test/Mftf/Metadata/search_term-meta.xml
new file mode 100644
index 0000000000000..0bd2dc9be4855
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Metadata/search_term-meta.xml
@@ -0,0 +1,17 @@
+<?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="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateSearchTerm" dataType="searchTerm" type="create" auth="adminFormKey" url="/search/term/save/" method="POST">
+        <field key="query_text">string</field>
+        <field key="store_id">integer</field>
+        <field key="redirect">string</field>
+        <field key="display_in_terms">integer</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
index 9e5bde9a2be49..81b025c9554e2 100644
--- a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
@@ -15,5 +15,6 @@
         <element name="asLowAsLabel" type="text" selector=".minimal-price-link > span"/>
         <element name="textArea" type="text" selector="li[class='item']"/>
         <element name="regularPrice" type="text" selector="//span[@class='price-wrapper ']/span[@class='price']"/>
+        <element name="messageSection" type="text" selector="div .message"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
index 2b08e9b4b85ec..3c2909b59c0de 100644
--- a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
@@ -11,5 +11,6 @@
     <section name="StorefrontQuickSearchSection">
         <element name="searchPhrase" type="input" selector="#search"/>
         <element name="searchButton" type="button" selector="button.action.search" timeout="30"/>
+        <element name="searchMiniForm" type="input" selector="#search_mini_form"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml b/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
new file mode 100644
index 0000000000000..67ccb51bf401e
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMassDeleteSearchTermEntityTest">
+        <annotations>
+            <features value="CatalogSearch"/>
+            <stories value="Delete search term"/>
+            <title value="Admin mass delete search term entity test"/>
+            <description value="Admin should be able to Mass Delete Search Term Entity Test"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14767"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create three search term -->
+            <createData entity="SearchTerm" stepKey="createFirstSearchTerm"/>
+            <createData entity="SearchTerm" stepKey="createSecondSearchTerm"/>
+            <createData entity="SearchTerm" stepKey="createThirdSearchTerm"/>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to the catalog search term page -->
+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+
+        <!-- Select all created below search terms -->
+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByFirstSearchQuery">
+            <argument name="searchQuery" value="$$createFirstSearchTerm.query_text$$"/>
+        </actionGroup>
+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterBySecondSearchQuery">
+            <argument name="searchQuery" value="$$createSecondSearchTerm.query_text$$"/>
+        </actionGroup>
+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByThirdSearchQuery">
+            <argument name="searchQuery" value="$$createThirdSearchTerm.query_text$$"/>
+        </actionGroup>
+
+        <!-- Delete created below search terms -->
+        <actionGroup ref="deleteSearchTerm" stepKey="deleteSearchTerms"/>
+
+        <!-- Assert search terms are absent on the search term page -->
+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertFirstSearchTermNotInGrid">
+            <argument name="searchQuery" value="$$createFirstSearchTerm.query_text$$"/>
+        </actionGroup>
+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertSecondSearchTermNotInGrid">
+            <argument name="searchQuery" value="$$createSecondSearchTerm.query_text$$"/>
+        </actionGroup>
+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertThirdSearchTermNotInGrid">
+            <argument name="searchQuery" value="$$createThirdSearchTerm.query_text$$"/>
+        </actionGroup>
+
+        <!-- Go to storefront page -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
+
+        <!-- Verify search term deletion on storefront -->
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForFirstSearchTerm">
+            <argument name="phrase" value="$$createFirstSearchTerm.query_text$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForFirstSearchTerm"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForSecondSearchTerm">
+            <argument name="phrase" value="$$createSecondSearchTerm.query_text$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForSecondSearchTerm"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForThirdSearchTerm">
+            <argument name="phrase" value="$$createThirdSearchTerm.query_text$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForThirdSearchTerm"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
index 9592ab6f57c55..c8e2d356b3ffb 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
@@ -7,10 +7,15 @@
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Sitemap\Controller\Adminhtml\Sitemap;
 use Magento\Store\Model\App\Emulation;
 use Magento\Framework\App\ObjectManager;
 
-class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
+/**
+ * Generate sitemap file
+ */
+class Generate extends Sitemap implements HttpGetActionInterface
 {
     /** @var \Magento\Store\Model\App\Emulation $appEmulation */
     private $appEmulation;
@@ -44,14 +49,7 @@ public function execute()
         // if sitemap record exists
         if ($sitemap->getId()) {
             try {
-                //We need to emulate to get the correct frontend URL for the product images
-                $this->appEmulation->startEnvironmentEmulation(
-                    $sitemap->getStoreId(),
-                    \Magento\Framework\App\Area::AREA_FRONTEND,
-                    true
-                );
                 $sitemap->generateXml();
-
                 $this->messageManager->addSuccessMessage(
                     __('The sitemap "%1" has been generated.', $sitemap->getSitemapFilename())
                 );
@@ -59,8 +57,6 @@ public function execute()
                 $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addExceptionMessage($e, __('We can\'t generate the sitemap right now.'));
-            } finally {
-                $this->appEmulation->stopEnvironmentEmulation();
             }
         } else {
             $this->messageManager->addErrorMessage(__('We can\'t find a sitemap to generate.'));
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index bd7a84f601b77..ce74d738c4bc3 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sitemap\Model;
 
-use Magento\Store\Model\App\Emulation;
 use Magento\Sitemap\Model\EmailNotification as SitemapEmail;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
@@ -57,11 +56,6 @@ class Observer
      */
     private $collectionFactory;
 
-    /**
-     * @var Emulation
-     */
-    private $appEmulation;
-
     /**
      * @var $emailNotification
      */
@@ -72,17 +66,14 @@ class Observer
      * @param ScopeConfigInterface $scopeConfig
      * @param CollectionFactory $collectionFactory
      * @param EmailNotification $emailNotification
-     * @param Emulation $appEmulation
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         CollectionFactory $collectionFactory,
-        SitemapEmail $emailNotification,
-        Emulation $appEmulation
+        SitemapEmail $emailNotification
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->collectionFactory = $collectionFactory;
-        $this->appEmulation = $appEmulation;
         $this->emailNotification = $emailNotification;
     }
 
@@ -114,17 +105,9 @@ public function scheduledGenerateSitemaps()
         foreach ($collection as $sitemap) {
             /* @var $sitemap \Magento\Sitemap\Model\Sitemap */
             try {
-                $this->appEmulation->startEnvironmentEmulation(
-                    $sitemap->getStoreId(),
-                    \Magento\Framework\App\Area::AREA_FRONTEND,
-                    true
-                );
-
                 $sitemap->generateXml();
             } catch (\Exception $e) {
                 $errors[] = $e->getMessage();
-            } finally {
-                $this->appEmulation->stopEnvironmentEmulation();
             }
         }
         if ($errors && $recipient) {
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
index 82024b3b015e5..4d678f5c1cb94 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
@@ -389,6 +389,7 @@ protected function _prepareProduct(array $productRow, $storeId)
      */
     protected function _loadProductImages($product, $storeId)
     {
+        $this->_storeManager->setCurrentStore($storeId);
         /** @var $helper \Magento\Sitemap\Helper\Data */
         $helper = $this->_sitemapData;
         $imageIncludePolicy = $helper->getProductImageIncludePolicy($storeId);
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index d58ff732c81d7..c35e20d997d85 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sitemap\Model;
 
 use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
@@ -15,6 +16,8 @@
 use Magento\Sitemap\Model\ResourceModel\Sitemap as SitemapResource;
 
 /**
+ * Sitemap model.
+ *
  * @method string getSitemapType()
  * @method \Magento\Sitemap\Model\Sitemap setSitemapType(string $value)
  * @method string getSitemapFilename()
@@ -154,12 +157,11 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
     protected $dateTime;
 
     /**
-     * Model cache tag for clear cache in after save and after delete
+     * @inheritdoc
      *
-     * @var string
      * @since 100.2.0
      */
-    protected $_cacheTag = true;
+    protected $_cacheTag = [Value::CACHE_TAG];
 
     /**
      * Item resolver
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
index 5fae54ff3c5d0..09f5418bbd762 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
@@ -118,7 +118,7 @@ public function testScheduledGenerateSitemapsSendsExceptionEmail()
             ->method('getStoreId')
             ->willReturn($storeId);
 
-        $this->sitemapMock->expects($this->at(1))
+        $this->sitemapMock->expects($this->once())
             ->method('generateXml')
             ->willThrowException(new \Exception($exception));
 
@@ -130,17 +130,6 @@ public function testScheduledGenerateSitemapsSendsExceptionEmail()
             )
             ->willReturn('error-recipient@example.com');
 
-        $this->appEmulationMock->expects($this->at(0))
-            ->method('startEnvironmentEmulation')
-            ->with(
-                $storeId,
-                Area::AREA_FRONTEND,
-                true
-            );
-
-        $this->appEmulationMock->expects($this->at(1))
-            ->method('stopEnvironmentEmulation');
-
         $this->observer->scheduledGenerateSitemaps();
     }
 }
diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index ccc3c65491422..19f104c9f3790 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -100,18 +100,24 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      */
     private $eventManager;
 
+    /**
+     * @var \Magento\MessageQueue\Api\PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
      * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
      * @param \Magento\Config\Model\ResourceModel\Config\Data $configDataResource
-     * @param \Magento\Store\Model\Store $store
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param ResourceModel\Store\CollectionFactory $storeListFactory
+     * @param StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @param \Magento\Framework\Event\ManagerInterface|null $eventManager
+     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface|null $pillPut
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -125,13 +131,16 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        \Magento\Framework\Event\ManagerInterface $eventManager = null
+        \Magento\Framework\Event\ManagerInterface $eventManager = null,
+        \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut = null
     ) {
         $this->_configDataResource = $configDataResource;
         $this->_storeListFactory = $storeListFactory;
         $this->_storeManager = $storeManager;
         $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Event\ManagerInterface::class);
+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\MessageQueue\Api\PoisonPillPutInterface::class);
         parent::__construct(
             $context,
             $registry,
@@ -244,6 +253,8 @@ public function getStoreCodes()
     }
 
     /**
+     * Get stores count
+     *
      * @return int
      */
     public function getStoresCount()
@@ -349,6 +360,8 @@ public function isCanDelete()
     }
 
     /**
+     * Get default store id
+     *
      * @return mixed
      */
     public function getDefaultStoreId()
@@ -365,6 +378,8 @@ public function setDefaultStoreId($defaultStoreId)
     }
 
     /**
+     * Get root category id
+     *
      * @return mixed
      */
     public function getRootCategoryId()
@@ -381,6 +396,8 @@ public function setRootCategoryId($rootCategoryId)
     }
 
     /**
+     * Get website id
+     *
      * @return mixed
      */
     public function getWebsiteId()
@@ -397,7 +414,7 @@ public function setWebsiteId($websiteId)
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     public function beforeDelete()
     {
@@ -445,6 +462,7 @@ public function afterSave()
             $this->_storeManager->reinitStores();
             $this->eventManager->dispatch($this->_eventPrefix . '_save', ['group' => $group]);
         });
+        $this->pillPut->put();
         return parent::afterSave();
     }
 
@@ -473,7 +491,7 @@ public function getIdentities()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getName()
     {
@@ -507,7 +525,7 @@ public function setCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getExtensionAttributes()
     {
@@ -515,7 +533,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\GroupExtensionInterface $extensionAttributes
@@ -524,7 +542,7 @@ public function setExtensionAttributes(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.1.0
      */
     public function getScopeType()
@@ -533,7 +551,7 @@ public function getScopeType()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.1.0
      */
     public function getScopeTypeName()
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index c1ad5bdcfc068..b2a515b198b11 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -326,6 +326,11 @@ class Store extends AbstractExtensibleModel implements
      */
     private $eventManager;
 
+    /**
+     * @var \Magento\MessageQueue\Api\PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -352,6 +357,7 @@ class Store extends AbstractExtensibleModel implements
      * @param bool $isCustomEntryPoint
      * @param array $data optional generic object data
      * @param \Magento\Framework\Event\ManagerInterface|null $eventManager
+     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface|null $pillPut
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -380,7 +386,8 @@ public function __construct(
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         $isCustomEntryPoint = false,
         array $data = [],
-        \Magento\Framework\Event\ManagerInterface $eventManager = null
+        \Magento\Framework\Event\ManagerInterface $eventManager = null,
+        \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut = null
     ) {
         $this->_coreFileStorageDatabase = $coreFileStorageDatabase;
         $this->_config = $config;
@@ -401,6 +408,8 @@ public function __construct(
         $this->websiteRepository = $websiteRepository;
         $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Event\ManagerInterface::class);
+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\MessageQueue\Api\PoisonPillPutInterface::class);
         parent::__construct(
             $context,
             $registry,
@@ -1077,6 +1086,7 @@ public function afterSave()
         $this->getResource()->addCommitCallback(function () use ($event, $store) {
             $this->eventManager->dispatch($event, ['store' => $store]);
         });
+        $this->pillPut->put();
         return parent::afterSave();
     }
 
diff --git a/app/code/Magento/Store/Model/Website.php b/app/code/Magento/Store/Model/Website.php
index c9a7d0013fe06..383b36fd63228 100644
--- a/app/code/Magento/Store/Model/Website.php
+++ b/app/code/Magento/Store/Model/Website.php
@@ -159,6 +159,11 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      */
     protected $_currencyFactory;
 
+    /**
+     * @var \Magento\MessageQueue\Api\PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -174,6 +179,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface|null $pillPut
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -190,7 +196,8 @@ public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut = null
     ) {
         parent::__construct(
             $context,
@@ -208,10 +215,12 @@ public function __construct(
         $this->_websiteFactory = $websiteFactory;
         $this->_storeManager = $storeManager;
         $this->_currencyFactory = $currencyFactory;
+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\MessageQueue\Api\PoisonPillPutInterface::class);
     }
 
     /**
-     * init model
+     * Init model
      *
      * @return void
      */
@@ -495,6 +504,8 @@ public function getWebsiteGroupStore()
     }
 
     /**
+     * Get default group id
+     *
      * @return mixed
      */
     public function getDefaultGroupId()
@@ -511,6 +522,8 @@ public function setDefaultGroupId($defaultGroupId)
     }
 
     /**
+     * Get code
+     *
      * @return mixed
      */
     public function getCode()
@@ -543,7 +556,7 @@ public function setName($name)
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     public function beforeDelete()
     {
@@ -581,7 +594,7 @@ public function afterSave()
         if ($this->isObjectNew()) {
             $this->_storeManager->reinitStores();
         }
-
+        $this->pillPut->put();
         return parent::afterSave();
     }
 
@@ -635,8 +648,7 @@ public function getDefaultStore()
     }
 
     /**
-     * Retrieve default stores select object
-     * Select fields website_id, store_id
+     * Retrieve default stores select object, select fields website_id, store_id
      *
      * @param bool $withDefault include/exclude default admin website
      * @return \Magento\Framework\DB\Select
@@ -671,7 +683,7 @@ public function getIdentities()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.1.0
      */
     public function getScopeType()
@@ -680,7 +692,7 @@ public function getScopeType()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.1.0
      */
     public function getScopeTypeName()
@@ -689,7 +701,7 @@ public function getScopeTypeName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getExtensionAttributes()
     {
@@ -697,7 +709,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\WebsiteExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
index 91fe4fccddb91..7f1a63d3db6f2 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
@@ -25,4 +25,21 @@
         <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />
     </actionGroup>
+    <actionGroup name="CreateCustomStore">
+        <arguments>
+            <argument name="website" type="string"/>
+            <argument name="store" type="string"/>
+            <argument name="rootCategory" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
+        <selectOption userInput="{{website}}" selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" stepKey="selectMainWebsite"/>
+        <fillField userInput="{{store}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
+        <fillField userInput="{{store}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
+        <selectOption userInput="{{rootCategory}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
+        <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
+        <see userInput="You saved the store." stepKey="seeSavedMessage"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
index ef8d77c8824ff..ca614ec24138c 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
@@ -36,4 +36,30 @@
         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
         <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabFromCurrentUrl"/>
     </actionGroup>
+
+    <actionGroup name="AssertWebsiteInGrid">
+        <arguments>
+            <argument name="websiteName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillWebsiteField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <seeElement selector="{{AdminStoresGridSection.websiteName(websiteName)}}" stepKey="seeAssertWebsiteInGrid"/>
+    </actionGroup>
+
+    <actionGroup name="AssertWebsiteForm">
+        <arguments>
+            <argument name="websiteName" type="string"/>
+            <argument name="websiteCode" type="string"/>
+        </arguments>
+        <click selector="{{AdminStoresGridSection.websiteName(websiteName)}}" stepKey="clickWebsiteFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitTillWebsiteFormPageIsOpened"/>
+        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabWebsiteIdFromCurrentUrl"/>
+        <seeInCurrentUrl url="/system_store/editWebsite/website_id/{$grabWebsiteIdFromCurrentUrl}" stepKey="seeWebsiteId"/>
+        <seeInField selector="{{AdminNewWebsiteSection.name}}" userInput="{{websiteName}}" stepKey="seeAssertWebsiteName"/>
+        <seeInField selector="{{AdminNewWebsiteSection.code}}" userInput="{{websiteCode}}" stepKey="seeAssertWebsiteCode"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
index 58e1781d69eab..cf2cabdcc2399 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
@@ -26,4 +26,35 @@
         <waitForPageLoad stepKey="waitForSuccessMessage"/>
         <see userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
     </actionGroup>
-</actionGroups>
+    <actionGroup name="DeleteCustomStoreViewBackupEnabledYesActionGroup">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickEditExistingStoreViewRow"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewButtonOnEditStorePage"/>
+        <selectOption userInput="Yes" selector="{{AdminStoreBackupOptionsSection.createBackupSelect}}" stepKey="setCreateDbBackupToYes"/>
+        <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewButtonOnDeleteStorePage"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.title}}" stepKey="waitingForWarningModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreViewDelete"/>
+        <waitForPageLoad stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminStoresGridSection.successMessage}}" userInput="The database was backed up." stepKey="seeAssertDatabaseBackedUpMessage"/>
+        <see selector="{{AdminStoresGridSection.successMessage}}" userInput="You deleted the store view." stepKey="seeAssertSuccessDeleteStoreViewMessage"/>
+    </actionGroup>
+    <actionGroup name="AssertStoreViewNotInGrid">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <see selector="{{AdminStoresGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeAssertStoreViewNotInGridMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
index 58fd0a3f0bc2b..1721e3185402e 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
@@ -19,6 +19,7 @@
         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditWebsitePage"/>
+        <waitForPageLoad stepKey="waitForDeleteStoreGroupSectionLoad" time="30"/>
         <selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
         <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteWebsiteButton"/>
         <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml
index cfb2c7e6347c3..0960dfb47c368 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml
@@ -11,6 +11,7 @@
         <arguments>
             <argument name="website"/>
         </arguments>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
         <click selector="{{AdminMainActionsSection.storeViewDropdown}}" stepKey="clickWebsiteSwitchDropdown"/>
         <waitForElementVisible selector="{{AdminMainActionsSection.websiteByName('Main Website')}}" stepKey="waitForWebsiteAreVisible"/>
         <click selector="{{AdminMainActionsSection.websiteByName(website.name)}}" stepKey="clickWebsiteByName"/>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
index 8e32b819aa954..8a1d830661aad 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
@@ -23,4 +23,33 @@
         <selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
         <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteStoreGroupButtonOnDeleteStorePage"/>
     </actionGroup>
-</actionGroups>
+    <actionGroup name="DeleteCustomStoreBackupEnabledYesActionGroup">
+        <arguments>
+            <argument name="storeGroupName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <see userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="verifyThatCorrectStoreGroupFound"/>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteStoreGroupButtonOnEditStorePage"/>
+        <selectOption userInput="Yes" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
+        <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteStoreGroupButtonOnDeleteStorePage"/>
+        <see selector="{{AdminStoresGridSection.successMessage}}" userInput="The database was backed up." stepKey="seeAssertDatabaseBackedUpMessage"/>
+        <see selector="{{AdminStoresGridSection.successMessage}}" userInput="You deleted the store." stepKey="seeAssertSuccessDeleteStoreGroupMessage"/>
+    </actionGroup>
+    <actionGroup name="AssertStoreNotInGrid">
+        <arguments>
+            <argument name="storeGroupName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <see selector="{{AdminStoresGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeAssertStoreGroupNotInGridMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
index cc6a1fb62ea5f..da3ce02a80f28 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
@@ -13,15 +13,14 @@
         </arguments>
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
         <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterResetButtonClicked" time="10"/>
         <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
         <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton" />
-        <waitForPageLoad stepKey="waitForPageLoadAfterSearch" time="10"/>
         <see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
-
+        <waitForPageLoad stepKey="waitForPageLoadAfterWebsiteSelected" time="30"/>
         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditStorePage"/>
         <selectOption userInput="No" selector="{{AdminStoresDeleteWebsiteSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
         <click selector="{{AdminStoresDeleteWebsiteSection.deleteButton}}" stepKey="clickDeleteButtonOnDeleteWebsitePage"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the website." stepKey="checkSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreFrontProductValidationActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreFrontProductValidationActionGroup.xml
new file mode 100644
index 0000000000000..f11394c643ad7
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreFrontProductValidationActionGroup.xml
@@ -0,0 +1,21 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StoreFrontProductValidationActionGroup">
+        <arguments>
+            <argument name="product" type="entity"/>
+        </arguments>
+        <amOnPage url="{{StorefrontProductPage.url(product.urlKey)}}" stepKey="seeProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{product.name}}" stepKey="seeProductInStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{product.sku}}" stepKey="seeCorrectSku"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{product.price}}" stepKey="seeCorrectPrice"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
index efd3a8c6b8cad..d30fc1e5a2a35 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
@@ -17,4 +17,9 @@
         <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.code)}}" stepKey="clickSelectStoreView"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
+
+    <actionGroup name="StorefrontSwitchDefaultStoreViewActionGroup" extends="StorefrontSwitchStoreViewActionGroup">
+        <remove keyForRemoval="clickSelectStoreView"/>
+        <click selector="{{StorefrontHeaderSection.storeViewOption('default')}}" stepKey="clickSelectDefaultStoreView" after="waitForStoreViewDropdown"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml b/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
index f636336524f01..ae605256a2819 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
@@ -23,4 +23,8 @@
         <data key="name" unique="suffix">Custom Website</data>
         <data key="code" unique="suffix">custom_website</data>
     </entity>
-</entities>
+    <entity name="updateCustomWebsite" extends="customWebsite">
+        <data key="name" unique="suffix">website_upd</data>
+        <data key="code" unique="suffix">code_upd</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
index fea7dc07c8287..1bdf7f0c22c4e 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
@@ -8,6 +8,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminStoresDeleteWebsiteSection">
         <element name="createDbBackup" type="select" selector="#store_create_backup"/>
-        <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
+        <element name="deleteButton" type="button" selector="#delete" timeout="120"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index b02e9adaed45e..d7006fd01b2ff 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -21,5 +21,8 @@
         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
         <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
         <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
+        <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
+        <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
+        <element name="websiteName" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
      </section>
-</sections>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
index 8004b750a4d1f..416808e58e6b3 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -13,5 +13,6 @@
         <element name="storeViewOption" type="button" selector="li.view-{{var1}}>a" parameterized="true"/>
         <element name="storeView" type="button" selector="//div[@class='actions dropdown options switcher-options active']//ul//li//a[contains(text(),'{{var}}')]" parameterized="true"/>
         <element name="storeViewList" type="button" selector="//li[contains(.,'{{storeViewName}}')]//a" parameterized="true"/>
+        <element name="storeViewName" type="text" selector="//*[@id='switcher-language-trigger']//span"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
new file mode 100644
index 0000000000000..1608d0b7b5a25
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateWebsiteTest">
+        <annotations>
+            <stories value="Create Website"/>
+            <title value="Create Website and Verify Store Form"/>
+            <description value="Test log in to Stores and Create Website Test"/>
+            <testCaseId value="MC-14302"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create website and AssertWebsiteSuccessSaveMessage-->
+        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+            <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+            <argument name="websiteCode" value="{{customWebsite.code}}"/>
+        </actionGroup>
+
+        <!--Search created website in grid and verify AssertWebsiteInGrid-->
+        <actionGroup ref="AssertWebsiteInGrid" stepKey="seeWebsiteInGrid">
+            <argument name="websiteName" value="{{customWebsite.name}}"/>
+        </actionGroup>
+
+        <!--Verify website name and websitecode on website form (AssertWebsiteForm and AssertWebsiteOnStoreForm)-->
+        <actionGroup ref="AssertWebsiteForm" stepKey="seeWebsiteForm">
+            <argument name="websiteName" value="{{customWebsite.name}}"/>
+            <argument name="websiteCode" value="{{customWebsite.code}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreGroupTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreGroupTest.xml
new file mode 100644
index 0000000000000..652537f7864cd
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreGroupTest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteStoreGroupTest">
+        <annotations>
+            <stories value="Delete Store Group"/>
+            <title value="Delete store group and save backup"/>
+            <description value="Test log in to Stores and Delete Store Group Test"/>
+            <testCaseId value="MC-14297"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <magentoCLI command="config:set system/backup/functionality_enabled 1" stepKey="setEnableBackupToYes"/>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create custom store group-->
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewCustomStoreGroup">
+                <argument name="website" value="{{_defaultWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStore.name}}"/>
+                <argument name="storeGroupCode" value="{{customStore.code}}"/>
+            </actionGroup>
+        </before>
+        <after>
+            <magentoCLI command="config:set system/backup/functionality_enabled 0" stepKey="setEnableBackupToNo"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Delete custom store group and verify AssertStoreGroupSuccessDeleteAndBackupMessages-->
+        <actionGroup ref="DeleteCustomStoreBackupEnabledYesActionGroup" stepKey="deleteCustomStoreGroup">
+            <argument name="storeGroupName" value="{{customStore.name}}"/>
+        </actionGroup>
+
+        <!--Verify deleted Store group is not present in grid and verify AssertStoreGroupNotInGrid message-->
+        <actionGroup ref="AssertStoreNotInGrid" stepKey="verifyDeletedStoreGroupNotInGrid">
+            <argument name="storeGroupName" value="{{customStore.name}}"/>
+        </actionGroup>
+
+        <!--Go to backup index page and verify AssertBackupInGrid-->
+        <amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupIndexPage"/>
+        <waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{WebSetupWizardBackup.name}}" stepKey="seeBackupInGrid"/>
+        <!--Delete database backup-->
+        <actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
+            <argument name="backup" value="WebSetupWizardBackup"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreViewTest.xml
new file mode 100644
index 0000000000000..fc1dcb5ee1a24
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreViewTest.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteStoreViewTest">
+        <annotations>
+            <stories value="Delete Store View"/>
+            <title value="Delete Store View and Save Backup"/>
+            <description value="Test log in to Stores and Delete Store View"/>
+            <testCaseId value="MC-14303"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set system/backup/functionality_enabled 1" stepKey="setEnableBackupToYes"/>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create custom store view-->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
+                <argument name="StoreGroup" value="_defaultStoreGroup"/>
+                <argument name="customStore" value="storeViewData"/>
+            </actionGroup>
+        </before>
+        <after>
+            <magentoCLI command="config:set system/backup/functionality_enabled 0" stepKey="setEnableBackupToNo"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Delete custom store view and verify AssertStoreSuccessDeleteMessage And BackupMessage-->
+        <actionGroup ref="DeleteCustomStoreViewBackupEnabledYesActionGroup" stepKey="deleteCustomStoreView">
+            <argument name="storeViewName" value="{{storeViewData.name}}"/>
+        </actionGroup>
+
+        <!--Verify deleted store view not present in grid and verify AssertStoreNotInGrid Message-->
+        <actionGroup ref="AssertStoreViewNotInGrid" stepKey="verifyDeletedStoreViewNotInGrid">
+            <argument name="storeViewName" value="{{storeViewData.name}}"/>
+        </actionGroup>
+
+        <!--Go to backup index page and verify AssertBackupInGrid-->
+        <amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupIndexPage"/>
+        <waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{WebSetupWizardBackup.name}}" stepKey="seeBackupInGrid"/>
+        <!--Delete database backup-->
+        <actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
+            <argument name="backup" value="WebSetupWizardBackup"/>
+        </actionGroup>
+
+        <!--Go to storefront and verify AssertStoreNotOnFrontend-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
+        <dontSee selector="{{StorefrontHeaderSection.storeViewList(storeViewData.name)}}" stepKey="dontSeeAssertStoreViewNameOnStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateWebsiteTest.xml
new file mode 100644
index 0000000000000..6b666126569ae
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateWebsiteTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateWebsiteTest">
+        <annotations>
+            <stories value="Update Website"/>
+            <title value="Update Website and Verify Store Form"/>
+            <description value="Test log in to Stores and Update Website Test"/>
+            <testCaseId value="MC-14301"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create website-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{updateCustomWebsite.name}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Search created custom website in grid-->
+        <actionGroup ref="AssertWebsiteInGrid" stepKey="seeWebsiteInGrid">
+            <argument name="websiteName" value="{{customWebsite.name}}"/>
+        </actionGroup>
+        <click selector="{{AdminStoresGridSection.websiteName(customWebsite.name)}}" stepKey="clickWebsiteFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitForWebsiteFormPageToOpen"/>
+        <!--Update website name and website code as per data created and verify AssertWebsiteSuccessSaveMessage-->
+        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+            <argument name="newWebsiteName" value="{{updateCustomWebsite.name}}"/>
+            <argument name="websiteCode" value="{{updateCustomWebsite.code}}"/>
+        </actionGroup>
+
+        <!--Search updated custom website(from above step) in grid and verify AssertWebsiteInGrid-->
+        <actionGroup ref="AssertWebsiteInGrid" stepKey="seeUpdatedWebsiteInGrid">
+            <argument name="websiteName" value="{{updateCustomWebsite.name}}"/>
+        </actionGroup>
+
+        <!--Verify updated website name and updated websitecode on website form (AssertWebsiteForm and AssertWebsiteOnStoreForm)-->
+        <actionGroup ref="AssertWebsiteForm" stepKey="seeUpdatedWebsiteForm">
+            <argument name="websiteName" value="{{updateCustomWebsite.name}}"/>
+            <argument name="websiteCode" value="{{updateCustomWebsite.code}}"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index ebaa32b95f48b..da408f105ccb6 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -7,6 +7,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
+        "magento/module-message-queue": "*",
         "magento/module-catalog": "*",
         "magento/module-config": "*",
         "magento/module-directory": "*",
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index a18e03ad52a9e..424d691de5f11 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -924,7 +924,8 @@ define([
                 $productPrice = $product.find(this.options.selectorProductPrice),
                 options = _.object(_.keys($widget.optionsMap), {}),
                 result,
-                tierPriceHtml;
+                tierPriceHtml,
+                isShow;
 
             $widget.element.find('.' + $widget.options.classes.attributeClass + '[option-selected]').each(function () {
                 var attributeId = $(this).attr('attribute-id');
@@ -941,11 +942,9 @@ define([
                 }
             );
 
-            if (typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount) {
-                $(this.options.slyOldPriceSelector).show();
-            } else {
-                $(this.options.slyOldPriceSelector).hide();
-            }
+            isShow = typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount;
+
+            $product.find(this.options.slyOldPriceSelector)[isShow ? 'show' : 'hide']();
 
             if (typeof result != 'undefined' && result.tierPrices.length) {
                 if (this.options.tierPriceTemplate) {
@@ -1239,6 +1238,11 @@ define([
 
                 if (!_.isUndefined(gallery)) {
                     gallery.updateData(imagesToUpdate);
+                } else {
+                    context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
+                        loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
+                        loadedGallery.updateData(imagesToUpdate);
+                    }.bind(this));
                 }
 
                 if (isInitial) {
@@ -1249,6 +1253,7 @@ define([
                         dataMergeStrategy: this.options.gallerySwitchStrategy
                     });
                 }
+
             } else if (justAnImage && justAnImage.img) {
                 context.find('.product-image-photo').attr('src', justAnImage.img);
             }
diff --git a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
index 87f65ef311ac2..208833733ae3f 100644
--- a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
@@ -6,6 +6,10 @@
 
 namespace Magento\Tax\Plugin\Checkout\CustomerData;
 
+/**
+ * Process quote items price, considering tax configuration.
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class Cart
 {
     /**
@@ -68,6 +72,16 @@ public function afterGetSectionData(\Magento\Checkout\CustomerData\Cart $subject
                     $this->itemPriceRenderer->setItem($item);
                     $this->itemPriceRenderer->setTemplate('checkout/cart/item/price/sidebar.phtml');
                     $result['items'][$key]['product_price']=$this->itemPriceRenderer->toHtml();
+                    if ($this->itemPriceRenderer->displayPriceExclTax()) {
+                        $result['items'][$key]['product_price_value'] = $item->getCalculationPrice();
+                    } elseif ($this->itemPriceRenderer->displayPriceInclTax()) {
+                        $result['items'][$key]['product_price_value'] = $item->getPriceInclTax();
+                    } elseif ($this->itemPriceRenderer->displayBothPrices()) {
+                        //unset product price value in case price already has been set as scalar value.
+                        unset($result['items'][$key]['product_price_value']);
+                        $result['items'][$key]['product_price_value']['incl_tax'] = $item->getPriceInclTax();
+                        $result['items'][$key]['product_price_value']['excl_tax'] = $item->getCalculationPrice();
+                    }
                 }
             }
         }
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml
index 4741898b0ab86..628d189823a52 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml
@@ -136,9 +136,8 @@
         <waitForPageLoad stepKey="waitForInvoicePageOpened"/>
 
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForInvoiceSaved"/>
 
-        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction" after="waitForInvoiceSaved"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
         <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl" after="clickShipAction"/>
         <!--Submit Shipment-->
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment" after="seeOrderShipmentUrl"/>
diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
index 096f8359fadd3..3b46b0f9e258c 100644
--- a/app/code/Magento/Tax/etc/di.xml
+++ b/app/code/Magento/Tax/etc/di.xml
@@ -143,6 +143,7 @@
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
+                <item name="code" xsi:type="string">main_table.code</item>
                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>
@@ -154,6 +155,7 @@
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
+                <item name="code" xsi:type="string">main_table.code</item>
                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index b37628e54aa30..511fe30f79dcd 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -22,6 +22,8 @@
 use Magento\Theme\Model\Design\Config\FileUploader\FileProcessor;
 
 /**
+ * File Backend
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class File extends BackendFile
@@ -88,36 +90,29 @@ public function beforeSave()
     {
         $values = $this->getValue();
         $value = reset($values) ?: [];
-        if (!isset($value['file'])) {
+
+        // Need to check name when it is uploaded in the media gallary
+        $file = $value['file'] ?? $value['name'] ?? null;
+        if (!isset($file)) {
             throw new LocalizedException(
                 __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
             );
         }
         if (isset($value['exists'])) {
-            $this->setValue($value['file']);
+            $this->setValue($file);
             return $this;
         }
 
-        $filename = basename($value['file']);
-        $result = $this->_mediaDirectory->copyFile(
-            $this->getTmpMediaPath($filename),
-            $this->_getUploadDir() . '/' . $filename
-        );
-        if ($result) {
-            $this->_mediaDirectory->delete($this->getTmpMediaPath($filename));
-            if ($this->_addWhetherScopeInfo()) {
-                $filename = $this->_prependScopeInfo($filename);
-            }
-            $this->setValue($filename);
-        } else {
-            $this->unsValue();
-        }
+        $this->updateMediaDirectory(basename($file), $value['url']);
 
         return $this;
     }
 
     /**
-     * @return array
+     * After Load
+     *
+     * @return File
+     * @throws LocalizedException
      */
     public function afterLoad()
     {
@@ -166,6 +161,8 @@ protected function getUploadDirPath($uploadDir)
     }
 
     /**
+     * Get Value
+     *
      * @return array
      */
     public function getValue()
@@ -231,4 +228,49 @@ private function getMime()
         }
         return $this->mime;
     }
+
+    /**
+     * Get Relative Media Path
+     *
+     * @param string $path
+     * @return string
+     */
+    private function getRelativeMediaPath(string $path): string
+    {
+        return str_replace('/pub/media/', '', $path);
+    }
+
+    /**
+     * Move file to the correct media directory
+     *
+     * @param string $filename
+     * @param string $url
+     * @throws LocalizedException
+     */
+    private function updateMediaDirectory(string $filename, string $url)
+    {
+        $relativeMediaPath = $this->getRelativeMediaPath($url);
+        $tmpMediaPath = $this->getTmpMediaPath($filename);
+        $mediaPath = $this->_mediaDirectory->isFile($relativeMediaPath) ? $relativeMediaPath : $tmpMediaPath;
+        $destinationMediaPath = $this->_getUploadDir() . '/' . $filename;
+
+        $result = $mediaPath === $destinationMediaPath;
+        if (!$result) {
+            $result = $this->_mediaDirectory->copyFile(
+                $mediaPath,
+                $destinationMediaPath
+            );
+        }
+        if ($result) {
+            if ($mediaPath === $tmpMediaPath) {
+                $this->_mediaDirectory->delete($mediaPath);
+            }
+            if ($this->_addWhetherScopeInfo()) {
+                $filename = $this->_prependScopeInfo($filename);
+            }
+            $this->setValue($filename);
+        } else {
+            $this->unsValue();
+        }
+    }
 }
diff --git a/app/code/Magento/Theme/Test/Mftf/ActionGroup/NavigateToFaviconMediaFolderActionGroup.xml b/app/code/Magento/Theme/Test/Mftf/ActionGroup/NavigateToFaviconMediaFolderActionGroup.xml
new file mode 100644
index 0000000000000..6b98686574321
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/ActionGroup/NavigateToFaviconMediaFolderActionGroup.xml
@@ -0,0 +1,23 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="NavigateToFaviconMediaFolderActionGroup">
+        <arguments>
+            <argument name="StoreFolder" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickArrowIfClosed" visible="true"/>
+        <waitForElement selector="{{AdminDesignConfigSection.faviconArrow}}" stepKey="waitForFaviconFolder"/>
+        <conditionalClick selector="{{AdminDesignConfigSection.faviconArrow}}" dependentSelector="{{AdminDesignConfigSection.checkIfFaviconArrowExpand}}" stepKey="clickFaviconArrowIfClosed" visible="true"/>
+        <waitForElement selector="{{AdminDesignConfigSection.storesArrow}}" stepKey="waitForStoresFolder"/>
+        <conditionalClick selector="{{AdminDesignConfigSection.storesArrow}}" dependentSelector="{{AdminDesignConfigSection.checkIfStoresArrowExpand}}" stepKey="clickStoresArrowIfClosed" visible="true"/>
+        <waitForElement selector="{{StoreFolder}}" stepKey="waitForStoreFolder"/>
+        <click selector="{{StoreFolder}}" stepKey="clickOnCreatedFolder"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
index e90548a7c94e9..c2652f33f7606 100644
--- a/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
@@ -14,10 +14,22 @@
         <element name="watermarkSection" type="text" selector="[data-index='watermark'] .admin__fieldset-wrapper-content"/>
         <element name="imageUploadInputByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//input" parameterized="true"/>
         <element name="imageUploadPreviewByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader-preview')]//img" parameterized="true"/>
+        <element name="addSelectedFromMediaGallery" type="input" selector="//button[contains(@title,'Add Selected')]"/>
+        <element name="htmlHeaderSection" type="text" selector="[data-index='head']"/>
+        <element name="selectFromGalleryByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//label[contains(text(), 'Select from Gallery')]" parameterized="true"/>
+        <element name="imageUploadFromMediaGallery" type="input" selector="//input[contains(@class,'fileupload')]" />
+        <element name="saveConfiguration" type="input" selector="//button[contains(@title, 'Save Configuration')]" />
+        <element name="successNotification" type="text" selector="//div[contains(@data-ui-id, 'messages-message-success')]" />
+        <element name="useDefaultByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//span[contains(text(), 'Use Default Value')]" parameterized="true" />
         <element name="logoSectionHeader" type="text" selector="[data-index='email']"/>
         <element name="logoSection" type="text" selector="[data-index='email'] .admin__fieldset-wrapper-content"/>
         <element name="logoUpload" type ="input" selector="[name='email_logo']" />
         <element name="logoWrapperOpen" type ="text" selector="[data-index='email'] [data-state-collapsible ='closed']"/>
         <element name="logoPreview" type ="text" selector="[alt ='magento-logo.png']"/>
+        <element name="faviconArrow" type="button" selector="#ZmF2aWNvbg-- > .jstree-icon" />
+        <element name="checkIfFaviconArrowExpand" type="button" selector="//li[@id='ZmF2aWNvbg--' and contains(@class,'jstree-closed')]" />
+        <element name="storesArrow" type="button" selector="#ZmF2aWNvbi9zdG9yZXM- > .jstree-icon" />
+        <element name="checkIfStoresArrowExpand" type="button" selector="//li[@id='ZmF2aWNvbi9zdG9yZXM-' and contains(@class,'jstree-closed')]" />
+        <element name="storeLink" type="button" selector="#ZmF2aWNvbi9zdG9yZXMvMQ-- > a"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
new file mode 100644
index 0000000000000..f46328ac151b1
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDesignConfigMediaGalleryImageUploadTest">
+        <annotations>
+            <features value="Content"/>
+            <stories value="Content"/>
+            <title value="MC-5784: Image fields using imageUploader UIComponent cannot use gallery image"/>
+            <description value="Admin should be able to use Image Uploader to add Gallery Images"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13832"/>
+            <group value="Content"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <!--Edit Store View-->
+        <comment userInput="Edit Store View" stepKey="editStoreViewComment"/>
+        <amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
+        <waitForPageLoad stepKey="waitForPageload1"/>
+        <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
+        <waitForPageLoad stepKey="waitForPageload2"/>
+        <scrollTo selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="scrollToHtmlHeadSection"/>
+        <click selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="openHtmlHeadSection"/>
+        <!--Upload Image-->
+        <comment userInput="Upload Image" stepKey="uploadImageComment"/>
+        <click selector="{{AdminDesignConfigSection.selectFromGalleryByFieldsetName('Head')}}" stepKey="openMediaGallery"/>
+        <actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="verifyMediaGalleryStorageBtn"/>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="attachImage" stepKey="selectImageFromMediaStorage">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="saveImage" stepKey="insertImage"/>
+        <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification"/>
+        <waitForPageLoad stepKey="waitForPageloadSuccess"/>
+        <!--Edit Store View-->
+        <comment userInput="Edit Store View" stepKey="editStoreViewComment2"/>
+        <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView2"/>
+        <waitForPageLoad stepKey="waitForPageload3"/>
+        <scrollTo selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="scrollToHtmlHeadSection2"/>
+        <click selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="openHtmlHeadSection2"/>
+        <!--Save Default Configuration-->
+        <comment userInput="Save Default Configuration" stepKey="saveDefaultConfigurationComment"/>
+        <click selector="{{AdminDesignConfigSection.useDefaultByFieldsetName('Head')}}" stepKey="clickUseDefault"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="waitForWrapperToClose2"/>
+        <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration2"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification2"/>
+        <waitForPageLoad stepKey="waitForPageloadSuccess2"/>
+        <!--Delete Image: will be in both root and favicon-->
+        <comment userInput="Delete Image" stepKey="deleteImageComment"/>
+        <actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder2">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToFaviconMediaFolderActionGroup" stepKey="navigateToFolder3">
+            <argument name="StoreFolder" value="{{AdminDesignConfigSection.storeLink}}"/>
+        </actionGroup>
+        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage2">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
index f74282afd32a6..b7266779d3a35 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
@@ -1970,7 +1970,7 @@
 					node.appendChild(dom.doc.createTextNode(invisibleChar));
 					node = node.firstChild;
 
-					// Insert caret container after the formated node
+					// Insert caret container after the formatted node
 					dom.insertAfter(caretContainer, formatNode);
 
 					// Move selection to text node
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
index 2d9d859caa6fa..60dd358414be1 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
@@ -15796,7 +15796,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					node.appendChild(dom.doc.createTextNode(invisibleChar));
 					node = node.firstChild;
 
-					// Insert caret container after the formated node
+					// Insert caret container after the formatted node
 					dom.insertAfter(caretContainer, formatNode);
 
 					// Move selection to text node
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
index aaa207da3e4a9..ed0b7cb0e50a2 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
@@ -16646,7 +16646,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					node.appendChild(dom.doc.createTextNode(invisibleChar));
 					node = node.firstChild;
 
-					// Insert caret container after the formated node
+					// Insert caret container after the formatted node
 					dom.insertAfter(caretContainer, formatNode);
 
 					// Move selection to text node
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
index 8448152ed5d2f..1c53062dd9690 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
@@ -16620,7 +16620,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					node.appendChild(dom.doc.createTextNode(invisibleChar));
 					node = node.firstChild;
 
-					// Insert caret container after the formated node
+					// Insert caret container after the formatted node
 					dom.insertAfter(caretContainer, formatNode);
 
 					// Move selection to text node
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index b983e56b8aee2..b06c655939b1c 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -86,6 +86,18 @@ public function execute()
 
                 $contentType = $this->contentTypeResolver->resolve($component->getContext());
                 $this->getResponse()->setHeader('Content-Type', $contentType, true);
+            } else {
+                /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+                $resultJson = $this->resultJsonFactory->create();
+                $resultJson->setStatusHeader(
+                    \Zend\Http\Response::STATUS_CODE_403,
+                    \Zend\Http\AbstractMessage::VERSION_11,
+                    'Forbidden'
+                );
+                return $resultJson->setData([
+                        'error' => $this->escaper->escapeHtml('Forbidden'),
+                        'errorcode' => 403
+                ]);
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->logger->critical($e);
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
index 75d445f1ee04e..3d4efa13ce3a0 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
@@ -12,5 +12,6 @@
         <element name="successMessage" type="text" selector=".message-success"/>
         <element name="errorMessage" type="text" selector=".message.message-error.error"/>
         <element name="warningMessage" type="text" selector=".message-warning"/>
+        <element name="noticeMessage" type="text" selector=".message-notice"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
index 05b35fb017b4b..2bba8686490b6 100644
--- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
@@ -3,12 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Test\Unit\Controller\Adminhtml\Index;
 
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Escaper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Controller\Adminhtml\Index\Render;
 use Magento\Ui\Model\UiComponentTypeResolver;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Zend\Http\AbstractMessage;
+use Zend\Http\Response;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -97,6 +102,11 @@ class RenderTest extends \PHPUnit\Framework\TestCase
      */
     private $loggerMock;
 
+    /**
+     * @var Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     protected function setUp()
     {
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
@@ -170,6 +180,10 @@ protected function setUp()
         $this->uiComponentTypeResolverMock = $this->getMockBuilder(UiComponentTypeResolver::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->escaperMock = $this->createMock(Escaper::class);
+        $this->escaperMock->expects($this->any())
+            ->method('escapeHtml')
+            ->willReturnArgument(0);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
@@ -181,6 +195,7 @@ protected function setUp()
                 'contentTypeResolver' => $this->uiComponentTypeResolverMock,
                 'resultJsonFactory' => $this->resultJsonFactoryMock,
                 'logger' => $this->loggerMock,
+                'escaper' => $this->escaperMock,
             ]
         );
     }
@@ -201,7 +216,7 @@ public function testExecuteAjaxRequestException()
             ->method('appendBody')
             ->willThrowException(new \Exception('exception'));
 
-        $jsonResultMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
+        $jsonResultMock = $this->getMockBuilder(Json::class)
             ->disableOriginalConstructor()
             ->setMethods(['setData'])
             ->getMock();
@@ -290,6 +305,34 @@ public function testExecuteAjaxRequestWithoutPermissions(array $dataProviderConf
         $name = 'test-name';
         $renderedData = '<html>data</html>';
 
+        if (false === $isAllowed) {
+            $jsonResultMock = $this->getMockBuilder(Json::class)
+                ->disableOriginalConstructor()
+                ->setMethods(['setStatusHeader', 'setData'])
+                ->getMock();
+
+            $jsonResultMock->expects($this->at(0))
+                ->method('setStatusHeader')
+                ->with(
+                    Response::STATUS_CODE_403,
+                    AbstractMessage::VERSION_11,
+                    'Forbidden'
+                )
+                ->willReturnSelf();
+
+            $jsonResultMock->expects($this->at(1))
+                ->method('setData')
+                ->with([
+                    'error' => 'Forbidden',
+                    'errorcode' => 403
+                ])
+                ->willReturnSelf();
+
+            $this->resultJsonFactoryMock->expects($this->any())
+                ->method('create')
+                ->willReturn($jsonResultMock);
+        }
+
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->with('namespace')
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
index 1d52fc78d7a85..cbbfbdb127ad7 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
@@ -543,6 +543,7 @@ define([
                     data = this.createHeaderTemplate(cell.config);
                     cell.config.labelVisible = false;
                     _.extend(data, {
+                        defaultLabelVisible: data.visible(),
                         label: cell.config.label,
                         name: cell.name,
                         required: !!cell.config.validation,
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
index 3987507ece54f..9a9d478904775 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
@@ -245,7 +245,7 @@ define([
                 label = _.findWhere(this.parentComponent().labels(), {
                     name: index
                 });
-                label.visible() !== state ? label.visible(state) : false;
+                label.defaultLabelVisible && label.visible(state);
             } else {
                 elems[curElem].visible(state);
             }
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/button.js b/app/code/Magento/Ui/view/base/web/js/form/components/button.js
index df85af5824d92..bfc2eb2b8852b 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/button.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/button.js
@@ -45,7 +45,8 @@ define([
                 .observe([
                     'visible',
                     'disabled',
-                    'title'
+                    'title',
+                    'childError'
                 ]);
         },
 
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
index 1b6dd9f1c57ec..0eaacdc32567b 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
@@ -20,6 +20,26 @@ define([
             }
         },
 
+        /**
+         * Initializes observable properties of instance
+         *
+         * @returns {Abstract} Chainable.
+         */
+        initObservable: function () {
+            this._super();
+
+            /**
+             * equalityComparer function
+             *
+             * @returns boolean.
+             */
+            this.value.equalityComparer = function (oldValue, newValue) {
+                return !oldValue && !newValue || oldValue === newValue;
+            };
+
+            return this;
+        },
+
         /**
          * @param {String} value
          */
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
index be8fd2ce9fcef..8ebbf88775b86 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
@@ -48,6 +48,10 @@ define([
                 params :
                 [params];
 
+            if (typeof message === 'function') {
+                message = message.call(rule);
+            }
+
             message = params.reduce(function (msg, param, idx) {
                 return msg.replace(new RegExp('\\{' + idx + '\\}', 'g'), param);
             }, message);
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
index 1a21e1b2f1c71..6da4f82fa8b9e 100644
--- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
+++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
@@ -41,7 +41,7 @@
                     <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                     <td if="elem.template"
                         css="$parent.setClasses(elem)"
-                        visible="elem.visible"
+                        visible="elem.visible() && elem.formElement !== 'hidden'"
                         disable="elem.disabled"
                         template="elem.template"/>
                     <!-- /ko -->
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
index d0b12549bd66d..e5d73a62b329e 100644
--- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
+++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
@@ -58,7 +58,7 @@
 
                     <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                     <td if="elem.template"
-                        visible="elem.visible"
+                        visible="elem.visible() && elem.formElement !== 'hidden'"
                         disable="elem.disabled"
                         css="$parent.setClasses(elem)"
                         template="elem.template"
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/button.html b/app/code/Magento/Ui/view/base/web/templates/form/element/button.html
index a8b6c3a858956..766df35f5764b 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/button.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/button.html
@@ -11,3 +11,15 @@
         attr="'data-index': index">
     <span text="title"/>
 </button>
+
+<if args="childError">
+    <strong class="_error">
+        <span class="admin__page-nav-item-messages">
+            <span class="admin__page-nav-item-message _error">
+                <span class="admin__page-nav-item-message-icon"></span>
+                <span class="admin__page-nav-item-message-tooltip"
+                      data-bind="i18n: 'This element contains invalid data. Please resolve this before saving.'">This element contains invalid data. Please resolve this before saving.</span>
+            </span>
+        </span>
+    </strong>
+</if>
diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index d8ceb16d71fdc..2ac1bdd712114 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -105,42 +105,18 @@ protected function doFindOneByData(array $data)
             $result = null;
 
             $requestPath = $data[UrlRewrite::REQUEST_PATH];
-
-            $data[UrlRewrite::REQUEST_PATH] = [
+            $decodedRequestPath = urldecode($requestPath);
+            $data[UrlRewrite::REQUEST_PATH] = array_unique([
                 rtrim($requestPath, '/'),
                 rtrim($requestPath, '/') . '/',
-            ];
+                rtrim($decodedRequestPath, '/'),
+                rtrim($decodedRequestPath, '/') . '/',
+            ]);
 
             $resultsFromDb = $this->connection->fetchAll($this->prepareSelect($data));
-
-            if (count($resultsFromDb) === 1) {
-                $resultFromDb = current($resultsFromDb);
-                $redirectTypes = [OptionProvider::TEMPORARY, OptionProvider::PERMANENT];
-
-                // If request path matches the DB value or it's redirect - we can return result from DB
-                $canReturnResultFromDb = ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath
-                    || in_array((int)$resultFromDb[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true));
-
-                // Otherwise return 301 redirect to request path from DB results
-                $result = $canReturnResultFromDb ? $resultFromDb : [
-                    UrlRewrite::ENTITY_TYPE => 'custom',
-                    UrlRewrite::ENTITY_ID => '0',
-                    UrlRewrite::REQUEST_PATH => $requestPath,
-                    UrlRewrite::TARGET_PATH => $resultFromDb[UrlRewrite::REQUEST_PATH],
-                    UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
-                    UrlRewrite::STORE_ID => $resultFromDb[UrlRewrite::STORE_ID],
-                    UrlRewrite::DESCRIPTION => null,
-                    UrlRewrite::IS_AUTOGENERATED => '0',
-                    UrlRewrite::METADATA => null,
-                ];
-            } else {
-                // If we have 2 results - return the row that matches request path
-                foreach ($resultsFromDb as $resultFromDb) {
-                    if ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath) {
-                        $result = $resultFromDb;
-                        break;
-                    }
-                }
+            if ($resultsFromDb) {
+                $urlRewrite = $this->extractMostRelevantUrlRewrite($requestPath, $resultsFromDb);
+                $result = $this->prepareUrlRewrite($requestPath, $urlRewrite);
             }
 
             return $result;
@@ -149,6 +125,75 @@ protected function doFindOneByData(array $data)
         return $this->connection->fetchRow($this->prepareSelect($data));
     }
 
+    /**
+     * Extract most relevant url rewrite from url rewrites list
+     *
+     * @param string $requestPath
+     * @param array $urlRewrites
+     * @return array|null
+     */
+    private function extractMostRelevantUrlRewrite(string $requestPath, array $urlRewrites): ?array
+    {
+        $prioritizedUrlRewrites = [];
+        foreach ($urlRewrites as $urlRewrite) {
+            switch (true) {
+                case $urlRewrite[UrlRewrite::REQUEST_PATH] === $requestPath:
+                    $priority = 1;
+                    break;
+                case $urlRewrite[UrlRewrite::REQUEST_PATH] === urldecode($requestPath):
+                    $priority = 2;
+                    break;
+                case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim($requestPath, '/'):
+                    $priority = 3;
+                    break;
+                case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim(urldecode($requestPath), '/'):
+                    $priority = 4;
+                    break;
+                default:
+                    $priority = 5;
+                    break;
+            }
+            $prioritizedUrlRewrites[$priority] = $urlRewrite;
+        }
+        ksort($prioritizedUrlRewrites);
+
+        return array_shift($prioritizedUrlRewrites);
+    }
+
+    /**
+     * Prepare url rewrite
+     *
+     * If request path matches the DB value or it's redirect - we can return result from DB
+     * Otherwise return 301 redirect to request path from DB results
+     *
+     * @param string $requestPath
+     * @param array $urlRewrite
+     * @return array
+     */
+    private function prepareUrlRewrite(string $requestPath, array $urlRewrite): array
+    {
+        $redirectTypes = [OptionProvider::TEMPORARY, OptionProvider::PERMANENT];
+        $canReturnResultFromDb = (
+            in_array($urlRewrite[UrlRewrite::REQUEST_PATH], [$requestPath, urldecode($requestPath)], true)
+            || in_array((int) $urlRewrite[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true)
+        );
+        if (!$canReturnResultFromDb) {
+            $urlRewrite = [
+                UrlRewrite::ENTITY_TYPE => 'custom',
+                UrlRewrite::ENTITY_ID => '0',
+                UrlRewrite::REQUEST_PATH => $requestPath,
+                UrlRewrite::TARGET_PATH => $urlRewrite[UrlRewrite::REQUEST_PATH],
+                UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
+                UrlRewrite::STORE_ID => $urlRewrite[UrlRewrite::STORE_ID],
+                UrlRewrite::DESCRIPTION => null,
+                UrlRewrite::IS_AUTOGENERATED => '0',
+                UrlRewrite::METADATA => null,
+            ];
+        }
+
+        return $urlRewrite;
+    }
+
     /**
      * Delete old URLs from DB.
      *
diff --git a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
index 2ec573b6459da..e1bb094e7fc39 100644
--- a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
+++ b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
@@ -81,7 +81,12 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
             $existingRewrite = $this->urlFinder->findOneByData([
                 UrlRewrite::REQUEST_PATH => $urlPath
             ]);
-            if ($existingRewrite) {
+            $currentRewrite = $this->urlFinder->findOneByData([
+                UrlRewrite::REQUEST_PATH => $urlPath,
+                UrlRewrite::STORE_ID => $targetStore->getId(),
+            ]);
+
+            if ($existingRewrite && !$currentRewrite) {
                 /** @var \Magento\Framework\App\Response\Http $response */
                 $targetUrl = $targetStore->getBaseUrl();
             }
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
index 71475acd8b066..50b83641e19a9 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
@@ -75,4 +75,37 @@
         <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
     </actionGroup>
+    <actionGroup name="AdminUpdateUrlRewrite">
+        <arguments>
+            <argument name="storeValue" type="string"/>
+            <argument name="requestPath" type="string"/>
+            <argument name="redirectTypeValue" type="string"/>
+            <argument name="description" type="string"/>
+        </arguments>
+        <click selector="{{AdminUrlRewriteEditSection.store}}" stepKey="clickOnStore"/>
+        <click selector="{{AdminUrlRewriteEditSection.storeValue(storeValue)}}" stepKey="clickOnStoreValue"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
+        <click selector="{{AdminUrlRewriteEditSection.redirectType}}" stepKey="selectRedirectType"/>
+        <click selector="{{AdminUrlRewriteEditSection.redirectTypeValue(redirectTypeValue)}}" stepKey="selectRedirectTypeValue"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
+        <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
+    </actionGroup>
+    <actionGroup name="AdminUpdateCustomUrlRewrite">
+        <arguments>
+            <argument name="storeValue" type="string"/>
+            <argument name="requestPath" type="string"/>
+            <argument name="targetPath" type="string"/>
+            <argument name="redirectTypeValue" type="string"/>
+            <argument name="description" type="string"/>
+        </arguments>
+        <click selector="{{AdminUrlRewriteEditSection.store}}" stepKey="clickOnStore"/>
+        <click selector="{{AdminUrlRewriteEditSection.storeValue('storeValue')}}" stepKey="clickOnStoreValue"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.targetPath}}" userInput="{{targetPath}}" stepKey="fillTargetPath"/>
+        <selectOption selector="{{AdminUrlRewriteEditSection.redirectType}}" userInput="{{redirectTypeValue}}" stepKey="selectRedirectTypeValue"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
+        <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml
index f053d18e79c3e..1a9248ef36789 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml
@@ -25,7 +25,7 @@
         <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="{{targetPath}}" stepKey="seeTheTargetPath" />
         <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="{{redirectType}}" stepKey="seeTheRedirectTypeForOldUrl" />
     </actionGroup>
-    <actionGroup name="AdminSearchProductBySku">
+    <actionGroup name="AdminSearchUrlRewriteProductBySku">
         <arguments>
             <argument name="productSku" type="string"/>
         </arguments>
@@ -72,4 +72,26 @@
         <waitForPageLoad stepKey="waitForPageToLoad3"/>
         <see selector="{{AdminUrlRewriteIndexSection.successMessage}}" userInput="You deleted the URL rewrite." stepKey="seeSuccessMessage"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+    <actionGroup name="AssertPageByUrlRewriteIsNotFound">
+        <arguments>
+            <argument name="requestPath" type="string"/>
+        </arguments>
+        <amOnPage url="{{requestPath}}" stepKey="amOnPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
+        <see userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+    </actionGroup>
+    <actionGroup name="AdminSearchAndSelectUrlRewriteInGrid">
+        <arguments>
+            <argument name="requestPath" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteEditPage"/>
+        <waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{requestPath}}" stepKey="fillRedirectPathFilter"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+        <click selector="{{AdminUrlRewriteIndexSection.editButton('1')}}" stepKey="clickOnEditButton"/>
+        <waitForPageLoad stepKey="waitForEditPageToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
new file mode 100644
index 0000000000000..3692e82072afc
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
@@ -0,0 +1,47 @@
+<?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="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="defaultUrlRewrite" type="urlRewrite">
+        <data key="request_path" unique="prefix">test-test-test.html</data>
+        <data key="target_path">http://www.example.com/</data>
+        <data key="redirect_type">302</data>
+        <data key="redirect_type_label">Temporary (302)</data>
+        <data key="store_id">1</data>
+        <data key="store">Default Store View</data>
+        <data key="description">End To End Test</data>
+    </entity>
+    <entity name="updateUrlRewrite" type="urlRewrite">
+        <data key="request_path" unique="prefix">test-aspx-test.aspx</data>
+        <data key="target_path">http://www.example.com/</data>
+        <data key="redirect_type">302</data>
+        <data key="redirect_type_label">Temporary (302)</data>
+        <data key="store_id">1</data>
+        <data key="store">Default Store View</data>
+        <data key="description">Update Url Rewrite</data>
+    </entity>
+    <entity name="customPermanentUrlRewrite" type="urlRewrite">
+        <data key="request_path" unique="prefix">wishlist</data>
+        <data key="target_path">https://marketplace.magento.com/</data>
+        <data key="redirect_type">301</data>
+        <data key="redirect_type_label">Permanent (301)</data>
+        <data key="store_id">1</data>
+        <data key="store">Default Store View</data>
+        <data key="description">test_description_relative path</data>
+    </entity>
+    <entity name="customTemporaryUrlRewrite" type="urlRewrite">
+        <data key="request_path" unique="prefix">wishlist</data>
+        <data key="target_path">https://marketplace.magento.com/</data>
+        <data key="redirect_type">302</data>
+        <data key="redirect_type_label">Temporary (302)</data>
+        <data key="store_id">1</data>
+        <data key="store">Default Store View</data>
+        <data key="description">test_description_relative path</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml b/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
new file mode 100644
index 0000000000000..0738b17d6e0f0
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
@@ -0,0 +1,18 @@
+<?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="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateUrlRewrite" dataType="urlRewrite" type="create" auth="adminFormKey" url="/admin/url_rewrite/save/" method="POST" successRegex="/messages-message-success/">
+        <field key="store_id">integer</field>
+        <field key="redirect_type">integer</field>
+        <field key="request_path">string</field>
+        <field key="target_path">string</field>
+        <field key="description">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Metadata/url_rewrite-meta.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Metadata/url_rewrite-meta.xml
new file mode 100644
index 0000000000000..0738b17d6e0f0
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Metadata/url_rewrite-meta.xml
@@ -0,0 +1,18 @@
+<?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="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateUrlRewrite" dataType="urlRewrite" type="create" auth="adminFormKey" url="/admin/url_rewrite/save/" method="POST" successRegex="/messages-message-success/">
+        <field key="store_id">integer</field>
+        <field key="redirect_type">integer</field>
+        <field key="request_path">string</field>
+        <field key="target_path">string</field>
+        <field key="description">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
index 90ab19c2ed76a..7b789845fe249 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
@@ -21,5 +21,6 @@
         <element name="emptyRecords" type="text" selector="//td[@class='empty-text']"/>
         <element name="successMessage" type="text" selector="#messages"/>
         <element name="editButton" type="text" selector="//tr[@data-role='row'][{{rowNumber}}]/td/a[contains(.,'Edit')]" parameterized="true"/>
+        <element name="storeView" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='store_id']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteProductSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteProductSection.xml
new file mode 100644
index 0000000000000..3650ec56d1391
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteProductSection.xml
@@ -0,0 +1,18 @@
+<?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="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminUrlRewriteProductSection">
+        <element name="skuFilter" type="input" selector="//input[@name='sku']"/>
+        <element name="resetFilter" type="button" selector="//button[@data-action='grid-filter-reset']" timeout="30"/>
+        <element name="searchFilter" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
+        <element name="productRow" type="text" selector="//tbody/tr/td[contains(@class,'col-sku')]"/>
+        <element name="skipCategoryButton" type="button" selector="//button[@class='action-default scalable save']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminAutoUpdateURLRewriteWhenCategoryIsDeletedTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminAutoUpdateURLRewriteWhenCategoryIsDeletedTest.xml
new file mode 100644
index 0000000000000..52d313b21f3e1
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminAutoUpdateURLRewriteWhenCategoryIsDeletedTest.xml
@@ -0,0 +1,73 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAutoUpdateURLRewriteWhenCategoryIsDeletedTest">
+        <annotations>
+            <stories value="Create Product UrlRewrite"/>
+            <title value="Create product URL rewrite, autoupdate if subcategory deleted"/>
+            <description value="Login as admin,verify UrlRewrite auto update when subcategory is deleted  "/>
+            <testCaseId value="MC-5342"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+            <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Filter and Select the created Product -->
+        <actionGroup ref="AdminSearchUrlRewriteProductBySku" stepKey="searchProduct">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
+
+        <!-- Update the Store, RequestPath, RedirectType and Description -->
+        <actionGroup ref="AdminAddUrlRewriteForProduct" stepKey="addUrlRewriteForProduct">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{_defaultProduct.urlKey}}.html"/>
+            <argument name="redirectTypeValue" value="Temporary (302)"/>
+            <argument name="description" value="End To End Test"/>
+        </actionGroup>
+
+        <!-- Delete Category -->
+        <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+        <!--Filter Product in product page and get the Product ID -->
+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
+
+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
+            <argument name="redirectPath" value="$$createSimpleProduct.name$$.html" />
+            <argument name="redirectType" value="No" />
+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
+        </actionGroup>
+
+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
+            <argument name="redirectPath" value="{{_defaultProduct.urlKey}}.html" />
+            <argument name="redirectType" value="Temporary (302)"/>
+            <argument name="targetPath" value="$$createSimpleProduct.name$$.html"/>
+        </actionGroup>
+
+        <!--Assert Category Url Redirect is not present -->
+        <actionGroup ref="AdminSearchDeletedUrlRewrite" stepKey="searchDeletedCategory">
+            <argument name="requestPath" value="$$createCategory.name$$.html"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest.xml
new file mode 100644
index 0000000000000..ee3682c8ad4d7
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest.xml
@@ -0,0 +1,81 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest">
+        <annotations>
+            <features value="Url Rewrite"/>
+            <stories value="Update url rewrites"/>
+            <title value="Check url rewrites in catalog categories after changing url key"/>
+            <description value="Check url rewrites in catalog categories after changing url key for store view and moving category"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5352"/>
+            <group value="url_rewrite"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create two sub-categories in default category with simple products -->
+            <createData entity="_defaultCategory" stepKey="createFirstCategory"/>
+            <createData entity="_defaultProduct" stepKey="createFirstSimpleProduct">
+                <requiredEntity createDataKey="createFirstCategory"/>
+            </createData>
+            <createData entity="_defaultCategory" stepKey="createSecondCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSecondSimpleProduct">
+                <requiredEntity createDataKey="createSecondCategory"/>
+            </createData>
+
+            <!-- Log in to backend -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--Create additional Store View in Main Website Store -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createFirstCategory" stepKey="deleteFirstCategory"/>
+            <deleteData createDataKey="createSecondCategory" stepKey="deleteSecondCategory"/>
+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- On the categories editing page change store view to created additional view -->
+        <actionGroup ref="switchCategoryStoreView" stepKey="switchStoreView">
+            <argument name="Store" value="customStore.name"/>
+            <argument name="CatName" value="$$createFirstCategory.name$$"/>
+        </actionGroup>
+
+        <!-- Change url key for category for first category; save -->
+        <actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeUrlKey">
+            <argument name="value" value="{{SimpleRootSubCategory.url_key}}"/>
+        </actionGroup>
+
+        <!-- Change store view to "All store views" for first category -->
+        <actionGroup ref="switchCategoryToAllStoreView" stepKey="switchToAllStoreViewProduct">
+            <argument name="CatName" value="$$createFirstCategory.name$$"/>
+        </actionGroup>
+
+        <!-- Move first category inside second category -->
+        <actionGroup ref="MoveCategoryActionGroup" stepKey="moveFirstCategoryToSecondCategory">
+            <argument name="childCategory" value="$$createFirstCategory.name$$"/>
+            <argument name="parentCategory" value="$$createSecondCategory.name$$"/>
+        </actionGroup>
+
+        <!-- Switch default store view on store view created below for first category -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="storefrontSwitchStoreView">
+            <argument name="storeView" value="customStore"/>
+        </actionGroup>
+
+        <!-- Assert category url with custom store view -->
+        <amOnPage url="{{StorefrontHomePage.url}}$$createSecondCategory.name$$/{{SimpleRootSubCategory.url_key}}.html" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <dontSee userInput="$$createSecondSimpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteAndAddNoRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteAndAddNoRedirectTest.xml
new file mode 100644
index 0000000000000..f8d297c92a176
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteAndAddNoRedirectTest.xml
@@ -0,0 +1,62 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateProductUrLRewriteAndAddNoRedirectTest">
+        <annotations>
+            <stories value="Create Product UrlRewrite"/>
+            <title value="Create product URL rewrite, with no redirect"/>
+            <description value="Login as admin, create product UrlRewrite and add No redirect  "/>
+            <testCaseId value="MC-5339"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Filter and Select the created Product -->
+        <actionGroup ref="AdminSearchUrlRewriteProductBySku" stepKey="searchProduct">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
+
+        <!-- Update the Store, RequestPath, RedirectType and Description -->
+        <actionGroup ref="AdminAddUrlRewriteForProduct" stepKey="addUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{_defaultProduct.urlKey}}.html"/>
+            <argument name="redirectTypeValue" value="No"/>
+            <argument name="description" value="End To End Test"/>
+        </actionGroup>
+
+        <!--Filter Product in product page and get the Product ID -->
+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
+
+        <!--Assert Product Redirect -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
+            <argument name="redirectPath" value="{{_defaultProduct.urlKey}}.html" />
+            <argument name="redirectType" value="No" />
+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
+        </actionGroup>
+
+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
+            <argument name="redirectPath" value="$$createSimpleProduct.name$$.html" />
+            <argument name="redirectType" value="No" />
+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteWithCategoryAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteWithCategoryAndAddTemporaryRedirectTest.xml
new file mode 100644
index 0000000000000..ae18ab33ba6ce
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteWithCategoryAndAddTemporaryRedirectTest.xml
@@ -0,0 +1,79 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateProductURLRewriteWithCategoryAndAddTemporaryRedirectTest">
+        <annotations>
+            <stories value="Create Product UrlRewrite"/>
+            <title value="Create product URL rewrite, add temporary redirect for product"/>
+            <description value="Login as admin, create product with category and UrlRewrite and add temporary redirect  "/>
+            <testCaseId value="MC-5338"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Filter and Select the created Product -->
+        <actionGroup ref="AdminSearchUrlRewriteProductBySku" stepKey="searchProduct">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
+
+        <!-- Update the Store, RequestPath, RedirectType and Description -->
+        <actionGroup ref="AdminAddUrlRewriteForProduct" stepKey="addUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{FirstLevelSubCat.name_lwr}}/{{_defaultProduct.urlKey}}.html"/>
+            <argument name="redirectTypeValue" value="Temporary (302)"/>
+            <argument name="description" value="End To End Test"/>
+        </actionGroup>
+
+        <!--Assert Product Redirect -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
+            <argument name="redirectPath" value="{{FirstLevelSubCat.name_lwr}}/{{_defaultProduct.urlKey}}.html" />
+            <argument name="redirectType" value="Temporary (302)" />
+            <argument name="targetPath" value="$$createSimpleProduct.name$$.html"/>
+        </actionGroup>
+
+        <!--Filter Product in product page and get the Product ID -->
+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
+
+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
+            <argument name="redirectPath" value="$$createSimpleProduct.name$$.html" />
+            <argument name="redirectType" value="No" />
+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
+        </actionGroup>
+
+        <!-- Open Category Page and Get Category ID -->
+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
+            <argument name="category" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
+
+        <!-- Assert Redirect path, Target Path and Redirect type in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath2">
+            <argument name="redirectPath" value="$$createCategory.name$$.html" />
+            <argument name="redirectType" value="No" />
+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddPermanentRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddPermanentRedirectTest.xml
new file mode 100644
index 0000000000000..66c586d4fe891
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddPermanentRedirectTest.xml
@@ -0,0 +1,62 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateProductUrLRewriteAndAddPermanentRedirectTest">
+        <annotations>
+            <stories value="Create Product UrlRewrite"/>
+            <title value="Create product URL rewrite, with permanent redirect"/>
+            <description value="Login as admin, create product UrlRewrite and add Permanent redirect"/>
+            <testCaseId value="MC-5341"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Filter and Select the created Product -->
+        <actionGroup ref="AdminSearchUrlRewriteProductBySku" stepKey="searchProduct">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
+
+        <!-- Update the Store, RequestPath, RedirectType and Description -->
+        <actionGroup ref="AdminAddUrlRewriteForProduct" stepKey="addUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{_defaultProduct.urlKey}}.html"/>
+            <argument name="redirectTypeValue" value="Permanent (301)"/>
+            <argument name="description" value="End To End Test"/>
+        </actionGroup>
+
+        <!--Filter Product in product page and get the Product ID -->
+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
+
+
+        <!--Assert Product Redirect -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
+            <argument name="redirectPath" value="{{_defaultProduct.urlKey}}.html" />
+            <argument name="redirectType" value="Permanent (301)" />
+            <argument name="targetPath" value="$$createSimpleProduct.name$$.html"/>
+        </actionGroup>
+
+        <!-- Assert Redirect Path, Target Path and Redirect type in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
+            <argument name="redirectPath" value="$$createSimpleProduct.name$$.html" />
+            <argument name="redirectType" value="No" />
+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddTemporaryRedirectTest.xml
new file mode 100644
index 0000000000000..2d797a12bedf5
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductUrLRewriteAndAddTemporaryRedirectTest.xml
@@ -0,0 +1,62 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateProductUrLRewriteAndAddTemporaryRedirectTest">
+        <annotations>
+            <stories value="Create Product UrlRewrite"/>
+            <title value="Create product URL rewrite, with temporary redirect"/>
+            <description value="Login as admin, create product UrlRewrite and add Temporary redirect"/>
+            <testCaseId value="MC-5340"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Filter and Select the created Product -->
+        <actionGroup ref="AdminSearchUrlRewriteProductBySku" stepKey="searchProduct">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
+
+        <!-- Update the Store, RequestPath, RedirectType and Description -->
+        <actionGroup ref="AdminAddUrlRewriteForProduct" stepKey="addUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{_defaultProduct.urlKey}}.html"/>
+            <argument name="redirectTypeValue" value="Temporary (302)"/>
+            <argument name="description" value="End To End Test"/>
+        </actionGroup>
+
+        <!--Filter Product in product page and get the Product ID -->
+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
+
+        <!--Assert Product Redirect -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath">
+            <argument name="redirectPath" value="{{_defaultProduct.urlKey}}.html" />
+            <argument name="redirectType" value="Temporary (302)" />
+            <argument name="targetPath" value="$$createSimpleProduct.name$$.html"/>
+        </actionGroup>
+
+        <!-- Assert Redirect Path, Target Path and Redirect type in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByRequestPath1">
+            <argument name="redirectPath" value="$$createSimpleProduct.name$$.html" />
+            <argument name="redirectType" value="No" />
+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
new file mode 100644
index 0000000000000..83c1e5c0a5e0a
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
@@ -0,0 +1,113 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest">
+        <annotations>
+            <stories value="Create product with several websites"/>
+            <title value="Create product with several websites and check URL Rewrites"/>
+            <description value="Test log in to Create product and Create product with several websites and check URL Rewrites"/>
+            <testCaseId value="MC-5359"/>
+            <severity value="CRITICAL"/>
+            <group value="urlRewrite"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
+            <createData entity="SimpleRootSubCategory" stepKey="category">
+                <requiredEntity createDataKey="rootCategory"/>
+            </createData>
+            <createData entity="defaultSimpleProduct" stepKey="createProduct"/>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteStore1">
+                <argument name="storeGroupName" value="customStore.name"/>
+            </actionGroup>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteStore2">
+                <argument name="storeGroupName" value="customStoreGroup.name"/>
+            </actionGroup>
+            <deleteData stepKey="deleteRootCategory" createDataKey="rootCategory"/>
+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create first store -->
+        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+            <argument name="website" value="{{_defaultWebsite.name}}"/>
+            <argument name="storeGroupName" value="{{customStore.name}}"/>
+            <argument name="storeGroupCode" value="{{customStore.code}}"/>
+        </actionGroup>
+        <!-- Create first store view -->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
+            <argument name="StoreGroup" value="customStore"/>
+            <argument name="customStore" value="storeViewData"/>
+        </actionGroup>
+
+        <!-- Create second store -->
+        <actionGroup ref="CreateCustomStore" stepKey="createCustomStore">
+            <argument name="website" value="{{_defaultWebsite.name}}"/>
+            <argument name="store" value="{{customStoreGroup.name}}"/>
+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
+        </actionGroup>
+        <!-- Create second store view -->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
+            <argument name="StoreGroup" value="customStoreGroup"/>
+            <argument name="customStore" value="customStoreEN"/>
+        </actionGroup>
+
+        <!-- Create simple product with categories created in create data -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProduct">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowOfCreatedSimpleProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$rootCategory.name$$" stepKey="fillSearchForInitialCategory"/>
+        <click selector="{{AdminProductFormSection.selectCategory($$rootCategory.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$category.name$$" stepKey="fillSearchCategory"/>
+        <click selector="{{AdminProductFormSection.selectCategory($$category.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForSimpleProductSaved"/>
+        <!-- Verify customer see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
+
+        <!-- Grab category Id -->
+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="grabCategoryId">
+            <argument name="category" value="$$category.name$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
+        <!-- Open Url Rewrite page and verify new Redirect Path, RedirectType and Target Path for the grabbed category Id -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchPath">
+            <argument name="redirectPath" value="$$category.name$$.html"/>
+            <argument name="redirectType" value="No"/>
+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
+        </actionGroup>
+        <see selector="{{AdminUrlRewriteIndexSection.storeView('1')}}" userInput="{{customStoreGroup.name}}" stepKey="seeStoreValueForCategoryId"/>
+        <see selector="{{AdminUrlRewriteIndexSection.storeView('1')}}" userInput="{{customStoreEN.name}}" stepKey="seeStoreViewValueForCategoryId"/>
+
+        <!-- Grab product Id -->
+        <actionGroup ref="filterAndSelectProduct" stepKey="grabProductId">
+            <argument name="productSku" value="$$createProduct.sku$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
+        <!-- Open Url Rewrite page and verify new Redirect Path, RedirectType and Target Path for the grabbed product Id -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchPath1">
+            <argument name="redirectPath" value="$$createProduct.name$$.html"/>
+            <argument name="redirectType" value="No"/>
+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
+        </actionGroup>
+        <see selector="{{AdminUrlRewriteIndexSection.storeView('1')}}" userInput="{{customStore.name}}" stepKey="seeStoreValueForProductId"/>
+        <see selector="{{AdminUrlRewriteIndexSection.storeView('1')}}" userInput="{{storeViewData.name}}" stepKey="seeStoreViewValueForProductId"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCustomUrlRewriteTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCustomUrlRewriteTest.xml
new file mode 100644
index 0000000000000..cf45931029778
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCustomUrlRewriteTest.xml
@@ -0,0 +1,44 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteCustomUrlRewriteTest">
+        <annotations>
+            <stories value="Delete custom URL rewrite"/>
+            <title value="Delete custom URL rewrite"/>
+            <description value="Test log in to URL rewrite and Delete custom URL rewrite"/>
+            <testCaseId value="MC-5350"/>
+            <severity value="CRITICAL"/>
+            <group value="urlRewrite"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="defaultUrlRewrite" stepKey="urlRewrite" />
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Delete created custom url rewrite and verify AssertUrlRewriteDeletedMessage-->
+        <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteUrlRewrite">
+            <argument name="requestPath" value="$$urlRewrite.request_path$$"/>
+        </actionGroup>
+
+        <!--Search and verify AssertUrlRewriteNotInGrid-->
+        <actionGroup ref="AdminSearchDeletedUrlRewrite" stepKey="searchDeletedUrlRewriteInGrid">
+            <argument name="requestPath" value="$$urlRewrite.request_path$$"/>
+        </actionGroup>
+
+        <!--Verify AssertPageByUrlRewriteIsNotFound-->
+        <actionGroup ref="AssertPageByUrlRewriteIsNotFound" stepKey="amOnPage">
+            <argument name="requestPath" value="$$urlRewrite.request_path$$"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddAspxRequestPathTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddAspxRequestPathTest.xml
new file mode 100644
index 0000000000000..072753505223d
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddAspxRequestPathTest.xml
@@ -0,0 +1,61 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateCategoryUrlRewriteAndAddAspxRequestPathTest">
+        <annotations>
+            <stories value="Update URL rewrite"/>
+            <title value="Update Category URL Rewrites, aspx request path"/>
+            <description value="Login as Admin, update category UrlRewrite, add aspx request path and Temporary redirect type "/>
+            <testCaseId value="MC-5358"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search and Select Edit option for created category in grid -->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
+            <argument name="requestPath" value="$$category.custom_attributes[url_key]$$.html"/>
+        </actionGroup>
+
+        <!-- Open UrlRewrite Edit page and update the fields  -->
+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{defaultUrlRewrite.request_path}}"/>
+            <argument name="redirectTypeValue" value="Temporary (302)"/>
+            <argument name="description" value="Update Category Url Rewrite"/>
+        </actionGroup>
+
+        <!-- Open Category Page and Get Category ID -->
+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
+            <argument name="category"  value="$$category.name$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
+
+        <!--Assert category Url Rewrite in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByNewRequestPath">
+            <argument name="redirectPath" value="{{defaultUrlRewrite.request_path}}" />
+            <argument name="redirectType" value="Temporary (302)" />
+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
+        </actionGroup>
+
+        <!-- Assert category redirect in Store Front -->
+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
+            <argument name="category" value="$$category.name$$"/>
+            <argument name="newRequestPath" value="{{defaultUrlRewrite.request_path}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddNoRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddNoRedirectTest.xml
new file mode 100644
index 0000000000000..80b9dbe41bf59
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddNoRedirectTest.xml
@@ -0,0 +1,61 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateCategoryUrlRewriteAndAddNoRedirectTest">
+        <annotations>
+            <stories value="Update URL rewrite"/>
+            <title value="Update Category URL Rewrites, no redirect type"/>
+            <description value="Login as Admin and update category Url Rewrite and add redirect type No"/>
+            <testCaseId value="MC-5355"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search and Select Edit option for created category in grid -->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
+            <argument name="requestPath" value="$$category.custom_attributes[url_key]$$.html"/>
+        </actionGroup>
+
+        <!-- Open UrlRewrite Edit page and update the fields  -->
+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{defaultUrlRewrite.request_path}}"/>
+            <argument name="redirectTypeValue" value="No"/>
+            <argument name="description" value="Update Category Url Rewrite"/>
+        </actionGroup>
+
+        <!-- Open Category Page and Get Category ID -->
+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
+            <argument name="category"  value="$$category.name$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
+
+        <!-- Assert category Url Rewrite in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByNewRequestPath">
+            <argument name="redirectPath" value="{{defaultUrlRewrite.request_path}}" />
+            <argument name="redirectType" value="No" />
+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
+        </actionGroup>
+
+        <!-- Assert Category redirect in Store Front -->
+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
+            <argument name="category" value="$$category.name$$"/>
+            <argument name="newRequestPath" value="{{defaultUrlRewrite.request_path}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddPermanentRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddPermanentRedirectTest.xml
new file mode 100644
index 0000000000000..be9fd1d83c8f1
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddPermanentRedirectTest.xml
@@ -0,0 +1,61 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateCategoryUrlRewriteAndAddPermanentRedirectTest">
+        <annotations>
+            <stories value="Update URL rewrite"/>
+            <title value="Update Category URL Rewrites, permanent"/>
+            <description value="Login as Admin and update category UrlRewrite and add Permanent redirect type"/>
+            <testCaseId value="MC-5357"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search and Select Edit option for created category in grid -->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
+            <argument name="requestPath" value="$$category.custom_attributes[url_key]$$.html"/>
+        </actionGroup>
+
+        <!-- Open UrlRewrite Edit page and update the fields  -->
+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{defaultUrlRewrite.request_path}}"/>
+            <argument name="redirectTypeValue" value="Permanent (301)"/>
+            <argument name="description" value="Update Category Url Rewrite"/>
+        </actionGroup>
+
+        <!-- Open Category Page and Get Category ID -->
+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
+            <argument name="category"  value="$$category.name$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
+
+        <!--Assert category Url Rewrite in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByNewRequestPath">
+            <argument name="redirectPath" value="{{defaultUrlRewrite.request_path}}" />
+            <argument name="redirectType" value="Permanent (301)" />
+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
+        </actionGroup>
+
+        <!-- Assert category redirect in Store Front -->
+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
+            <argument name="category" value="$$category.name$$"/>
+            <argument name="newRequestPath" value="{{defaultUrlRewrite.request_path}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
new file mode 100644
index 0000000000000..7453b7b5a43f3
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
@@ -0,0 +1,61 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest">
+        <annotations>
+            <stories value="Update URL rewrite"/>
+            <title value="Update Category URL Rewrites, no redirect type"/>
+            <description value="Login as Admin and update category UrlRewrite and add Temporary redirect type"/>
+            <testCaseId value="MC-5356"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search and Select Edit option for created category in grid -->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
+            <argument name="requestPath" value="$$category.custom_attributes[url_key]$$.html"/>
+        </actionGroup>
+
+        <!-- Open UrlRewrite Edit page and update the fields  -->
+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{updateUrlRewrite.request_path}}"/>
+            <argument name="redirectTypeValue" value="Temporary (302)"/>
+            <argument name="description" value="Update Category Url Rewrite"/>
+        </actionGroup>
+
+        <!-- Open Category Page and Get Category ID -->
+        <actionGroup ref="OpenCategoryFromCategoryTree" stepKey="getCategoryId">
+            <argument name="category"  value="$$category.name$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
+
+        <!--Assert category Url Rewrite in grid -->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="searchByNewRequestPath">
+            <argument name="redirectPath" value="{{updateUrlRewrite.request_path}}" />
+            <argument name="redirectType" value="Temporary (302)" />
+            <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
+        </actionGroup>
+
+        <!-- Assert category redirect in Store Front -->
+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
+            <argument name="category" value="$$category.name$$"/>
+            <argument name="newRequestPath" value="{{updateUrlRewrite.request_path}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesPermanentTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesPermanentTest.xml
new file mode 100644
index 0000000000000..8339eb63abef1
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesPermanentTest.xml
@@ -0,0 +1,58 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateCustomURLRewritesPermanentTest">
+        <annotations>
+            <stories value="Update Custom URL Rewrites"/>
+            <title value="Update Custom URL Rewrites, permanent"/>
+            <description value="Test log in to URL Rewrites and Update Custom URL Rewrites, permanent"/>
+            <testCaseId value="MC-5353"/>
+            <severity value="CRITICAL"/>
+            <group value="urlRewrite"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="defaultUrlRewrite" stepKey="urlRewrite"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
+                <argument name="requestPath" value="{{customPermanentUrlRewrite.request_path}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Search default custom url rewrite in grid-->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewrite">
+            <argument name="requestPath" value="$$urlRewrite.request_path$$"/>
+        </actionGroup>
+
+        <!--Update default custom url rewrite as per requirement and verify AssertUrlRewriteSaveMessage-->
+        <actionGroup ref="AdminUpdateCustomUrlRewrite" stepKey="updateUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{customPermanentUrlRewrite.request_path}}"/>
+            <argument name="targetPath" value="{{customPermanentUrlRewrite.target_path}}"/>
+            <argument name="redirectTypeValue" value="{{customPermanentUrlRewrite.redirect_type_label}}"/>
+            <argument name="description" value="{{customPermanentUrlRewrite.description}}"/>
+        </actionGroup>
+
+        <!--Search and verify updated AssertUrlRewriteInGrid-->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="verifyUpdatedUrlRewriteInGrid">
+            <argument name="redirectPath" value="{{customPermanentUrlRewrite.request_path}}"/>
+            <argument name="redirectType" value="{{customPermanentUrlRewrite.redirect_type_label}}"/>
+            <argument name="targetPath" value="{{customPermanentUrlRewrite.target_path}}"/>
+        </actionGroup>
+
+        <!--AssertUrlRewriteSuccessOutsideRedirect-->
+        <amOnPage url="{{StorefrontHomePage.url}}{{customPermanentUrlRewrite.request_path}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeInCurrentUrl url="{{customPermanentUrlRewrite.target_path}}" stepKey="seeAssertUrlRewrite"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesTemporaryTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesTemporaryTest.xml
new file mode 100644
index 0000000000000..07d578cbbeca4
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCustomURLRewritesTemporaryTest.xml
@@ -0,0 +1,68 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateCustomURLRewritesTemporaryTest">
+        <annotations>
+            <stories value="Update Custom URL Rewrites"/>
+            <title value="Update Custom URL Rewrites, temporary"/>
+            <description value="Test log in to URL Rewrites and Update Custom URL Rewrites, temporary"/>
+            <testCaseId value="MC-5354"/>
+            <severity value="CRITICAL"/>
+            <group value="urlRewrite"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="defaultUrlRewrite" stepKey="urlRewrite"/>
+            <createData entity="defaultSimpleProduct" stepKey="createProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
+                <argument name="requestPath" value="{{customTemporaryUrlRewrite.request_path}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Filter Product in product page and get the Product ID -->
+        <actionGroup ref="filterAndSelectProduct" stepKey="filterProduct">
+            <argument name="productSku" value="$$createProduct.sku$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="productId" regex="#\/([0-9]*)?\/$#"/>
+
+        <!--Search default custom url rewrite in grid-->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewrite">
+            <argument name="requestPath" value="$$urlRewrite.request_path$$"/>
+        </actionGroup>
+
+        <!--Update default custom url rewrite as per requirement and verify AssertUrlRewriteSaveMessage-->
+        <actionGroup ref="AdminUpdateCustomUrlRewrite" stepKey="updateUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="{{customTemporaryUrlRewrite.request_path}}"/>
+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
+            <argument name="redirectTypeValue" value="{{customTemporaryUrlRewrite.redirect_type_label}}"/>
+            <argument name="description" value="{{customTemporaryUrlRewrite.description}}"/>
+        </actionGroup>
+
+        <!--Search and verify AssertUrlRewriteInGrid-->
+        <actionGroup ref="AdminSearchByRequestPath" stepKey="verifyUpdatedUrlRewriteInGrid">
+            <argument name="redirectPath" value="{{customTemporaryUrlRewrite.request_path}}"/>
+            <argument name="redirectType" value="{{customTemporaryUrlRewrite.redirect_type_label}}"/>
+            <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
+        </actionGroup>
+
+        <!-- AssertUrlRewriteCustomSearchRedirect-->
+        <actionGroup ref="AssertStorefrontProductRedirect" stepKey="verifyProductInStoreFrontPage">
+            <argument name="productName" value="$$createProduct.name$$"/>
+            <argument name="productSku" value="$$createProduct.sku$$"/>
+            <argument name="productRequestPath" value="$$createProduct.name$$.html"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml
new file mode 100644
index 0000000000000..ea370d8419583
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml
@@ -0,0 +1,49 @@
+<?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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest">
+        <annotations>
+            <stories value="URL Rewrite"/>
+            <title value="Update Product URL Rewrites"/>
+            <description value="Login as Admin and update product UrlRewrite and add Temporary redirect type "/>
+            <testCaseId value="MC-5351"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="defaultSimpleProduct" stepKey="createProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search and Select Edit option for created product in grid -->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
+            <argument name="requestPath" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Open UrlRewrite Edit page and update the fields  -->
+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
+            <argument name="storeValue" value="{{updateUrlRewrite.store}}"/>
+            <argument name="requestPath" value="{{updateUrlRewrite.request_path}}"/>
+            <argument name="redirectTypeValue" value="{{updateUrlRewrite.redirect_type_label}}"/>
+            <argument name="description" value="{{updateUrlRewrite.description}}"/>
+        </actionGroup>
+
+        <!-- Assert product Url Rewrite in StoreFront -->
+        <actionGroup ref="AssertStorefrontProductRedirect" stepKey="assertProductUrlRewriteInStoreFront">
+            <argument name="productName" value="$$createProduct.name$$"/>
+            <argument name="productSku" value="$$createProduct.sku$$"/>
+            <argument name="productRequestPath" value="{{updateUrlRewrite.request_path}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
index 1c25ffd1e9ff7..c842d660a6176 100644
--- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
+++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
@@ -76,6 +76,7 @@ public function resolve(
             $result = [
                 'id' => $urlRewrite->getEntityId(),
                 'canonical_url' => $urlRewrite->getTargetPath(),
+                'relative_url' => $urlRewrite->getTargetPath(),
                 'type' => $this->sanitizeType($urlRewrite->getEntityType())
             ];
         }
diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
index dae695c69a33c..5aea482a0fe02 100644
--- a/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
@@ -1,16 +1,17 @@
 # Copyright © Magento, Inc. All rights reserved.
 # See COPYING.txt for license details.
 
-type EntityUrl @doc(description: "EntityUrl is an output object containing the `id`, `canonical_url`, and `type` attributes") {
-    id: Int @doc(description: "The ID assigned to the object associated with the specified url. This could be a product ID, category ID, or page ID.")
-    canonical_url: String @doc(description: "The internal relative URL. If the specified  url is a redirect, the query returns the redirected URL, not the original.")
-    type: UrlRewriteEntityTypeEnum @doc(description: "One of PRODUCT, CATEGORY, or CMS_PAGE.")
-}
-
 type Query {
     urlResolver(url: String!): EntityUrl @resolver(class: "Magento\\UrlRewriteGraphQl\\Model\\Resolver\\EntityUrl") @doc(description: "The urlResolver query returns the relative URL for a specified product, category or CMS page")
 }
 
+type EntityUrl @doc(description: "EntityUrl is an output object containing the `id`, `relative_url`, and `type` attributes") {
+    id: Int @doc(description: "The ID assigned to the object associated with the specified url. This could be a product ID, category ID, or page ID.")
+    canonical_url: String @deprecated(reason: "The canonical_url field is deprecated, use relative_url instead.")
+    relative_url: String @doc(description: "The internal relative URL. If the specified  url is a redirect, the query returns the redirected URL, not the original.")
+    type: UrlRewriteEntityTypeEnum @doc(description: "One of PRODUCT, CATEGORY, or CMS_PAGE.")
+}
+
 enum UrlRewriteEntityTypeEnum {
 }
 
diff --git a/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php b/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php
index 696dbf166fc38..cbdbbdcf010b6 100644
--- a/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php
+++ b/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php
@@ -14,7 +14,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Vault\Api\PaymentTokenManagementInterface;
 use Magento\Vault\Api\PaymentTokenRepositoryInterface;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 
 /**
  * Delete Payment Token resolver, used for GraphQL mutation processing.
@@ -22,9 +22,9 @@
 class DeletePaymentToken implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var PaymentTokenManagementInterface
@@ -37,16 +37,16 @@ class DeletePaymentToken implements ResolverInterface
     private $paymentTokenRepository;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param PaymentTokenManagementInterface $paymentTokenManagement
      * @param PaymentTokenRepositoryInterface $paymentTokenRepository
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         PaymentTokenManagementInterface $paymentTokenManagement,
         PaymentTokenRepositoryInterface $paymentTokenRepository
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->paymentTokenManagement = $paymentTokenManagement;
         $this->paymentTokenRepository = $paymentTokenRepository;
     }
@@ -65,12 +65,9 @@ public function resolve(
             throw new GraphQlInputException(__('Specify the "public_hash" value.'));
         }
 
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
+        $customer = $this->getCustomer->execute($context);
 
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        $token = $this->paymentTokenManagement->getByPublicHash($args['public_hash'], $currentUserId);
+        $token = $this->paymentTokenManagement->getByPublicHash($args['public_hash'], $customer->getId());
         if (!$token) {
             throw new GraphQlNoSuchEntityException(
                 __('Could not find a token using public hash: %1', $args['public_hash'])
diff --git a/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php b/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php
index 80e81037bb5dd..1563eaedf6b9b 100644
--- a/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php
+++ b/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php
@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Vault\Model\PaymentTokenManagement;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 
 /**
  * Customers Payment Tokens resolver, used for GraphQL request processing.
@@ -24,20 +24,20 @@ class PaymentTokens implements ResolverInterface
     private $paymentTokenManagement;
 
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @param PaymentTokenManagement $paymentTokenManagement
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      */
     public function __construct(
         PaymentTokenManagement $paymentTokenManagement,
-        CheckCustomerAccount $checkCustomerAccount
+        GetCustomer $getCustomer
     ) {
         $this->paymentTokenManagement = $paymentTokenManagement;
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
     }
 
     /**
@@ -50,12 +50,9 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
+        $customer = $this->getCustomer->execute($context);
 
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        $tokens = $this->paymentTokenManagement->getVisibleAvailableTokens($currentUserId);
+        $tokens = $this->paymentTokenManagement->getVisibleAvailableTokens($customer->getId());
         $result = [];
 
         foreach ($tokens as $token) {
@@ -66,7 +63,6 @@ public function resolve(
                 'details' => $token->getTokenDetails(),
             ];
         }
-
         return ['items' => $result];
     }
 }
diff --git a/app/code/Magento/Wishlist/Block/AbstractBlock.php b/app/code/Magento/Wishlist/Block/AbstractBlock.php
index bb8138fb87a3e..981a0da1d241f 100644
--- a/app/code/Magento/Wishlist/Block/AbstractBlock.php
+++ b/app/code/Magento/Wishlist/Block/AbstractBlock.php
@@ -228,7 +228,7 @@ public function hasDescription($item)
     }
 
     /**
-     * Retrieve formated Date
+     * Retrieve formatted Date
      *
      * @param string $date
      * @deprecated
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
index cafb6a5291481..40882ae00dae1 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Wishlist for item column in customer wishlist
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Model for item column in customer wishlist.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
index 2d75956858a0a..53f67626e956d 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Wishlist block customer item cart column
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Wishlist block customer item cart column.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
index 53ca78c63524d..c4c786961694b 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Edit item in customer wishlist table
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Edit item in customer wishlist table.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
index 33fb0f7325cdd..b7eaf53fc23b5 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Wishlist block customer item cart column
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Wishlist block customer item cart column.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
index 57703b9300db8..09f5014edead6 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Delete item column in customer wishlist table
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Delete item column in customer wishlist table
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Controller/Index/Allcart.php b/app/code/Magento/Wishlist/Controller/Index/Allcart.php
index 8463a00c866c5..958e0f49ca1b6 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Allcart.php
@@ -5,14 +5,17 @@
  */
 namespace Magento\Wishlist\Controller\Index;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Data\Form\FormKey\Validator;
-use Magento\Framework\App\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
 use Magento\Wishlist\Model\ItemCarrier;
 use Magento\Framework\Controller\ResultFactory;
 
-class Allcart extends \Magento\Wishlist\Controller\AbstractIndex
+/**
+ * Action Add All to Cart
+ */
+class Allcart extends \Magento\Wishlist\Controller\AbstractIndex implements HttpPostActionInterface
 {
     /**
      * @var WishlistProviderInterface
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
new file mode 100644
index 0000000000000..fb0113eb6ae75
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Test\Unit\Model\Product;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Wishlist\Model\Product\AttributeValueProvider;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+
+/**
+ * AttributeValueProviderTest
+ */
+class AttributeValueProviderTest extends TestCase
+{
+    /**
+     * @var AttributeValueProvider|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeValueProvider;
+
+    /**
+     * @var CollectionFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productCollectionFactoryMock;
+
+    /**
+     * @var Product|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productMock;
+
+    /**
+     * @var AdapterInterface|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->productCollectionFactoryMock = $this->createPartialMock(
+            CollectionFactory::class,
+            ['create']
+        );
+        $this->attributeValueProvider = new AttributeValueProvider(
+            $this->productCollectionFactoryMock
+        );
+    }
+
+    /**
+     * Get attribute text when the flat table is disabled
+     *
+     * @param int $productId
+     * @param string $attributeCode
+     * @param string $attributeText
+     * @return void
+     * @dataProvider attributeDataProvider
+     */
+    public function testGetAttributeTextWhenFlatIsDisabled(int $productId, string $attributeCode, string $attributeText)
+    {
+        $this->productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData'])
+            ->getMock();
+
+        $this->productMock->expects($this->any())
+            ->method('getData')
+            ->with($attributeCode)
+            ->willReturn($attributeText);
+
+        $productCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'addIdFilter', 'addStoreFilter', 'addAttributeToSelect', 'isEnabledFlat', 'getFirstItem'
+            ])->getMock();
+
+        $productCollection->expects($this->any())
+            ->method('addIdFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addStoreFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addAttributeToSelect')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('isEnabledFlat')
+            ->willReturn(false);
+        $productCollection->expects($this->any())
+            ->method('getFirstItem')
+            ->willReturn($this->productMock);
+
+        $this->productCollectionFactoryMock->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($productCollection);
+
+        $actual = $this->attributeValueProvider->getRawAttributeValue($productId, $attributeCode);
+
+        $this->assertEquals($attributeText, $actual);
+    }
+
+    /**
+     * Get attribute text when the flat table is enabled
+     *
+     * @dataProvider attributeDataProvider
+     * @param int $productId
+     * @param string $attributeCode
+     * @param string $attributeText
+     * @return void
+     */
+    public function testGetAttributeTextWhenFlatIsEnabled(int $productId, string $attributeCode, string $attributeText)
+    {
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)->getMockForAbstractClass();
+        $this->connectionMock->expects($this->any())
+            ->method('fetchRow')
+            ->willReturn([
+                $attributeCode => $attributeText
+            ]);
+        $this->productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData'])
+            ->getMock();
+        $this->productMock->expects($this->any())
+            ->method('getData')
+            ->with($attributeCode)
+            ->willReturn($attributeText);
+
+        $productCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'addIdFilter', 'addStoreFilter', 'addAttributeToSelect', 'isEnabledFlat', 'getConnection'
+            ])->getMock();
+
+        $productCollection->expects($this->any())
+            ->method('addIdFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addStoreFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addAttributeToSelect')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('isEnabledFlat')
+            ->willReturn(true);
+        $productCollection->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->productCollectionFactoryMock->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($productCollection);
+
+        $actual = $this->attributeValueProvider->getRawAttributeValue($productId, $attributeCode);
+
+        $this->assertEquals($attributeText, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function attributeDataProvider(): array
+    {
+        return [
+            [1, 'attribute_code', 'Attribute Text']
+        ];
+    }
+}
diff --git a/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php b/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php
new file mode 100644
index 0000000000000..5e4c6b39f3c36
--- /dev/null
+++ b/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\ViewModel;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\CatalogInventory\Model\StockRegistry;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * ViewModel for Wishlist Cart Block
+ */
+class AllowedQuantity implements ArgumentInterface
+{
+    /**
+     * @var StockRegistry
+     */
+    private $stockRegistry;
+
+    /**
+     * @var ItemInterface
+     */
+    private $item;
+
+    /**
+     * @param StockRegistry $stockRegistry
+     */
+    public function __construct(StockRegistry $stockRegistry)
+    {
+        $this->stockRegistry = $stockRegistry;
+    }
+
+    /**
+     * Set product configuration item
+     *
+     * @param ItemInterface $item
+     * @return self
+     */
+    public function setItem(ItemInterface $item): self
+    {
+        $this->item = $item;
+        return $this;
+    }
+
+    /**
+     * Get product configuration item
+     *
+     * @return ItemInterface
+     */
+    public function getItem(): ItemInterface
+    {
+        return $this->item;
+    }
+
+    /**
+     * Get min and max qty for wishlist form.
+     *
+     * @return array
+     */
+    public function getMinMaxQty(): array
+    {
+        $product = $this->getItem()->getProduct();
+        $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
+        $params = [];
+
+        $params['minAllowed'] = (float)$stockItem->getMinSaleQty();
+        if ($stockItem->getMaxSaleQty()) {
+            $params['maxAllowed'] = (float)$stockItem->getMaxSaleQty();
+        } else {
+            $params['maxAllowed'] = (float)StockDataFilter::MAX_QTY_VALUE;
+        }
+
+        return $params;
+    }
+}
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
index d3f21dda9ccde..d4c3cc7fadd84 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
@@ -18,6 +18,7 @@
                 <block class="Magento\Wishlist\Block\Customer\Wishlist\Items" name="customer.wishlist.items" as="items" template="Magento_Wishlist::item/list.phtml" cacheable="false">
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Image" name="customer.wishlist.item.image" template="Magento_Wishlist::item/column/image.phtml" cacheable="false"/>
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Info" name="customer.wishlist.item.name" template="Magento_Wishlist::item/column/name.phtml" cacheable="false"/>
+                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.review" template="Magento_Wishlist::item/column/review.phtml" cacheable="false"/>
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.price" template="Magento_Wishlist::item/column/price.phtml" cacheable="false">
                         <block class="Magento\Catalog\Pricing\Render" name="product.price.render.wishlist">
                             <arguments>
@@ -40,6 +41,7 @@
                         </block>
                         <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.cart" template="Magento_Wishlist::item/column/cart.phtml" cacheable="false">
                             <arguments>
+                                <argument name="allowedQuantityViewModel" xsi:type="object">Magento\Wishlist\ViewModel\AllowedQuantity</argument>
                                 <argument name="title" translate="true" xsi:type="string">Add to Cart</argument>
                             </arguments>
                         </block>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
index 9ea0d1a823235..6cb32d70ee1d8 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
@@ -11,6 +11,9 @@
 /** @var \Magento\Wishlist\Model\Item $item */
 $item = $block->getItem();
 $product = $item->getProduct();
+/** @var \Magento\Wishlist\ViewModel\AllowedQuantity $viewModel */
+$viewModel = $block->getData('allowedQuantityViewModel');
+$allowedQty = $viewModel->setItem($item)->getMinMaxQty();
 ?>
 <?php foreach ($block->getChildNames() as $childName): ?>
     <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
@@ -21,7 +24,7 @@ $product = $item->getProduct();
         <div class="field qty">
             <label class="label" for="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
             <div class="control">
-                <input type="number" data-role="qty" id="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true}"
+                <input type="number" data-role="qty" id="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true, 'validate-item-quantity':{'minAllowed':<?= /* @noEscape */ $allowedQty['minAllowed'] ?>,'maxAllowed':<?= /* @noEscape */ $allowedQty['maxAllowed'] ?>}}"
                name="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" value="<?= /* @noEscape */ (int)($block->getAddToCartQty($item) * 1) ?>">
             </div>
         </div>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
new file mode 100644
index 0000000000000..9120cc9fa684e
--- /dev/null
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
+$product = $block->getItem()->getProduct();
+?>
+<?= $block->getReviewsSummaryHtml($product, 'short') ?>
diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
index fc69afe2907ab..747f2a4baaaa9 100644
--- a/app/code/Magento/WishlistAnalytics/composer.json
+++ b/app/code/Magento/WishlistAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-wishlist": "*"
+        "magento/module-wishlist": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
index e3a788af2ea7e..792928ab61aaf 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
@@ -13,6 +13,7 @@
 use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResourceModel;
 use Magento\Wishlist\Model\Wishlist;
 use Magento\Wishlist\Model\WishlistFactory;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 
 /**
  * Fetches the Wishlist data according to the GraphQL schema
@@ -51,6 +52,10 @@ public function resolve(
     ) {
         $customerId = $context->getUserId();
 
+        /* Guest checking */
+        if (!$customerId && 0 === $customerId) {
+            throw new GraphQlAuthorizationException(__('The current user cannot perform operations on wishlist'));
+        }
         /** @var Wishlist $wishlist */
         $wishlist = $this->wishlistFactory->create();
         $this->wishlistResource->load($wishlist, $customerId, 'customer_id');
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less
index 832c66b7988e0..bf7ee7850f9d0 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less
@@ -42,4 +42,5 @@
     color: @page-title__color;
     font-size: @page-title__font-size;
     margin-bottom: 0;
+    word-break: break-all;
 }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
index 08434727ccc9c..8499ecaa48c12 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
@@ -45,6 +45,10 @@
 .page-actions {
     @_page-action__indent: 1.3rem;
 
+    &.floating-header {
+        &:extend(.page-actions-buttons all);
+    }
+
     .page-main-actions & {
         &._fixed {
             left: @page-wrapper__indent-left;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less
index c0c94eaaf3507..05e6350c88d8e 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less
@@ -38,7 +38,7 @@
     .admin__legend {
         .admin__field-tooltip {
             margin-left: -@indent__base;
-            margin-top: -.2rem;
+            margin-top: .5rem;
         }
     }
 }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
index 6e03e1d0cebaa..e37e08f3b667d 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
@@ -99,7 +99,7 @@
     }
 
     .action-menu {
-        max-height: 3.85rem * @data-grid-search-control-action-menu-item__quantity; // ToDo UI: change static item height
+        max-height: 3.85rem * @data-grid-search-control-action-menu-item__quantity; // @todo: change static item height
         overflow-y: auto;
         z-index: @data-grid-search-menu__z-index;
     }
@@ -354,6 +354,7 @@
 
 .admin__current-filters-list-wrap {
     width: 100%;
+    word-break: break-all;
 }
 
 .admin__current-filters-list {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
index 1cc61bef5da07..1c45fe6946ba0 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
@@ -7,6 +7,14 @@
 //  Actions -> Action select
 //  _____________________________________________
 
+//
+//  Variables
+//  _____________________________________________
+
+@_dropdown__padding-right: @action__height;
+@_triangle__height: @button-marker-triangle__height;
+@_triangle__width: @button-marker-triangle__width;
+
 //  Action select have the same visual styles and functionality as native <select>
 .action-select-wrap {
     @_action-select__border-color: @button__border-color;
@@ -18,9 +26,9 @@
 
     .action-select {
         .action-toggle-triangle(
-        @_dropdown__padding-right: @_action-select-toggle__size;
-        @_triangle__height: @button-marker-triangle__height;
-        @_triangle__width: @button-marker-triangle__width;
+        @_dropdown__padding-right;
+        @_triangle__height;
+        @_triangle__width;
         );
         .lib-text-overflow-ellipsis();
 
@@ -108,12 +116,9 @@
             min-width: 100%;
             position: static;
 
-            ._parent._visible {
-                position: relative;
-            }
-
             .action-submenu {
                 position: absolute;
+                right: -100%;
             }
         }
     }
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
index 4479c070a4e17..8dec680b58726 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
@@ -55,31 +55,3 @@
         }
     }
 }
-
-//
-//  Desktop
-//  _____________________________________________
-
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-    //  ToDo UI: remove with global blank theme .field.required update
-    .opc-wrapper {
-        .fieldset {
-            > .field {
-                &.required,
-                &._required {
-                    position: relative;
-
-                    > label {
-                        padding-right: 25px;
-
-                        &:after {
-                            margin-left: @indent__s;
-                            position: absolute;
-                            top: 9px;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
index 5f8134193c67f..35445b0989e86 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -209,6 +209,13 @@
             .fieldset {
                 > .field {
                     margin: 0 0 @indent__base;
+                    
+                    &.choice {
+                        &:before {
+                            padding: 0;
+                            width: 0;
+                        }
+                    }
 
                     &.type {
                         .control {
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
index 8cf5cd313edc5..54ba530092cc0 100644
--- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -388,6 +388,17 @@
             position: relative;
         }
     }
+
+    .form.search.advanced {
+        .field.price {
+            .with-addon {
+                .input-text {
+                    flex-basis: auto;
+                    width: 100%;
+                }
+            }
+        }
+    }
 }
 
 //
@@ -452,6 +463,7 @@
     .form.send.confirmation,
     .form.password.forget,
     .form.create.account,
+    .form.search.advanced,
     .form.form-orders-search {
         min-width: 600px;
         width: 50%;
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index d5f90d3e6d546..3b4da1d1ae6f5 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -397,6 +397,7 @@
 
     .box-tocart {
         &:extend(.abs-box-tocart all);
+        
         .field.qty {
         }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index d477c08fc9553..e5915969c91b9 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -397,7 +397,7 @@
     .page-products.page-layout-3columns {
         .products-grid {
             .product-item {
-                margin-left: 2%;
+                margin-left: 0;
                 width: calc(~'(100% - 4%) / 3');
 
                 &:nth-child(3n + 1) {
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 0f91f857a715c..31859a46d3efe 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
@@ -213,7 +213,7 @@
 //  Mobile
 //  _____________________________________________
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .block-search {
         margin-top: @indent__s;
     }
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
index 7265d7bd61c51..5ca3322403102 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
@@ -416,7 +416,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .minicart-wrapper {
         margin-top: @indent__s;
     }
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 5b0f717ff15bc..bd8ddde98c506 100755
--- 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
@@ -408,6 +408,7 @@
     .form.send.confirmation,
     .form.password.forget,
     .form.create.account,
+    .form.search.advanced,
     .form.form-orders-search {
         min-width: 600px;
         width: 50%;
@@ -608,4 +609,15 @@
             position: relative;
         }
     }
+
+    .form.search.advanced {
+        .field.price {
+            .with-addon {
+                .input-text {
+                    flex-basis: auto;
+                    width: 100%;
+                }
+            }
+        }
+    }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
index fe49d6679a613..e9c40f6386246 100644
--- a/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
@@ -70,6 +70,10 @@
                 clear: left;
             }
         }
+
+        .box-tocart {
+            margin-top: @indent__s;
+        }
     }
 }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
index 8c4084fcaf496..e467aa843e2f4 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
@@ -51,7 +51,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
index 68f1886986c5b..385110f8f037e 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
@@ -49,7 +49,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
index f2b9c9274bbcf..1be46c8239ee2 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
@@ -398,6 +398,17 @@
         &.orders-recent {
             &:extend(.abs-account-table-margin-mobile all);
             &:extend(.abs-no-border-top all);
+            .table-order-items {
+                &.table {
+                    tbody {
+                        > tr {
+                            > td.col {
+                                padding-left: 0;
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 
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 4d990a82cb7e4..1f1ea93d0b54a 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
@@ -453,7 +453,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .logo {
         margin-bottom: 13px;
         margin-top: 4px;
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 19543375aad58..d0b45ea16c855 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -38,7 +38,7 @@
     <preference for="Magento\Framework\Locale\ListsInterface" type="Magento\Framework\Locale\TranslatedLists" />
     <preference for="Magento\Framework\Locale\AvailableLocalesInterface" type="Magento\Framework\Locale\Deployed\Codes" />
     <preference for="Magento\Framework\Locale\OptionInterface" type="Magento\Framework\Locale\Deployed\Options" />
-    <preference for="Magento\Framework\Lock\LockManagerInterface" type="Magento\Framework\Lock\Backend\Database" />
+    <preference for="Magento\Framework\Lock\LockManagerInterface" type="Magento\Framework\Lock\Proxy" />
     <preference for="Magento\Framework\Api\AttributeTypeResolverInterface" type="Magento\Framework\Reflection\AttributeTypeResolver" />
     <preference for="Magento\Framework\Api\Search\SearchResultInterface" type="Magento\Framework\Api\Search\SearchResult" />
     <preference for="Magento\Framework\Api\Search\SearchCriteriaInterface" type="Magento\Framework\Api\Search\SearchCriteria"/>
@@ -1757,4 +1757,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Cache\LockGuardedCacheLoader">
+        <arguments>
+            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
+            <argument name="lockTimeout" xsi:type="number">10000</argument>
+            <argument name="delayTimeout" xsi:type="number">20</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/composer.json b/composer.json
index 9ef896c7e72cc..50b22238e0d01 100644
--- a/composer.json
+++ b/composer.json
@@ -181,6 +181,8 @@
         "magento/module-media-storage": "*",
         "magento/module-message-queue": "*",
         "magento/module-msrp": "*",
+        "magento/module-msrp-configurable-product": "*",
+        "magento/module-msrp-grouped-product": "*",
         "magento/module-multishipping": "*",
         "magento/module-mysql-mq": "*",
         "magento/module-new-relic-reporting": "*",
diff --git a/composer.lock b/composer.lock
index 84e89277a95db..a7131f4a16eec 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3cdccc93cc990b4212377b1d01a8c4ef",
+    "content-hash": "60007664938710edf52eadddd7551867",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -257,16 +257,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "1.8.3",
+            "version": "1.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "a6a3b44581398b7135c7baa0557b7c5b10808b47"
+                "reference": "bc364c2480c17941e2135cfc568fa41794392534"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/a6a3b44581398b7135c7baa0557b7c5b10808b47",
-                "reference": "a6a3b44581398b7135c7baa0557b7c5b10808b47",
+                "url": "https://api.github.com/repos/composer/composer/zipball/bc364c2480c17941e2135cfc568fa41794392534",
+                "reference": "bc364c2480c17941e2135cfc568fa41794392534",
                 "shasum": ""
             },
             "require": {
@@ -333,7 +333,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2019-01-30T07:31:34+00:00"
+            "time": "2019-02-11T09:52:10+00:00"
         },
         {
             "name": "composer/semver",
@@ -1912,7 +1912,7 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -2028,16 +2028,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7c16ebc2629827d4ec915a52ac809768d060a4ee"
+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7c16ebc2629827d4ec915a52ac809768d060a4ee",
-                "reference": "7c16ebc2629827d4ec915a52ac809768d060a4ee",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e16b9e471703b2c60b95f14d31c1239f68f11601",
+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601",
                 "shasum": ""
             },
             "require": {
@@ -2074,20 +2074,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
+            "time": "2019-02-07T11:40:08+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c"
+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ef71816cbb264988bb57fe6a73f610888b9aa70c",
-                "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a",
+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a",
                 "shasum": ""
             },
             "require": {
@@ -2123,7 +2123,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
+            "time": "2019-02-23T15:42:05+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2753,16 +2753,16 @@
         },
         {
             "name": "zendframework/zend-db",
-            "version": "2.9.3",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-db.git",
-                "reference": "5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9"
+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9",
-                "reference": "5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9",
+                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
                 "shasum": ""
             },
             "require": {
@@ -2773,7 +2773,7 @@
                 "phpunit/phpunit": "^5.7.25 || ^6.4.4",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-hydrator": "^1.1 || ^2.1",
+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
                 "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
             },
             "suggest": {
@@ -2807,7 +2807,7 @@
                 "db",
                 "zf"
             ],
-            "time": "2018-04-09T13:21:36+00:00"
+            "time": "2019-02-25T11:37:45+00:00"
         },
         {
             "name": "zendframework/zend-di",
@@ -4377,16 +4377,16 @@
         },
         {
             "name": "zendframework/zend-uri",
-            "version": "2.6.1",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-uri.git",
-                "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f"
+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/3b6463645c6766f78ce537c70cb4fdabee1e725f",
-                "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f",
+                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/b2785cd38fe379a784645449db86f21b7739b1ee",
+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee",
                 "shasum": ""
             },
             "require": {
@@ -4401,8 +4401,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
@@ -4420,7 +4420,7 @@
                 "uri",
                 "zf"
             ],
-            "time": "2018-04-30T13:40:08+00:00"
+            "time": "2019-02-27T21:39:04+00:00"
         },
         {
             "name": "zendframework/zend-validator",
@@ -4889,16 +4889,16 @@
         },
         {
             "name": "codeception/phpunit-wrapper",
-            "version": "6.5.1",
+            "version": "6.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "d78f9eb9c4300a5924cc27dee03e8c1a96fcf5f3"
+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/d78f9eb9c4300a5924cc27dee03e8c1a96fcf5f3",
-                "reference": "d78f9eb9c4300a5924cc27dee03e8c1a96fcf5f3",
+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
+                "reference": "d0da25a98bcebeb15d97c2ad3b2de6166b6e7a0c",
                 "shasum": ""
             },
             "require": {
@@ -4912,7 +4912,7 @@
             },
             "require-dev": {
                 "codeception/specify": "*",
-                "vlucas/phpdotenv": "^2.4"
+                "vlucas/phpdotenv": "^3.0"
             },
             "type": "library",
             "autoload": {
@@ -4931,24 +4931,24 @@
                 }
             ],
             "description": "PHPUnit classes used by Codeception",
-            "time": "2019-01-13T10:34:55+00:00"
+            "time": "2019-02-26T20:47:39+00:00"
         },
         {
             "name": "codeception/stub",
-            "version": "2.0.4",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Stub.git",
-                "reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e"
+                "reference": "853657f988942f7afb69becf3fd0059f192c705a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/f50bc271f392a2836ff80690ce0c058efe1ae03e",
-                "reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
+                "reference": "853657f988942f7afb69becf3fd0059f192c705a",
                 "shasum": ""
             },
             "require": {
-                "phpunit/phpunit": ">=4.8 <8.0"
+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
             },
             "type": "library",
             "autoload": {
@@ -4961,7 +4961,7 @@
                 "MIT"
             ],
             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2018-07-26T11:55:37+00:00"
+            "time": "2019-03-02T15:35:10+00:00"
         },
         {
             "name": "consolidation/annotated-command",
@@ -5061,16 +5061,16 @@
         },
         {
             "name": "consolidation/config",
-            "version": "1.1.1",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/config.git",
-                "reference": "925231dfff32f05b787e1fddb265e789b939cf4c"
+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/config/zipball/925231dfff32f05b787e1fddb265e789b939cf4c",
-                "reference": "925231dfff32f05b787e1fddb265e789b939cf4c",
+                "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
                 "shasum": ""
             },
             "require": {
@@ -5079,9 +5079,9 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^1",
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
                 "phpunit/phpunit": "^5",
-                "satooshi/php-coveralls": "^1.0",
                 "squizlabs/php_codesniffer": "2.*",
                 "symfony/console": "^2.5|^3|^4",
                 "symfony/yaml": "^2.8.11|^3|^4"
@@ -5091,6 +5091,33 @@
             },
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require-dev": {
+                            "symfony/console": "^4.0"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require-dev": {
+                            "symfony/console": "^2.8",
+                            "symfony/event-dispatcher": "^2.8",
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        }
+                    }
+                },
                 "branch-alias": {
                     "dev-master": "1.x-dev"
                 }
@@ -5111,7 +5138,7 @@
                 }
             ],
             "description": "Provide configuration services for a commandline tool.",
-            "time": "2018-10-24T17:55:35+00:00"
+            "time": "2019-03-03T19:37:04+00:00"
         },
         {
             "name": "consolidation/log",
@@ -5261,16 +5288,16 @@
         },
         {
             "name": "consolidation/robo",
-            "version": "1.4.4",
+            "version": "1.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "8bec6a6ea54a7d03d56552a4250c49dec3b3083d"
+                "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/8bec6a6ea54a7d03d56552a4250c49dec3b3083d",
-                "reference": "8bec6a6ea54a7d03d56552a4250c49dec3b3083d",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3",
+                "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3",
                 "shasum": ""
             },
             "require": {
@@ -5365,7 +5392,7 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2019-02-08T20:59:23+00:00"
+            "time": "2019-02-17T05:32:27+00:00"
         },
         {
             "name": "consolidation/self-update",
@@ -8559,16 +8586,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "ee4462581eb54bf34b746e4a5d522a4f21620160"
+                "reference": "61d85c5af2fc058014c7c89504c3944e73a086f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ee4462581eb54bf34b746e4a5d522a4f21620160",
-                "reference": "ee4462581eb54bf34b746e4a5d522a4f21620160",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/61d85c5af2fc058014c7c89504c3944e73a086f0",
+                "reference": "61d85c5af2fc058014c7c89504c3944e73a086f0",
                 "shasum": ""
             },
             "require": {
@@ -8612,20 +8639,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T21:31:25+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "25a2e7abe0d97e70282537292e3df45cf6da7b98"
+                "reference": "7f70d79c7a24a94f8e98abb988049403a53d7b31"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/25a2e7abe0d97e70282537292e3df45cf6da7b98",
-                "reference": "25a2e7abe0d97e70282537292e3df45cf6da7b98",
+                "url": "https://api.github.com/repos/symfony/config/zipball/7f70d79c7a24a94f8e98abb988049403a53d7b31",
+                "reference": "7f70d79c7a24a94f8e98abb988049403a53d7b31",
                 "shasum": ""
             },
             "require": {
@@ -8675,7 +8702,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-30T11:44:30+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
         },
         {
             "name": "symfony/contracts",
@@ -8747,16 +8774,16 @@
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "72c14cbc0c27706b9b4c33b9cd7a280972ff4806"
+                "reference": "cdadb3765df7c89ac93628743913b92bb91f1704"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/72c14cbc0c27706b9b4c33b9cd7a280972ff4806",
-                "reference": "72c14cbc0c27706b9b4c33b9cd7a280972ff4806",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/cdadb3765df7c89ac93628743913b92bb91f1704",
+                "reference": "cdadb3765df7c89ac93628743913b92bb91f1704",
                 "shasum": ""
             },
             "require": {
@@ -8816,20 +8843,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-30T17:51:38+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "d8476760b04cdf7b499c8718aa437c20a9155103"
+                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d8476760b04cdf7b499c8718aa437c20a9155103",
-                "reference": "d8476760b04cdf7b499c8718aa437c20a9155103",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/53c97769814c80a84a8403efcf3ae7ae966d53bb",
+                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb",
                 "shasum": ""
             },
             "require": {
@@ -8873,20 +8900,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "8d2318b73e0a1bc75baa699d00ebe2ae8b595a39"
+                "reference": "850a667d6254ccf6c61d853407b16f21c4579c77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8d2318b73e0a1bc75baa699d00ebe2ae8b595a39",
-                "reference": "8d2318b73e0a1bc75baa699d00ebe2ae8b595a39",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/850a667d6254ccf6c61d853407b16f21c4579c77",
+                "reference": "850a667d6254ccf6c61d853407b16f21c4579c77",
                 "shasum": ""
             },
             "require": {
@@ -8927,20 +8954,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-29T09:49:29+00:00"
+            "time": "2019-02-26T08:03:39+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "831b272963a8aa5a0613a1a7f013322d8161bbbb"
+                "reference": "3896e5a7d06fd15fa4947694c8dcdd371ff147d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/831b272963a8aa5a0613a1a7f013322d8161bbbb",
-                "reference": "831b272963a8aa5a0613a1a7f013322d8161bbbb",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3896e5a7d06fd15fa4947694c8dcdd371ff147d1",
+                "reference": "3896e5a7d06fd15fa4947694c8dcdd371ff147d1",
                 "shasum": ""
             },
             "require": {
@@ -8981,7 +9008,7 @@
                 "configuration",
                 "options"
             ],
-            "time": "2019-01-16T21:31:25+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -9099,7 +9126,7 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v4.2.3",
+            "version": "v4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -9149,16 +9176,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.4.22",
+            "version": "v3.4.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d"
+                "reference": "57f1ce82c997f5a8701b89ef970e36bb657fd09c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/ba11776e9e6c15ad5759a07bffb15899bac75c2d",
-                "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/57f1ce82c997f5a8701b89ef970e36bb657fd09c",
+                "reference": "57f1ce82c997f5a8701b89ef970e36bb657fd09c",
                 "shasum": ""
             },
             "require": {
@@ -9204,7 +9231,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T10:59:17+00:00"
+            "time": "2019-02-23T15:06:07+00:00"
         },
         {
             "name": "theseer/fdomdocument",
diff --git a/dev/tests/acceptance/tests/_data/catalog_import_products.csv b/dev/tests/acceptance/tests/_data/catalog_import_products.csv
new file mode 100644
index 0000000000000..7732f15d4ce3a
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/catalog_import_products.csv
@@ -0,0 +1,4 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus
+SimpleProductForTest1,,Default,simple,"Default","base,second_website",SimpleProductAfterImport1,,,1.0000,1,"Taxable Goods","Catalog, Search",250.0000,,,,simple-product-for-test-1,,,,,,,,,,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,
+SimpleProductForTest2,,Default,simple,"Default",base,SimpleProductAfterImport2,,,1.0000,1,"Taxable Goods","Catalog, Search",300.0000,,,,simple-product-for-test-2,,,,,,,,,,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,
+SimpleProductForTest3,,Default,simple,"Default","base,second_website",SimpleProductAfterImport3,,,1.0000,1,"Taxable Goods","Catalog, Search",350.0000,,,,simple-product-for-test-3,,,,,,,,,,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,
\ No newline at end of file
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
index 1419aff867d2d..f62be7328481c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
@@ -18,14 +18,11 @@
 class CategoryProductsVariantsTest extends GraphQlAbstract
 {
     /**
-     *
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetSimpleProductsFromCategory()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/360');
-
         $query
             = <<<QUERY
 {
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 c5fd2c49b9924..cbce53325e9e6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Framework\DataObject;
+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -28,7 +29,6 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -70,14 +70,7 @@ public function testCategoriesTree()
     }
 }
 QUERY;
-        // get customer ID token
-        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = $this->objectManager->create(
-            \Magento\Integration\Api\CustomerTokenServiceInterface::class
-        );
-        $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $response = $this->graphQlQuery($query);
         $responseDataObject = new DataObject($response);
         //Some sort of smoke testing
         self::assertEquals(
@@ -111,39 +104,37 @@ public function testCategoriesTree()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testGetCategoryById()
     {
-        $rootCategoryId = 13;
+        $categoryId = 13;
         $query = <<<QUERY
 {
-  category(id: {$rootCategoryId}) {
+  category(id: {$categoryId}) {
       id
       name
   }
 }
 QUERY;
-        // get customer ID token
-        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = $this->objectManager->create(
-            \Magento\Integration\Api\CustomerTokenServiceInterface::class
-        );
-        $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
-        $responseDataObject = new DataObject($response);
-        //Some sort of smoke testing
-        self::assertEquals(
-            'Category 1.2',
-            $responseDataObject->getData('category/name')
-        );
-        self::assertEquals(
-            13,
-            $responseDataObject->getData('category/id')
-        );
+        $response = $this->graphQlQuery($query);
+        self::assertEquals('Category 1.2', $response['category']['name']);
+        self::assertEquals(13, $response['category']['id']);
+    }
+
+    public function testNonExistentCategoryWithProductCount()
+    {
+        $query = <<<QUERY
+{
+  category(id: 99) {
+      product_count
+    }
+}
+QUERY;
+
+        $this->expectException(ResponseContainsErrorsException::class);
+        $this->expectExceptionMessage('GraphQL response contains errors: Category doesn\'t exist');
+        $this->graphQlQuery($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
index a7c83aba89f0a..e517b22ad09de 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
@@ -137,6 +137,26 @@ public function testQueryAllFieldsSimpleProduct()
                     sort_order
                   }
                 }
+                ... on CustomizableCheckboxOption {
+                  checkbox_option: value {
+                    option_type_id
+                    sku
+                    price
+                    price_type
+                    title
+                    sort_order
+                  }
+                }
+                ... on CustomizableMultipleOption {
+                  multiple_option: value {
+                    option_type_id
+                    sku
+                    price
+                    price_type
+                    title
+                    sort_order
+                  }
+                }
                 ...on CustomizableFileOption {
                     product_sku
                     file_option: value {
@@ -736,7 +756,7 @@ private function assertOptions($product, $actualResponse)
                         $values = $option->getValues();
                         /** @var \Magento\Catalog\Model\Product\Option\Value $value */
                         $value = current($values);
-                        $findValueKeyName = $option->getType() === 'radio' ? 'radio_option' : 'drop_down_option';
+                        $findValueKeyName = $option->getType() . '_option';
                         if ($value->getTitle() === $optionsArray[$findValueKeyName][0]['title']) {
                             $match = true;
                         }
@@ -756,7 +776,7 @@ private function assertOptions($product, $actualResponse)
             ];
 
             if (!empty($option->getValues())) {
-                $valueKeyName = $option->getType() === 'radio' ? 'radio_option' : 'drop_down_option';
+                $valueKeyName = $option->getType() . '_option';
                 $value = current($optionsArray[$valueKeyName]);
                 /** @var \Magento\Catalog\Model\Product\Option\Value $productValue */
                 $productValue = current($option->getValues());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
new file mode 100644
index 0000000000000..17c2af8dc59d0
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\CatalogInventory;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+
+class AddProductToCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The requested qty is not available
+     */
+    public function testAddProductIfQuantityIsNotAvailable()
+    {
+        $sku = 'simple';
+        $qty = 200;
+
+        $maskedQuoteId = $this->getMaskedQuoteId();
+        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
+        $this->graphQlQuery($query);
+        self::fail('Should be "The requested qty is not available" error message.');
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoConfigFixture default cataloginventory/item_options/max_sale_qty 5
+     * @expectedException \Exception
+     * @expectedExceptionMessage The most you may purchase is 5.
+     */
+    public function testAddMoreProductsThatAllowed()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167');
+
+        $sku = 'custom-design-simple-product';
+        $qty = 7;
+
+        $maskedQuoteId = $this->getMaskedQuoteId();
+        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
+        $this->graphQlQuery($query);
+        self::fail('Should be "The most you may purchase is 5." error message.');
+    }
+
+    /**
+     * @return string
+     */
+    public function getMaskedQuoteId() : string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $sku
+     * @param int $qty
+     * @return string
+     */
+    public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int $qty) : string
+    {
+        return <<<QUERY
+mutation {  
+  addSimpleProductsToCart(
+    input: {
+      cart_id: "{$maskedQuoteId}", 
+      cartItems: [
+        {
+          data: {
+            qty: $qty
+            sku: "$sku"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      items {
+        qty
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
index c25eed1fd6511..da5410384627c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
@@ -28,8 +28,6 @@ class ConfigurableProductViewTest extends GraphQlAbstract
      */
     public function testQueryConfigurableProductLinks()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/361');
-
         $productSku = 'configurable';
 
         $query
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
index f4e96e49a58e6..84c111bd25fd4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
@@ -77,7 +77,6 @@ public function testChangePasswordIfUserIsNotAuthorizedTest()
      */
     public function testChangeWeakPassword()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/190');
         $customerEmail = 'customer@example.com';
         $oldCustomerPassword = 'password';
         $newCustomerPassword = 'weakpass';
@@ -94,7 +93,7 @@ public function testChangeWeakPassword()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The password doesn't match this account. Verify the password and try again.
+     * @expectedExceptionMessage Invalid login or password.
      */
     public function testChangePasswordIfPasswordIsInvalid()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
index ba0232020298f..1153b9662b41a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
@@ -132,7 +132,7 @@ public function testDeleteDefaultBillingCustomerAddress()
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      *
      * @expectedException \Exception
-     * @expectedExceptionMessage Address id 9999 does not exist.
+     * @expectedExceptionMessage Could not find a address with ID "9999"
      */
     public function testDeleteNonExistCustomerAddress()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
index c11c1385f7412..df45e1de771d9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
@@ -47,33 +47,57 @@ public function testUpdateCustomer()
         $currentEmail = 'customer@example.com';
         $currentPassword = 'password';
 
+        $newPrefix = 'Dr';
         $newFirstname = 'Richard';
+        $newMiddlename = 'Riley';
         $newLastname = 'Rowe';
+        $newSuffix = 'III';
+        $newDob = '3/11/1972';
+        $newTaxVat = 'GQL1234567';
+        $newGender = 2;
         $newEmail = 'customer_updated@example.com';
 
         $query = <<<QUERY
 mutation {
     updateCustomer(
         input: {
+            prefix: "{$newPrefix}"
             firstname: "{$newFirstname}"
+            middlename: "{$newMiddlename}"
             lastname: "{$newLastname}"
+            suffix: "{$newSuffix}"
+            dob: "{$newDob}"
+            taxvat: "{$newTaxVat}"
             email: "{$newEmail}"
             password: "{$currentPassword}"
+            gender: {$newGender}
         }
     ) {
         customer {
+            prefix
             firstname
+            middlename
             lastname
+            suffix
+            dob
+            taxvat
             email
+            gender
         }
     }
 }
 QUERY;
         $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
 
+        $this->assertEquals($newPrefix, $response['updateCustomer']['customer']['prefix']);
         $this->assertEquals($newFirstname, $response['updateCustomer']['customer']['firstname']);
+        $this->assertEquals($newMiddlename, $response['updateCustomer']['customer']['middlename']);
         $this->assertEquals($newLastname, $response['updateCustomer']['customer']['lastname']);
+        $this->assertEquals($newSuffix, $response['updateCustomer']['customer']['suffix']);
+        $this->assertEquals($newDob, $response['updateCustomer']['customer']['dob']);
+        $this->assertEquals($newTaxVat, $response['updateCustomer']['customer']['taxvat']);
         $this->assertEquals($newEmail, $response['updateCustomer']['customer']['email']);
+        $this->assertEquals($newGender, $response['updateCustomer']['customer']['gender']);
     }
 
     /**
@@ -185,7 +209,7 @@ public function testUpdateEmailIfPasswordIsMissed()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The password doesn't match this account. Verify the password and try again.
+     * @expectedExceptionMessage Invalid login or password.
      */
     public function testUpdateEmailIfPasswordIsInvalid()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php
index 1ff0b53dda0bb..ad5d71cb08605 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php
@@ -21,8 +21,8 @@ public function testGetCurrency()
     currency {
         base_currency_code
         base_currency_symbol
-        default_display_currecy_code
-        default_display_currecy_symbol
+        default_display_currency_code
+        default_display_currency_symbol
         available_currency_codes
         exchange_rates {
             currency_to
@@ -36,8 +36,8 @@ public function testGetCurrency()
         $this->assertArrayHasKey('currency', $result);
         $this->assertArrayHasKey('base_currency_code', $result['currency']);
         $this->assertArrayHasKey('base_currency_symbol', $result['currency']);
-        $this->assertArrayHasKey('default_display_currecy_code', $result['currency']);
-        $this->assertArrayHasKey('default_display_currecy_symbol', $result['currency']);
+        $this->assertArrayHasKey('default_display_currency_code', $result['currency']);
+        $this->assertArrayHasKey('default_display_currency_symbol', $result['currency']);
         $this->assertArrayHasKey('available_currency_codes', $result['currency']);
         $this->assertArrayHasKey('exchange_rates', $result['currency']);
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
new file mode 100644
index 0000000000000..80acbbdb64230
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\OfflineShipping;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for setting offline shipping methods on cart
+ */
+class SetOfflineShippingMethodsOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
+     *
+     * @param string $carrierCode
+     * @param string $methodCode
+     * @param float $amount
+     * @param string $label
+     * @dataProvider offlineShippingMethodDataProvider
+     */
+    public function testSetOfflineShippingMethod(string $carrierCode, string $methodCode, float $amount, string $label)
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $shippingAddressId = (int)$quote->getShippingAddress()->getId();
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $shippingAddressId,
+            $carrierCode,
+            $methodCode
+        );
+
+        $response = $this->sendRequestWithToken($query);
+
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['carrier_code'], $carrierCode);
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['method_code'], $methodCode);
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['amount'], $amount);
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['label'], $label);
+    }
+
+    /**
+     * @return array
+     */
+    public function offlineShippingMethodDataProvider()
+    {
+        return [
+            'flatrate_flatrate' => ['flatrate', 'flatrate', 10, 'Flat Rate - Fixed'],
+            'tablerate_bestway' => ['tablerate', 'bestway', 10, 'Best Way - Table Rate'],
+            'freeshipping_freeshipping' => ['freeshipping', 'freeshipping', 0, 'Free Shipping - Free'],
+        ];
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
+     */
+    public function testSetShippingMethodTwiceInOneRequest()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $shippingAddress = $quote->getShippingAddress();
+        $shippingAddressId = $shippingAddress->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+
+        $query = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: {
+    cart_id: "$maskedQuoteId"
+    shipping_methods: [
+      {
+        cart_address_id: $shippingAddressId
+        carrier_code: "flatrate"
+        method_code: "flatrate"
+      }
+      {
+        cart_address_id: $shippingAddressId
+        carrier_code: "freeshipping"
+        method_code: "freeshipping"
+      }
+    ]
+  }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+          amount
+        }
+      }
+    } 
+  }
+}
+QUERY;
+        self::expectExceptionMessage('You cannot specify multiple shipping methods.');
+        $this->sendRequestWithToken($query);
+    }
+
+    /**
+     * Generates query for setting the specified shipping method on cart
+     *
+     * @param int $shippingAddressId
+     * @param string $maskedQuoteId
+     * @param string $carrierCode
+     * @param string $methodCode
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId,
+        int $shippingAddressId,
+        string $carrierCode,
+        string $methodCode
+    ): string {
+        return <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: {
+    cart_id: "$maskedQuoteId"
+    shipping_methods: [
+      {
+        cart_address_id: $shippingAddressId
+        carrier_code: "$carrierCode"
+        method_code: "$methodCode"
+      }
+    ]
+  }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+          amount
+        }
+      }
+    } 
+  }
+}        
+QUERY;
+    }
+
+    /**
+     * Sends a GraphQL request with using a bearer token
+     *
+     * @param string $query
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function sendRequestWithToken(string $query): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+
+        return $this->graphQlQuery($query, [], '', $headerMap);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
index d5bdb942e9b2c..d9ab8db62a195 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
@@ -9,7 +9,7 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 
@@ -21,9 +21,9 @@ class AddSimpleProductToCartTest extends GraphQlAbstract
     private $quoteResource;
 
     /**
-     * @var Quote
+     * @var QuoteFactory
      */
-    private $quote;
+    private $quoteFactory;
 
     /**
      * @var QuoteIdToMaskedQuoteIdInterface
@@ -37,27 +37,102 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddSimpleProductToCart()
+    {
+        $sku = 'simple';
+        $qty = 2;
+        $maskedQuoteId = $this->getMaskedQuoteId();
+
+        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
+        $response = $this->graphQlQuery($query);
+        self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
+
+        self::assertEquals($qty, $response['addSimpleProductsToCart']['cart']['items'][0]['qty']);
+        self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The requested qty is not available
+     * @expectedExceptionMessage Please enter a number greater than 0 in this field.
      */
-    public function testAddProductIfQuantityIsNotAvailable()
+    public function testAddSimpleProductToCartWithNegativeQty()
     {
         $sku = 'simple';
-        $qty = 200;
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $qty = -2;
+        $maskedQuoteId = $this->getMaskedQuoteId();
+
+        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @return string
+     */
+    public function getMaskedQuoteId() : string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $sku
+     * @param int $qty
+     * @return string
+     */
+    public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int $qty): string
+    {
+        return <<<QUERY
+mutation {  
+  addSimpleProductsToCart(
+    input: {
+      cart_id: "{$maskedQuoteId}"
+      cartItems: [
+        {
+          data: {
+            qty: $qty
+            sku: "$sku"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      items {
+        qty
+        product {
+          sku
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "wrong_cart_hash"
+     */
+    public function testAddProductWithWrongCartHash()
+    {
+        $sku = 'simple';
+        $qty = 1;
+
+        $maskedQuoteId = 'wrong_cart_hash';
 
         $query = <<<QUERY
 mutation {  
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index 5695aab6854d4..a7287ada093b8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -56,9 +56,86 @@ protected function setUp()
      */
     public function testGetCartWithPaymentMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
+        self::assertEquals('Check / Money order', $response['cart']['available_payment_methods'][0]['title']);
+        self::assertGreaterThan(
+            0,
+            count($response['cart']['available_payment_methods']),
+            'There are no available payment methods for customer cart!'
+        );
+    }
 
-        $query = <<<QUERY
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     */
+    public function testGetPaymentMethodsFromGuestCart()
+    {
+        $guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId(
+            'test_order_with_virtual_product_without_address'
+        );
+        $query = $this->getQuery($guestQuoteMaskedId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     */
+    public function testGetPaymentMethodsFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @magentoApiDataFixture Magento/Payment/_files/disable_all_active_payment_methods.php
+     */
+    public function testGetPaymentMethodsIfPaymentsAreNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertEquals(0, count($response['cart']['available_payment_methods']));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetPaymentMethodsOfNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId
+    ): string {
+        return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
     available_payment_methods {
@@ -68,11 +145,6 @@ public function testGetCartWithPaymentMethods()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-
-        self::assertArrayHasKey('cart', $response);
-        self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
-        self::assertEquals('Check / Money order', $response['cart']['available_payment_methods'][0]['title']);
     }
 
     /**
@@ -88,13 +160,13 @@ private function getHeaderMap(string $username = 'customer@example.com', string
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reservedOrderId
      * @return string
      */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
 
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index fe9b7b3c49a7c..4b1509eef354e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -72,8 +72,8 @@ public function testGetCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      */
     public function testGetGuestCart()
     {
@@ -114,6 +114,26 @@ public function testGetNonExistentCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Current user does not have an active cart.
+     */
+    public function testGetInactiveCart()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+        $quote->setCustomerId(1);
+        $quote->setIsActive(false);
+        $this->quoteResource->save($quote);
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * @param string $maskedQuoteId
      * @return string
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
index a351a2188a664..e80a2127ad420 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -81,14 +81,13 @@ public function testRemoveItemFromCart()
     public function testRemoveItemFromNonExistentCart()
     {
         $query = $this->prepareMutationQuery('non_existent_masked_id', 1);
-
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      */
-    public function testRemoveNotExistentItem()
+    public function testRemoveNonExistentItem()
     {
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
@@ -130,7 +129,7 @@ public function testRemoveItemIfItemIsNotBelongToCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      */
     public function testRemoveItemFromGuestCart()
@@ -183,6 +182,50 @@ public function testRemoveItemFromAnotherCustomerCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     */
+    public function testUpdateWithMissedItemRequiredParameters(string $input, string $message)
+    {
+        $query = <<<QUERY
+mutation {
+  removeItemFromCart(
+    input: {
+      {$input}
+    }
+  ) {
+    cart {
+      items {
+        qty
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'cart_item_id: 1',
+                'Required parameter "cart_id" is missing.'
+            ],
+            'missed_cart_item_id' => [
+                'cart_id: "test"',
+                'Required parameter "cart_item_id" is missing.'
+            ],
+        ];
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param int $itemId
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 96f32d781267b..55a32f7cdf653 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -90,6 +90,7 @@ public function testSetNewBillingAddress()
           code
           label
         }
+        address_type
       }
     }
   }
@@ -147,6 +148,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
           code
           label
         }
+        address_type
       }
       shipping_addresses {
         firstname
@@ -160,6 +162,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
           code
           label
         }
+        address_type
       }
     }
   }
@@ -174,7 +177,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
         self::assertArrayHasKey('shipping_addresses', $cartResponse);
         $shippingAddressResponse = current($cartResponse['shipping_addresses']);
         $this->assertNewAddressFields($billingAddressResponse);
-        $this->assertNewAddressFields($shippingAddressResponse);
+        $this->assertNewAddressFields($shippingAddressResponse, 'SHIPPING');
     }
 
     /**
@@ -373,7 +376,7 @@ public function testSetBillingAddressToAnotherCustomerCart()
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The current user cannot use address with ID "1"
+     * @expectedExceptionMessage Current customer does not have permission to address with ID "1"
      */
     public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
     {
@@ -400,12 +403,66 @@ public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testSetBillingAddressOnNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @dataProvider dataProviderSetWithoutRequiredParameters
+     * @param string $input
+     * @param string $message
+     * @throws \Exception
+     */
+    public function testSetBillingAddressWithoutRequiredParameters(string $input, string $message)
+    {
+        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      {$input}
+    }
+  ) {
+    cart {
+        billing_address {
+            city
+          }
+    }
+  }
+}
+QUERY;
+
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
-     * @param array $billingAddressResponse
+     * @param array $addressResponse
+     * @param string $addressType
      */
-    private function assertNewAddressFields(array $billingAddressResponse): void
+    private function assertNewAddressFields(array $addressResponse, string $addressType = 'BILLING'): void
     {
         $assertionMap = [
             ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
@@ -416,9 +473,10 @@ private function assertNewAddressFields(array $billingAddressResponse): void
             ['response_field' => 'postcode', 'expected_value' => '887766'],
             ['response_field' => 'telephone', 'expected_value' => '88776655'],
             ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
+            ['response_field' => 'address_type', 'expected_value' => $addressType]
         ];
 
-        $this->assertResponseFields($billingAddressResponse, $assertionMap);
+        $this->assertResponseFields($addressResponse, $assertionMap);
     }
 
     /**
@@ -481,4 +539,22 @@ private function assignQuoteToCustomer(
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
+
+    /**
+     * @return array
+     */
+    public function dataProviderSetWithoutRequiredParameters()
+    {
+        return [
+            'missed_billing_address' => [
+                'cart_id: "cart_id_value"',
+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
+                    . ' was not provided.',
+            ],
+            'missed_cart_id' => [
+                'billing_address: {}',
+                'Required parameter "cart_id" is missing'
+            ]
+        ];
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index bbc77b6c39740..51c48f5041dd9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -151,6 +151,91 @@ public function testSetPaymentMethodToAnotherCustomerCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testPaymentMethodOnNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderSetPaymentMethodWithoutRequiredParameters
+     */
+    public function testSetPaymentMethodWithoutRequiredParameters(string $input, string $message)
+    {
+        $query = <<<QUERY
+mutation {
+  setPaymentMethodOnCart(
+    input: {
+      {$input}
+    }
+  ) {
+    cart {
+      items {
+        qty
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+    /**
+     * @return array
+     */
+    public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
+                'Required parameter "cart_id" is missing.'
+            ],
+            'missed_payment_method' => [
+                'cart_id: "test"',
+                'Required parameter "code" for "payment_method" is missing.'
+            ],
+            'missed_payment_method_code' => [
+                'cart_id: "test", payment_method: {code: ""}',
+                'Required parameter "code" for "payment_method" is missing.'
+            ],
+        ];
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_payment_saved.php
+     */
+    public function testReSetPayment()
+    {
+        /** @var \Magento\Quote\Model\Quote  $quote */
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_with_payment');
+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
+        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $methodCode
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
similarity index 77%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 1f9aca2f12013..ae184b8930c07 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -5,17 +5,14 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\Quote;
+namespace Magento\GraphQl\Quote\Customer;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Multishipping\Helper\Data;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\TestFramework\ObjectManager;
 
 /**
  * Test for set shipping addresses on cart mutation
@@ -52,11 +49,12 @@ protected function setUp()
     }
 
     /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      */
-    public function testSetNewShippingAddressByGuest()
+    public function testSetNewShippingAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->assignQuoteToCustomer();
 
         $query = <<<QUERY
 mutation {
@@ -91,15 +89,16 @@ public function testSetNewShippingAddressByGuest()
         postcode
         telephone
         country {
-          code
           label
+          code
         }
+        address_type
       }
     }
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
         $cartResponse = $response['setShippingAddressesOnCart']['cart'];
@@ -109,13 +108,14 @@ public function testSetNewShippingAddressByGuest()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The current customer isn't authorized.
+     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
      */
-    public function testSetShippingAddressFromAddressBookByGuest()
+    public function testSetNewShippingAddressOnQuoteWithVirtualProducts()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_virtual_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -124,7 +124,18 @@ public function testSetShippingAddressFromAddressBookByGuest()
       cart_id: "$maskedQuoteId"
       shipping_addresses: [
         {
-          customer_address_id: 1
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
         }
       ]
     }
@@ -137,14 +148,15 @@ public function testSetShippingAddressFromAddressBookByGuest()
   }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
      */
-    public function testSetNewShippingAddressByRegisteredCustomer()
+    public function testSetShippingAddressFromAddressBook()
     {
         $maskedQuoteId = $this->assignQuoteToCustomer();
 
@@ -155,18 +167,7 @@ public function testSetNewShippingAddressByRegisteredCustomer()
       cart_id: "$maskedQuoteId"
       shipping_addresses: [
         {
-          address: {
-            firstname: "test firstname"
-            lastname: "test lastname"
-            company: "test company"
-            street: ["test street 1", "test street 2"]
-            city: "test city"
-            region: "test region"
-            postcode: "887766"
-            country_code: "US"
-            telephone: "88776655"
-            save_in_address_book: false
-          }
+          customer_address_id: 1
         }
       ]
     }
@@ -180,10 +181,6 @@ public function testSetNewShippingAddressByRegisteredCustomer()
         city
         postcode
         telephone
-        country {
-          label
-          code
-        }
       }
     }
   }
@@ -195,15 +192,16 @@ public function testSetNewShippingAddressByRegisteredCustomer()
         $cartResponse = $response['setShippingAddressesOnCart']['cart'];
         self::assertArrayHasKey('shipping_addresses', $cartResponse);
         $shippingAddressResponse = current($cartResponse['shipping_addresses']);
-        $this->assertNewShippingAddressFields($shippingAddressResponse);
+        $this->assertSavedShippingAddressFields($shippingAddressResponse);
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a address with ID "100"
      */
-    public function testSetShippingAddressFromAddressBookByRegisteredCustomer()
+    public function testSetNonExistentShippingAddressFromAddressBook()
     {
         $maskedQuoteId = $this->assignQuoteToCustomer();
 
@@ -214,41 +212,28 @@ public function testSetShippingAddressFromAddressBookByRegisteredCustomer()
       cart_id: "$maskedQuoteId"
       shipping_addresses: [
         {
-          customer_address_id: 1
+          customer_address_id: 100
         }
       ]
     }
   ) {
     cart {
       shipping_addresses {
-        firstname
-        lastname
-        company
-        street
         city
-        postcode
-        telephone
       }
     }
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-
-        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
-        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
-        self::assertArrayHasKey('shipping_addresses', $cartResponse);
-        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
-        $this->assertSavedShippingAddressFields($shippingAddressResponse);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage Could not find a address with ID "100"
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
      */
-    public function testSetNotExistedShippingAddressFromAddressBook()
+    public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
     {
         $maskedQuoteId = $this->assignQuoteToCustomer();
 
@@ -259,7 +244,19 @@ public function testSetNotExistedShippingAddressFromAddressBook()
       cart_id: "$maskedQuoteId"
       shipping_addresses: [
         {
-          customer_address_id: 100
+          customer_address_id: 1,
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
         }
       ]
     }
@@ -272,17 +269,22 @@ public function testSetNotExistedShippingAddressFromAddressBook()
   }
 }
 QUERY;
+        self::expectExceptionMessage(
+            'The shipping address cannot contain "customer_address_id" and "address" at the same time.'
+        );
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The shipping address must contain either "customer_address_id" or "address".
+     * @expectedExceptionMessage Current customer does not have permission to address with ID "1"
      */
-    public function testSetShippingAddressWithoutAddresses()
+    public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 2);
 
         $query = <<<QUERY
 mutation {
@@ -290,27 +292,70 @@ public function testSetShippingAddressWithoutAddresses()
     input: {
       cart_id: "$maskedQuoteId"
       shipping_addresses: [
-        {}
+        {
+          customer_address_id: 1
+        }
       ]
     }
   ) {
     cart {
       shipping_addresses {
-        city
+        postcode
+      }
+    }
+  }
+}
+QUERY;
+
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     */
+    public function testSetShippingAddressToAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: 1
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        postcode
       }
     }
   }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     * @param string $input
+     * @param string $message
+     * @throws \Exception
      */
-    public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
+    public function testSetNewShippingAddressWithMissedRequiredParameters(string $input, string $message)
     {
         $maskedQuoteId = $this->assignQuoteToCustomer();
 
@@ -318,22 +363,10 @@ public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
 mutation {
   setShippingAddressesOnCart(
     input: {
-      cart_id: "$maskedQuoteId"
+      cart_id: "{$maskedQuoteId}"
       shipping_addresses: [
         {
-          customer_address_id: 1,
-          address: {
-            firstname: "test firstname"
-            lastname: "test lastname"
-            company: "test company"
-            street: ["test street 1", "test street 2"]
-            city: "test city"
-            region: "test region"
-            postcode: "887766"
-            country_code: "US"
-            telephone: "88776655"
-            save_in_address_book: false
-          }
+          {$input}
         }
       ]
     }
@@ -346,20 +379,36 @@ public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
   }
 }
 QUERY;
-        self::expectExceptionMessage(
-            'The shipping address cannot contain "customer_address_id" and "address" at the same time.'
-        );
+        $this->expectExceptionMessage($message);
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters()
+    {
+        return [
+            'shipping_addresses' => [
+                '',
+                'The shipping address must contain either "customer_address_id" or "address".',
+            ],
+            'missed_city' => [
+                'address: { save_in_address_book: false }',
+                'Field CartAddressInput.city of required type String! was not provided'
+            ]
+        ];
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
      * @expectedExceptionMessage You cannot specify multiple shipping addresses.
      */
     public function testSetMultipleNewShippingAddresses()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->assignQuoteToCustomer();
 
         $query = <<<QUERY
 mutation {
@@ -406,54 +455,7 @@ public function testSetMultipleNewShippingAddresses()
   }
 }
 QUERY;
-        /** @var \Magento\Config\Model\ResourceModel\Config $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
-        $config->saveConfig(
-            Data::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE,
-            null,
-            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-            0
-        );
-        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-        $config->reinit();
-
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage The current user cannot use address with ID "1"
-     */
-    public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
-    {
-        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 2);
-
-        $query = <<<QUERY
-mutation {
-  setShippingAddressesOnCart(
-    input: {
-      cart_id: "$maskedQuoteId"
-      shipping_addresses: [
-        {
-          customer_address_id: 1
-        }
-      ]
-    }
-  ) {
-    cart {
-      shipping_addresses {
-        postcode
-      }
-    }
-  }
-}
-QUERY;
-
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -472,6 +474,7 @@ private function assertNewShippingAddressFields(array $shippingAddressResponse):
             ['response_field' => 'postcode', 'expected_value' => '887766'],
             ['response_field' => 'telephone', 'expected_value' => '88776655'],
             ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
+            ['response_field' => 'address_type', 'expected_value' => 'SHIPPING']
         ];
 
         $this->assertResponseFields($shippingAddressResponse, $assertionMap);
@@ -509,18 +512,6 @@ private function getHeaderMap(string $username = 'customer@example.com', string
         return $headerMap;
     }
 
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $reversedQuoteId
      * @param int $customerId
@@ -536,22 +527,4 @@ private function assignQuoteToCustomer(
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
-
-    public function tearDown()
-    {
-        /** @var \Magento\Config\Model\ResourceModel\Config $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
-
-        //default state of multishipping config
-        $config->saveConfig(
-            Data::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE,
-            1,
-            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-            0
-        );
-
-        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-        $config->reinit();
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
new file mode 100644
index 0000000000000..736ea69440753
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for setting shipping methods on cart for customer
+ */
+class SetShippingMethodsOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    public function testShippingMethodWithVirtualProduct()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testShippingMethodWithSimpleProduct()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testShippingMethodWithSimpleProductWithoutAddress()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testSetShippingMethodWithMissedRequiredParameters()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testSetNonExistentShippingMethod()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testSetShippingMethodIfAddressIsNotBelongToCart()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testSetShippingMethodToNonExistentCart()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testSetShippingMethodToGuestCart()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testSetShippingMethodToAnotherCustomerCart()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testSetShippingMethodToNonExistentCartAddress()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testSetShippingMethodToGuestCartAddress()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testSetShippingMethodToAnotherCustomerCartAddress()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    public function testSetMultipleShippingMethods()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $shippingMethodCode
+     * @param string $shippingCarrierCode
+     * @param string $shippingAddressId
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     */
+    private function prepareMutationQuery(
+        string $maskedQuoteId,
+        string $shippingMethodCode,
+        string $shippingCarrierCode,
+        string $shippingAddressId
+    ) : string {
+        return <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: 
+    {
+      cart_id: "$maskedQuoteId", 
+      shipping_addresses: [{
+        cart_address_id: $shippingAddressId
+        shipping_method: {
+          method_code: "$shippingMethodCode"
+          carrier_code: "$shippingCarrierCode"
+        }
+      }]
+      }) {
+    
+    cart {
+      cart_id,
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+          amount
+        }
+      }
+    }
+  }
+}
+
+QUERY;
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     */
+    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @param int $customerId
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     */
+    private function assignQuoteToCustomer(
+        string $reversedQuoteId,
+        int $customerId
+    ): string {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $quote->setCustomerId($customerId);
+        $this->quoteResource->save($quote);
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
new file mode 100644
index 0000000000000..74e7aa8b5d0a4
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
@@ -0,0 +1,334 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for updating shopping cart items
+ */
+class UpdateCartItemsTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testUpdateCartItemQty()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
+        $qty = 2;
+
+        $query = $this->getQuery($maskedQuoteId, $itemId, $qty);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        $this->assertArrayHasKey('updateCartItems', $response);
+        $this->assertArrayHasKey('cart', $response['updateCartItems']);
+
+        $responseCart = $response['updateCartItems']['cart'];
+        $item = current($responseCart['items']);
+
+        $this->assertEquals($itemId, $item['id']);
+        $this->assertEquals($qty, $item['qty']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testRemoveCartItemIfQuantityIsZero()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
+        $qty = 0;
+
+        $query = $this->getQuery($maskedQuoteId, $itemId, $qty);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        $this->assertArrayHasKey('updateCartItems', $response);
+        $this->assertArrayHasKey('cart', $response['updateCartItems']);
+
+        $responseCart = $response['updateCartItems']['cart'];
+        $this->assertCount(0, $responseCart['items']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testUpdateItemInNonExistentCart()
+    {
+        $query = $this->getQuery('non_existent_masked_id', 1, 2);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testUpdateNonExistentItem()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $notExistentItemId = 999;
+
+        $this->expectExceptionMessage("Could not find cart item with id: {$notExistentItemId}.");
+
+        $query = $this->getQuery($maskedQuoteId, $notExistentItemId, 2);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     */
+    public function testUpdateItemIfItemIsNotBelongToCart()
+    {
+        $firstQuote = $this->quoteFactory->create();
+        $this->quoteResource->load($firstQuote, 'test_order_1', 'reserved_order_id');
+        $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
+
+        $secondQuote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $secondQuote,
+            'test_order_with_virtual_product_without_address',
+            'reserved_order_id'
+        );
+        $secondQuote->setCustomerId(1);
+        $this->quoteResource->save($secondQuote);
+        $secondQuoteItemId = (int)$secondQuote
+            ->getItemByProduct($this->productRepository->get('virtual-product'))
+            ->getId();
+
+        $this->expectExceptionMessage("Could not find cart item with id: {$secondQuoteItemId}.");
+
+        $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId, 2);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     */
+    public function testUpdateItemInGuestCart()
+    {
+        $guestQuote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $guestQuote,
+            'test_order_with_virtual_product_without_address',
+            'reserved_order_id'
+        );
+        $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
+        $guestQuoteItemId = (int)$guestQuote
+            ->getItemByProduct($this->productRepository->get('virtual-product'))
+            ->getId();
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
+        );
+
+        $query = $this->getQuery($guestQuoteMaskedId, $guestQuoteItemId, 2);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     */
+    public function testUpdateItemInAnotherCustomerCart()
+    {
+        $anotherCustomerQuote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $anotherCustomerQuote,
+            'test_order_with_virtual_product_without_address',
+            'reserved_order_id'
+        );
+        $anotherCustomerQuote->setCustomerId(2);
+        $this->quoteResource->save($anotherCustomerQuote);
+
+        $anotherCustomerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$anotherCustomerQuote->getId());
+        $anotherCustomerQuoteItemId = (int)$anotherCustomerQuote
+            ->getItemByProduct($this->productRepository->get('virtual-product'))
+            ->getId();
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$anotherCustomerQuoteMaskedId\""
+        );
+
+        $query = $this->getQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId, 2);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Required parameter "cart_id" is missing.
+     */
+    public function testUpdateWithMissedCartItemId()
+    {
+        $query = <<<QUERY
+mutation {
+  updateCartItems(input: {
+    cart_items: [
+      {
+        cart_item_id: 1
+        quantity: 2
+      }
+    ]  
+  }) {
+    cart {
+      items {
+        id
+        qty
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testUpdateWithMissedItemRequiredParameters(string $input, string $message)
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+
+        $query = <<<QUERY
+mutation {
+  updateCartItems(input: {
+    cart_id: "{$maskedQuoteId}"
+    {$input}
+  }) {
+    cart {
+      items {
+        id
+        qty
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters(): array
+    {
+        return [
+            'missed_cart_items' => [
+                '',
+                'Required parameter "cart_items" is missing.'
+            ],
+            'missed_cart_item_id' => [
+                'cart_items: [{ quantity: 2 }]',
+                'Required parameter "cart_item_id" for "cart_items" is missing.'
+            ],
+            'missed_cart_item_qty' => [
+                'cart_items: [{ cart_item_id: 1 }]',
+                'Required parameter "quantity" for "cart_items" is missing.'
+            ],
+        ];
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param int $itemId
+     * @param float $qty
+     * @return string
+     */
+    private function getQuery(string $maskedQuoteId, int $itemId, float $qty): string
+    {
+        return <<<QUERY
+mutation {
+  updateCartItems(input: {
+    cart_id: "{$maskedQuoteId}"
+    cart_items:[
+      {
+        cart_item_id: {$itemId}
+        quantity: {$qty}
+      }
+    ]
+  }) {
+    cart {
+      items {
+        id
+        qty
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index a5a08aaf39fb1..c4dd9af490c99 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -49,18 +49,8 @@ protected function setUp()
      */
     public function testGetCartWithPaymentMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
-
-        $query = <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    available_payment_methods {
-      code
-      title
-    }
-  }
-}
-QUERY;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
+        $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('cart', $response);
@@ -73,16 +63,78 @@ public function testGetCartWithPaymentMethods()
             'No Payment Information Required',
             $response['cart']['available_payment_methods'][1]['title']
         );
+        self::assertGreaterThan(
+            0,
+            count($response['cart']['available_payment_methods']),
+            'There are no available payment methods for guest cart!'
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testGetPaymentMethodsFromCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Payment/_files/disable_all_active_payment_methods.php
+     */
+    public function testGetPaymentMethodsIfPaymentsAreNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        self::assertEquals(0, count($response['cart']['available_payment_methods']));
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetPaymentMethodsOfNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId
+    ): string {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    available_payment_methods {
+      code
+      title
+    }
+  }
+}
+QUERY;
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reservedOrderId
      * @return string
      */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
 
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index b1d5e475c793e..916d5951b0ff2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -97,6 +97,24 @@ public function testGetNonExistentCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Current user does not have an active cart.
+     */
+    public function testGetInactiveCart()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+        $quote->setIsActive(false);
+        $this->quoteResource->save($quote);
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @return string
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
index a6b8f05fc0834..a306b29e51197 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
@@ -73,14 +73,13 @@ public function testRemoveItemFromCart()
     public function testRemoveItemFromNonExistentCart()
     {
         $query = $this->prepareMutationQuery('non_existent_masked_id', 1);
-
         $this->graphQlQuery($query);
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      */
-    public function testRemoveNotExistentItem()
+    public function testRemoveNonExistentItem()
     {
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
@@ -139,6 +138,49 @@ public function testRemoveItemFromCustomerCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     */
+    public function testUpdateWithMissedItemRequiredParameters(string $input, string $message)
+    {
+        $query = <<<QUERY
+mutation {
+  removeItemFromCart(
+    input: {
+      {$input}
+    }
+  ) {
+    cart {
+      items {
+        qty
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'cart_item_id: 1',
+                'Required parameter "cart_id" is missing.'
+            ],
+            'missed_cart_item_id' => [
+                'cart_id: "test"',
+                'Required parameter "cart_item_id" is missing.'
+            ],
+        ];
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param int $itemId
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 24fc8353d2552..a2f092b9e0e1d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -82,6 +82,7 @@ public function testSetNewBillingAddress()
           code
           label
         }
+        address_type
       }
     }
   }
@@ -138,6 +139,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
           code
           label
         }
+        address_type
       }
       shipping_addresses {
         firstname
@@ -151,6 +153,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
           code
           label
         }
+        address_type
       }
     }
   }
@@ -165,13 +168,13 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
         self::assertArrayHasKey('shipping_addresses', $cartResponse);
         $shippingAddressResponse = current($cartResponse['shipping_addresses']);
         $this->assertNewAddressFields($billingAddressResponse);
-        $this->assertNewAddressFields($shippingAddressResponse);
+        $this->assertNewAddressFields($shippingAddressResponse, 'SHIPPING');
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      */
-    public function testSettBillingAddressToCustomerCart()
+    public function testSetBillingAddressToCustomerCart()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
 
@@ -241,12 +244,64 @@ public function testSetBillingAddressFromAddressBook()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testSetBillingAddressOnNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @dataProvider dataProviderSetWithoutRequiredParameters
+     * @param string $input
+     * @param string $message
+     * @throws \Exception
+     */
+    public function testSetBillingAddressWithoutRequiredParameters(string $input, string $message)
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      {$input}
+    }
+  ) {
+    cart {
+        billing_address {
+            city
+          }
+    }
+  }
+}
+QUERY;
+
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
-     * @param array $billingAddressResponse
+     * @param array $addressResponse
+     * @param string $addressType
      */
-    private function assertNewAddressFields(array $billingAddressResponse): void
+    private function assertNewAddressFields(array $addressResponse, string $addressType = 'BILLING'): void
     {
         $assertionMap = [
             ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
@@ -257,9 +312,10 @@ private function assertNewAddressFields(array $billingAddressResponse): void
             ['response_field' => 'postcode', 'expected_value' => '887766'],
             ['response_field' => 'telephone', 'expected_value' => '88776655'],
             ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
+            ['response_field' => 'address_type', 'expected_value' => $addressType]
         ];
 
-        $this->assertResponseFields($billingAddressResponse, $assertionMap);
+        $this->assertResponseFields($addressResponse, $assertionMap);
     }
 
     /**
@@ -273,4 +329,22 @@ private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): str
 
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
+
+    /**
+     * @return array
+     */
+    public function dataProviderSetWithoutRequiredParameters()
+    {
+        return [
+            'missed_billing_address' => [
+                'cart_id: "cart_id_value"',
+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
+                    . ' was not provided.',
+            ],
+            'missed_cart_id' => [
+                'billing_address: {}',
+                'Required parameter "cart_id" is missing'
+            ]
+        ];
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index 7484b2af7569d..017b85ba17b93 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -126,6 +126,90 @@ public function testSetPaymentMethodToCustomerCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderSetPaymentMethodWithoutRequiredParameters
+     */
+    public function testSetPaymentMethodWithoutRequiredParameters(string $input, string $message)
+    {
+        $query = <<<QUERY
+mutation {
+  setPaymentMethodOnCart(
+    input: {
+      {$input}
+    }
+  ) {
+    cart {
+      items {
+        qty
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+    /**
+     * @return array
+     */
+    public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
+                'Required parameter "cart_id" is missing.'
+            ],
+            'missed_payment_method' => [
+                'cart_id: "test"',
+                'Required parameter "code" for "payment_method" is missing.'
+            ],
+            'missed_payment_method_code' => [
+                'cart_id: "test", payment_method: {code: ""}',
+                'Required parameter "code" for "payment_method" is missing.'
+            ],
+        ];
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testSetPaymentOnNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_payment_saved.php
+     */
+    public function testReSetPayment()
+    {
+        /** @var \Magento\Quote\Model\Quote  $quote */
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_with_payment');
+        $this->unAssignCustomerFromQuote('test_order_1_with_payment');
+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
+        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $methodCode
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
new file mode 100644
index 0000000000000..33aeb2b902a8f
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -0,0 +1,374 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Multishipping\Helper\Data;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * Test for set shipping addresses on cart mutation
+ */
+class SetShippingAddressOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testSetNewShippingAddress()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        address_type
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
+        $this->assertNewShippingAddressFields($shippingAddressResponse);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
+     */
+    public function testSetNewShippingAddressOnQuoteWithVirtualProducts()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testSetShippingAddressFromAddressBook()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: 1
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     */
+    public function testSetShippingAddressToCustomerCart()
+    {
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: 1
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        postcode
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     * @param string $input
+     * @param string $message
+     * @throws \Exception
+     */
+    public function testSetNewShippingAddressWithMissedRequiredParameters(string $input, string $message)
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "{$maskedQuoteId}"
+      shipping_addresses: [
+        {
+          {$input}
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters()
+    {
+        return [
+            'shipping_addresses' => [
+                '',
+                'The shipping address must contain either "customer_address_id" or "address".',
+            ],
+            'missed_city' => [
+                'address: { save_in_address_book: false }',
+                'Field CartAddressInput.city of required type String! was not provided'
+            ]
+        ];
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage You cannot specify multiple shipping addresses.
+     */
+    public function testSetMultipleNewShippingAddresses()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        },
+        {
+          address: {
+            firstname: "test firstname 2"
+            lastname: "test lastname 2"
+            company: "test company 2"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Verify the all the whitelisted fields for a New Address Object
+     *
+     * @param array $shippingAddressResponse
+     */
+    private function assertNewShippingAddressFields(array $shippingAddressResponse): void
+    {
+        $assertionMap = [
+            ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
+            ['response_field' => 'lastname', 'expected_value' => 'test lastname'],
+            ['response_field' => 'company', 'expected_value' => 'test company'],
+            ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
+            ['response_field' => 'city', 'expected_value' => 'test city'],
+            ['response_field' => 'postcode', 'expected_value' => '887766'],
+            ['response_field' => 'telephone', 'expected_value' => '88776655'],
+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
+            ['response_field' => 'address_type', 'expected_value' => 'SHIPPING']
+        ];
+
+        $this->assertResponseFields($shippingAddressResponse, $assertionMap);
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @return string
+     */
+    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @param int $customerId
+     * @return string
+     */
+    private function assignQuoteToCustomer(
+        string $reversedQuoteId = 'test_order_with_simple_product_without_address',
+        int $customerId = 1
+    ): string {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $quote->setCustomerId($customerId);
+        $this->quoteResource->save($quote);
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
new file mode 100644
index 0000000000000..f159cb6f6151e
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for setting shipping methods on cart for guest
+ */
+class SetShippingMethodsOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    public function testShippingMethodWithVirtualProduct()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testShippingMethodWithSimpleProduct()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testShippingMethodWithSimpleProductWithoutAddress()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testSetShippingMethodWithMissedRequiredParameters()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testSetNonExistentShippingMethod()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testSetShippingMethodIfAddressIsNotBelongToCart()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testSetShippingMethodToNonExistentCart()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testSetShippingMethodToGuestCart()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testSetShippingMethodToAnotherCustomerCart()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testSetShippingMethodToNonExistentCartAddress()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testSetShippingMethodToGuestCartAddress()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testSetShippingMethodToAnotherCustomerCartAddress()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    public function testSetMultipleShippingMethods()
+    {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $shippingMethodCode
+     * @param string $shippingCarrierCode
+     * @param string $shippingAddressId
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     */
+    private function prepareMutationQuery(
+        string $maskedQuoteId,
+        string $shippingMethodCode,
+        string $shippingCarrierCode,
+        string $shippingAddressId
+    ) : string {
+        return <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: 
+    {
+      cart_id: "$maskedQuoteId", 
+      shipping_addresses: [{
+        cart_address_id: $shippingAddressId
+        shipping_method: {
+          method_code: "$shippingMethodCode"
+          carrier_code: "$shippingCarrierCode"
+        }
+      }]
+      }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+          amount
+        }
+      }
+    }
+  }
+}
+
+QUERY;
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     */
+    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
new file mode 100644
index 0000000000000..fca7a4287620b
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
@@ -0,0 +1,273 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for updating/removing shopping cart items
+ */
+class UpdateCartItemsTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testUpdateCartItemQty()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
+        $qty = 2;
+
+        $query = $this->getQuery($maskedQuoteId, $itemId, $qty);
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey('updateCartItems', $response);
+        $this->assertArrayHasKey('cart', $response['updateCartItems']);
+
+        $responseCart = $response['updateCartItems']['cart'];
+        $item = current($responseCart['items']);
+
+        $this->assertEquals($itemId, $item['id']);
+        $this->assertEquals($qty, $item['qty']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testRemoveCartItemIfQuantityIsZero()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
+        $qty = 0;
+
+        $query = $this->getQuery($maskedQuoteId, $itemId, $qty);
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey('updateCartItems', $response);
+        $this->assertArrayHasKey('cart', $response['updateCartItems']);
+
+        $responseCart = $response['updateCartItems']['cart'];
+        $this->assertCount(0, $responseCart['items']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testUpdateItemInNonExistentCart()
+    {
+        $query = $this->getQuery('non_existent_masked_id', 1, 2);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testUpdateNonExistentItem()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $notExistentItemId = 999;
+
+        $this->expectExceptionMessage("Could not find cart item with id: {$notExistentItemId}.");
+
+        $query = $this->getQuery($maskedQuoteId, $notExistentItemId, 2);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     */
+    public function testUpdateItemIfItemIsNotBelongToCart()
+    {
+        $firstQuote = $this->quoteFactory->create();
+        $this->quoteResource->load($firstQuote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+        $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
+
+        $secondQuote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $secondQuote,
+            'test_order_with_virtual_product_without_address',
+            'reserved_order_id'
+        );
+        $secondQuoteItemId = (int)$secondQuote
+            ->getItemByProduct($this->productRepository->get('virtual-product'))
+            ->getId();
+
+        $this->expectExceptionMessage("Could not find cart item with id: {$secondQuoteItemId}.");
+
+        $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId, 2);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testUpdateItemFromCustomerCart()
+    {
+        $customerQuote = $this->quoteFactory->create();
+        $this->quoteResource->load($customerQuote, 'test_order_1', 'reserved_order_id');
+        $customerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$customerQuote->getId());
+        $customerQuoteItemId = (int)$customerQuote->getItemByProduct($this->productRepository->get('simple'))->getId();
+
+        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
+
+        $query = $this->getQuery($customerQuoteMaskedId, $customerQuoteItemId, 2);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Required parameter "cart_id" is missing.
+     */
+    public function testUpdateWithMissedCartItemId()
+    {
+        $query = <<<QUERY
+mutation {
+  updateCartItems(input: {
+    cart_items: [
+      {
+        cart_item_id: 1
+        quantity: 2
+      }
+    ]  
+  }) {
+    cart {
+      items {
+        id
+        qty
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testUpdateWithMissedItemRequiredParameters(string $input, string $message)
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+
+        $query = <<<QUERY
+mutation {
+  updateCartItems(input: {
+    cart_id: "{$maskedQuoteId}"
+    {$input}
+  }) {
+    cart {
+      items {
+        id
+        qty
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters(): array
+    {
+        return [
+            'missed_cart_items' => [
+                '',
+                'Required parameter "cart_items" is missing.'
+            ],
+            'missed_cart_item_id' => [
+                'cart_items: [{ quantity: 2 }]',
+                'Required parameter "cart_item_id" for "cart_items" is missing.'
+            ],
+            'missed_cart_item_qty' => [
+                'cart_items: [{ cart_item_id: 1 }]',
+                'Required parameter "quantity" for "cart_items" is missing.'
+            ],
+        ];
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param int $itemId
+     * @param float $qty
+     * @return string
+     */
+    private function getQuery(string $maskedQuoteId, int $itemId, float $qty): string
+    {
+        return <<<QUERY
+mutation {
+  updateCartItems(input: {
+    cart_id: "{$maskedQuoteId}"
+    cart_items: [
+      {
+        cart_item_id: {$itemId}
+        quantity: {$qty}
+      }
+    ]
+  }) {
+    cart {
+      items {
+        id
+        qty
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
new file mode 100644
index 0000000000000..463f2c4af101f
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Ups;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for setting "UPS" shipping method on cart
+ */
+class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
+{
+    /**
+     * Defines carrier code for "UPS" shipping method
+     */
+    const CARRIER_CODE = 'ups';
+
+    /**
+     * Defines method code for the "Ground" UPS shipping
+     */
+    const CARRIER_METHOD_CODE_GROUND = 'GND';
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     */
+    public function testSetUpsShippingMethod()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $shippingAddressId = (int)$quote->getShippingAddress()->getId();
+
+        $query = $this->getAddUpsShippingMethodQuery(
+            $maskedQuoteId,
+            $shippingAddressId,
+            self::CARRIER_CODE,
+            self::CARRIER_METHOD_CODE_GROUND
+        );
+
+        $response = $this->sendRequestWithToken($query);
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        $expectedResult = [
+            'carrier_code' => self::CARRIER_CODE,
+            'method_code' => self::CARRIER_METHOD_CODE_GROUND,
+            'label' => 'United Parcel Service - Ground',
+        ];
+        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+    }
+
+    /**
+     * Generates query for setting the specified shipping method on cart
+     *
+     * @param int $shippingAddressId
+     * @param string $maskedQuoteId
+     * @param string $carrierCode
+     * @param string $methodCode
+     * @return string
+     */
+    private function getAddUpsShippingMethodQuery(
+        string $maskedQuoteId,
+        int $shippingAddressId,
+        string $carrierCode,
+        string $methodCode
+    ): string {
+        return <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: {
+    cart_id: "$maskedQuoteId"
+    shipping_methods: [
+      {
+        cart_address_id: $shippingAddressId
+        carrier_code: "$carrierCode"
+        method_code: "$methodCode"
+      }
+    ]
+  }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+        }
+      }
+    } 
+  }
+}        
+QUERY;
+    }
+
+    /**
+     * Sends a GraphQL request with using a bearer token
+     *
+     * @param string $query
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function sendRequestWithToken(string $query): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+
+        return $this->graphQlQuery($query, [], '', $headerMap);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
index c70b1631e85cd..370121a1dad78 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
@@ -31,7 +31,7 @@ protected function setUp()
     }
 
     /**
-     * Tests if target_path(canonical_url) is resolved for Product entity
+     * Tests if target_path(relative_url) is resolved for Product entity
      *
      * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
      */
@@ -60,7 +60,7 @@ public function testProductUrlResolver()
   urlResolver(url:"{$urlPath}")
   {
    id
-   canonical_url
+   relative_url
    type
   }
 }
@@ -68,12 +68,12 @@ public function testProductUrlResolver()
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('urlResolver', $response);
         $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
         $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
     }
 
     /**
-     * Tests the use case where canonical_url is provided as resolver input in the Query
+     * Tests the use case where relative_url is provided as resolver input in the Query
      *
      * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
      */
@@ -104,7 +104,7 @@ public function testProductUrlWithCanonicalUrlInput()
   urlResolver(url:"{$canonicalPath}")
   {
    id
-   canonical_url
+   relative_url
    type
   }
 }
@@ -112,7 +112,7 @@ public function testProductUrlWithCanonicalUrlInput()
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('urlResolver', $response);
         $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
         $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
     }
 
@@ -147,7 +147,7 @@ public function testCategoryUrlResolver()
   urlResolver(url:"{$urlPath2}")
   {
    id
-   canonical_url
+   relative_url
    type
   }
 }
@@ -155,7 +155,7 @@ public function testCategoryUrlResolver()
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('urlResolver', $response);
         $this->assertEquals($categoryId, $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
         $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
     }
 
@@ -183,14 +183,14 @@ public function testCMSPageUrlResolver()
   urlResolver(url:"{$requestPath}")
   {
    id
-   canonical_url
+   relative_url
    type
   }
 }
 QUERY;
         $response = $this->graphQlQuery($query);
         $this->assertEquals($cmsPageId, $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
         $this->assertEquals(strtoupper(str_replace('-', '_', $expectedEntityType)), $response['urlResolver']['type']);
     }
 
@@ -226,7 +226,7 @@ public function testProductUrlRewriteResolver()
   urlResolver(url:"{$urlPath}")
   {
    id
-   canonical_url
+   relative_url
    type
   }
 }
@@ -234,7 +234,7 @@ public function testProductUrlRewriteResolver()
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('urlResolver', $response);
         $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
         $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
     }
 
@@ -266,7 +266,7 @@ public function testInvalidUrlResolverInput()
   urlResolver(url:"{$urlPath}")
   {
    id
-   canonical_url
+   relative_url
    type
   }
 }
@@ -307,7 +307,7 @@ public function testCategoryUrlWithLeadingSlash()
   urlResolver(url:"/{$urlPath}")
   {
    id
-   canonical_url
+   relative_url
    type
   }
 }
@@ -315,7 +315,7 @@ public function testCategoryUrlWithLeadingSlash()
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('urlResolver', $response);
         $this->assertEquals($categoryId, $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
         $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
     }
 
@@ -344,7 +344,7 @@ public function testResolveSlash()
   urlResolver(url:"/")
   {
    id
-   canonical_url
+   relative_url
    type
   }
 }
@@ -352,7 +352,7 @@ public function testResolveSlash()
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('urlResolver', $response);
         $this->assertEquals($homePageId, $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
         $this->assertEquals('CMS_PAGE', $response['urlResolver']['type']);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php
index d570fc09b7714..4aac5d9445934 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php
@@ -93,6 +93,36 @@ public function testGetCustomerWishlist(): void
         $this->assertEquals($wishlistItemProduct->getName(), $response['wishlist']['items'][0]['product']['name']);
     }
 
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current user cannot perform operations on wishlist
+     */
+    public function testGetGuestWishlist()
+    {
+        $query =
+            <<<QUERY
+{
+  wishlist {
+    items_count
+    name
+    sharing_code
+    updated_at
+    items {
+      id
+      qty
+      description
+      added_at
+      product {
+        sku
+        name
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $email
      * @param string $password
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
index 6dbf2b1aa6a12..03492f7ae1a9e 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
@@ -195,6 +195,13 @@ class ConditionsElement extends SimpleElement
      */
     protected $exception;
 
+    /**
+     * Condition option text selector.
+     *
+     * @var string
+     */
+    private $conditionOptionTextSelector = '//option[normalize-space(text())="%s"]';
+
     /**
      * @inheritdoc
      */
@@ -265,7 +272,7 @@ protected function addSingleCondition($condition, ElementInterface $context)
         $this->addCondition($condition['type'], $context);
         $createdCondition = $context->find($this->created, Locator::SELECTOR_XPATH);
         $this->waitForCondition($createdCondition);
-        $this->fillCondition($condition['rules'], $createdCondition);
+        $this->fillCondition($condition['rules'], $createdCondition, $condition['type']);
     }
 
     /**
@@ -282,10 +289,16 @@ protected function addCondition($type, ElementInterface $context)
         $count = 0;
 
         do {
-            $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
-
             try {
-                $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select')->setValue($type);
+                $specificType = $newCondition->find(
+                    sprintf($this->conditionOptionTextSelector, $type),
+                    Locator::SELECTOR_XPATH
+                )->isPresent();
+                $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
+                $condition = $specificType
+                    ? $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'selectcondition')
+                    : $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select');
+                $condition->setValue($type);
                 $isSetType = true;
             } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
                 $isSetType = false;
@@ -306,13 +319,14 @@ protected function addCondition($type, ElementInterface $context)
      *
      * @param array $rules
      * @param ElementInterface $element
+     * @param string|null $type
      * @return void
      * @throws \Exception
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    protected function fillCondition(array $rules, ElementInterface $element)
+    protected function fillCondition(array $rules, ElementInterface $element, $type = null)
     {
         $this->resetKeyParam();
         foreach ($rules as $rule) {
@@ -333,7 +347,7 @@ protected function fillCondition(array $rules, ElementInterface $element)
 
                     if ($this->fillGrid($rule, $param)) {
                         $isSet = true;
-                    } elseif ($this->fillSelect($rule, $param)) {
+                    } elseif ($this->fillSelect($rule, $param, $type)) {
                         $isSet = true;
                     } elseif ($this->fillText($rule, $param)) {
                         $isSet = true;
@@ -390,11 +404,15 @@ protected function fillGrid($rule, ElementInterface $param)
      *
      * @param string $rule
      * @param ElementInterface $param
+     * @param string|null $type
      * @return bool
      */
-    protected function fillSelect($rule, ElementInterface $param)
+    protected function fillSelect($rule, ElementInterface $param, $type = null)
     {
-        $value = $param->find('select', Locator::SELECTOR_TAG_NAME, 'select');
+        //Avoid confusion between regions like: "Baja California" and "California".
+        $value = strpos($type, 'State/Province') === false
+            ? $param->find('select', Locator::SELECTOR_TAG_NAME, 'select')
+            : $param->find('select', Locator::SELECTOR_TAG_NAME, 'selectstate');
         if ($value->isVisible()) {
             $value->setValue($rule);
             $this->click();
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
new file mode 100644
index 0000000000000..15a799eac5188
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Mtf\Client\Element;
+
+/**
+ * @inheritdoc
+ */
+class SelectconditionElement extends SelectElement
+{
+    /**
+     * @inheritdoc
+     */
+    protected $optionByValue = './/option[normalize-space(.)=%s]';
+}
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php
new file mode 100644
index 0000000000000..a21353f46c1ca
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Mtf\Client\Element;
+
+/**
+ * @inheritdoc
+ */
+class SelectstateElement extends SelectElement
+{
+    /**
+     * @inheritdoc
+     */
+    protected $optionByValue = './/option[normalize-space(.)=%s]';
+}
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php
index 3020e69c06399..fefe0d2c126e5 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php
@@ -65,6 +65,13 @@ class ExportAdvancedPricingTest extends Injectable
      */
     private $catalogProductIndex;
 
+    /**
+     * Cron command
+     *
+     * @var Cron
+     */
+    private $cron;
+
     /**
      * Run cron before tests running
      *
@@ -85,18 +92,21 @@ public function __prepare(
      * @param FixtureFactory $fixtureFactory
      * @param AdminExportIndex $adminExportIndex
      * @param CatalogProductIndex $catalogProductIndexPage
+     * @param Cron $cron
      * @return void
      */
     public function __inject(
         TestStepFactory $stepFactory,
         FixtureFactory $fixtureFactory,
         AdminExportIndex $adminExportIndex,
-        CatalogProductIndex $catalogProductIndexPage
+        CatalogProductIndex $catalogProductIndexPage,
+        Cron $cron
     ) {
         $this->stepFactory = $stepFactory;
         $this->fixtureFactory = $fixtureFactory;
         $this->adminExportIndex = $adminExportIndex;
         $this->catalogProductIndex = $catalogProductIndexPage;
+        $this->cron = $cron;
     }
 
     /**
@@ -130,8 +140,12 @@ public function test(
         if ($website) {
             $website->persist();
             $this->setupCurrencyForCustomWebsite($website, $currencyCustomWebsite);
+            $this->cron->run();
+            $this->cron->run();
         }
         $products = $this->prepareProducts($products, $website);
+        $this->cron->run();
+        $this->cron->run();
         $this->adminExportIndex->open();
         $this->adminExportIndex->getExportedGrid()->deleteAllExportedFiles();
         $exportData = $this->fixtureFactory->createByCode(
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml
index d069499da4aab..07646c2aceda8 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml
+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml
@@ -50,7 +50,6 @@
             <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertExportAdvancedPricing"/>
         </variation>
         <variation name="ExportAdvancedPricingTestVariation4" summary="Trying export product data for product available on main website with default currency and custom website with different currency" ticketId="MAGETWO-46153">
-            <data name="issue" xsi:type="string">MC-13864 Consumer always read config from memory</data>
             <data name="configData" xsi:type="string">price_scope_website</data>
             <data name="exportData" xsi:type="string">csv_with_advanced_pricing</data>
             <data name="products/0" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml
index a975d19ef8879..89c9d9168921f 100644
--- a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Analytics\Test\TestCase\AdvancedReportingButtonTest" summary="Navigate through Advanced Reporting button on dashboard to Sign Up page" ticketId="MAGETWO-63715">
         <variation name="AdvancedReportingButtonTest">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="advancedReportingLink" xsi:type="string">https://advancedreporting.rjmetrics.com/report</data>
             <constraint name="Magento\Analytics\Test\Constraint\AssertAdvancedReportingPage" />
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
index adae65a1d06d6..799f9e30fd972 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
@@ -17,5 +17,6 @@
         <block name="accessDeniedBlock" class="Magento\Backend\Test\Block\Denied" locator="#anchor-content" strategy="css selector" />
         <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='.ui-popup-message .modal-inner-wrap' strategy="css selector" />
         <block name="applicationVersion" class="Magento\Backend\Test\Block\Version" locator="body" strategy="css selector" />
+        <block name="modalMessage" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator=".modal-popup>.modal-inner-wrap" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/ValidateOrderOfProductTypeTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/ValidateOrderOfProductTypeTest.xml
index 7077f367795ed..cb32742a0ce6b 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/ValidateOrderOfProductTypeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/ValidateOrderOfProductTypeTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\ValidateOrderOfProductTypeTest">
         <variation name="ValidateOrderOfProductTypeTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menu/4" xsi:type="string">Bundle Product</data>
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml
index 3ad8cff31eaf8..bfbe233b9dc1b 100644
--- a/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
         <variation name="ExportProductsTestVariation4" summary="Export bundle products" ticketId="MAGETWO-30602">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">bundleProduct</item>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.xml
index 0d1a34ab52f97..ec776128fdfe3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ValidateOrderOfProductTypeTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\ValidateOrderOfProductTypeTest" summary="Validate product types order on product grid page" ticketId="MAGETWO-37146">
         <variation name="ValidateOrderOfProductTypeTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menu/0" xsi:type="string">Simple Product</data>
             <data name="menu/3" xsi:type="string">Virtual Product</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTypeOrderOnCreate" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml
index df396c22312b1..e46174de8818f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\DeleteUsedInConfigurableProductAttributeTest" summary="Delete Used in Configurable Product Attribute" ticketId="MAGETWO-26652">
         <variation name="DeleteUsedInConfigurableProductAttributeTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/dataset" xsi:type="string">one_variation</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertUsedSuperAttributeImpossibleDeleteMessages" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php
index e55558482c1f3..b5cd056fb99ad 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php
@@ -104,6 +104,8 @@ public function test(
         $exportData->persist();
         $this->adminExportIndex->getExportForm()->fill($exportData);
         $this->adminExportIndex->getFilterExport()->clickContinue();
+        $this->cron->run();
+        $this->cron->run();
         $this->assertExportProduct->processAssert($export, $exportedFields, $products);
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
index b94f21371496a..be22eab8ac717 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
         <variation name="ExportProductsTestVariation1" summary="Export simple product and configured products with assigned images" ticketId="MAGETWO-46112">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
@@ -27,6 +28,7 @@
             </data>
         </variation>
         <variation name="ExportProductsTestVariation2" summary="Export simple and configured products with custom options" ticketId="MAGETWO-46113, MAGETWO-46109">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
@@ -43,6 +45,7 @@
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertExportProductDate" />
         </variation>
         <variation name="ExportProductsTestVariation3" summary="Export simple product with custom attribute" ticketId="MAGETWO-46121">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
@@ -58,7 +61,7 @@
             </data>
         </variation>
         <variation name="ExportProductsTestVariation5" summary="Export simple product assigned to Main Website and configurable product assigned to Custom Website" ticketId="MAGETWO-46114">
-            <data name="issue" xsi:type="string">>MC-13864 Consumer always read config from memory</data>
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml
index edb0aad954fbb..77e5e2b91d93f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogImportExport\Test\TestCase\ImportProductsTest" summary="Import products">
         <variation name="ImportProductVariation1" ticketId="MAGETWO-47724" summary="Import Products with Add/Update Behavior">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="import/data" xsi:type="array">
                 <item name="entity" xsi:type="string">Products</item>
                 <item name="behavior" xsi:type="string">Add/Update</item>
@@ -38,6 +39,7 @@
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsInGrid" />
         </variation>
         <variation name="ImportProductVariation2" ticketId="MAGETWO-47719" summary="Import Products assigned to different websites with Replace Behavior">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="import/data/entity" xsi:type="string">Products</data>
             <data name="import/data/behavior" xsi:type="string">Replace</data>
             <data name="import/data/validation_strategy" xsi:type="string">Stop on Error</data>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml
index 0437e0a5e999b..8c465544a3283 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogSearch\Test\TestCase\CreateSearchTermEntityTest" summary="Create Search Term" ticketId="MAGETWO-26165">
         <variation name="CreateSearchTermEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="searchTerm/data/query_text/value" xsi:type="string">catalogProductSimple::sku</data>
             <data name="searchTerm/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="searchTerm/data/redirect" xsi:type="string">http://example.com/</data>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml
index a9cc0dfd34f9f..8fdd7ef715521 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogSearch\Test\TestCase\DeleteSearchTermEntityTest" summary="Delete Search Term" ticketId="MAGETWO-26491">
         <variation name="DeleteSearchTermEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="searchTerm/dataset" xsi:type="string">default</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermSuccessDeleteMessage" />
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermNotInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml
index 3bf4e521c4a04..3ef2b65c0224b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogSearch\Test\TestCase\MassDeleteSearchTermEntityTest" summary="Mass Delete Search Term" ticketId="MAGETWO-26599">
         <variation name="MassDeleteSearchTermEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="searchTerms" xsi:type="string">catalogSearchQuery::default,catalogSearchQuery::default,catalogSearchQuery::default</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermSuccessMassDeleteMessage" />
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermMassActionsNotInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml
index 398054f1f0ed3..8b15da5ecd2ef 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml
@@ -14,7 +14,7 @@
             <data name="category/data/include_in_menu" xsi:type="string">Yes</data>
             <data name="category/data/name" xsi:type="string">Subcategory%isolation%</data>
             <data name="category/data/url_key" xsi:type="string">subcategory-%isolation%</data>
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1, mftf_migrated:yes</data>
             <constraint name="Magento\CatalogUrlRewrite\Test\Constraint\AssertCategoryUrlDuplicateErrorMessage" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml
index 1116821f756a9..8110ed1ed00b1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogUrlRewrite\Test\TestCase\CreateDuplicateUrlProductEntity" summary="Create Simple Product" ticketId="MAGETWO-69427">
         <variation name="CreateDuplicateUrlProductEntityTestVariation1" summary="Create Duplicate Url Product">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1, mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
index 8b2460718097c..b4c97a11b9145 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
@@ -9,7 +9,7 @@
     <testCase name="Magento\Checkout\Test\TestCase\UpdateProductFromMiniShoppingCartEntityTest" summary="Update Product from Mini Shopping Cart" ticketId="MAGETWO-29812">
         <variation name="UpdateProductFromMiniShoppingCartEntityTestVariation1" summary="Update Product Qty on Mini Shopping Cart" ticketId=" MAGETWO-35536">
             <data name="issue" xsi:type="string">https://github.com/magento-engcom/msi/issues/1624</data>
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0, mftf_migrated:yes</data>
             <data name="originalProduct/0" xsi:type="string">catalogProductSimple::default</data>
             <data name="checkoutData/dataset" xsi:type="string">simple_order_qty_2</data>
             <data name="use_minicart_to_edit_qty" xsi:type="boolean">true</data>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
index e0ea721a51f1b..5caa3ba9b924e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Checkout\Test\TestCase\UpdateShoppingCartTest" summary="Update Shopping Cart" ticketId="MAGETWO-25081">
         <variation name="UpdateShoppingCartTestVariation1">
-            <data name="tag" xsi:type="string">severity:S0</data>
+            <data name="tag" xsi:type="string">severity:S0,mftf_migrated:yes</data>
             <data name="product/dataset" xsi:type="string">default</data>
             <data name="product/data/price/value" xsi:type="string">100</data>
             <data name="product/data/checkout_data/qty" xsi:type="string">3</data>
@@ -20,7 +20,7 @@
             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" />
         </variation>
         <variation name="UpdateShoppingCartTestVariation2">
-            <data name="tag" xsi:type="string">severity:S0</data>
+            <data name="tag" xsi:type="string">severity:S0,mftf_migrated:yes</data>
             <data name="product/dataset" xsi:type="string">with_two_custom_option</data>
             <data name="product/data/price/value" xsi:type="string">50</data>
             <data name="product/data/checkout_data/qty" xsi:type="string">11</data>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
index 93240586ec92c..0a2ce7ab7f183 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
@@ -30,6 +30,7 @@
             </data>
         </variation>
         <variation name="ExportProductsTestVariation8" summary="Export simple and configured products with custom options" ticketId="MAGETWO-46113, MAGETWO-46109">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/1" xsi:type="array">
                 <item name="fixture" xsi:type="string">configurableProduct</item>
@@ -45,7 +46,7 @@
             </data>
         </variation>
         <variation name="ExportProductsTestVariation9" summary="Export simple product assigned to Main Website and configurable product assigned to Custom Website" ticketId="MAGETWO-46114">
-            <data name="issue" xsi:type="string">>MC-13864 Consumer always read config from memory</data>
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/1" xsi:type="array">
                 <item name="fixture" xsi:type="string">configurableProduct</item>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
index e1b6fcf47e562..f831173ba0ae0 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\ConfigurableProduct\Test\TestCase\CreateConfigurableProductEntityTest" summary="Create Configurable Product" ticketId="MAGETWO-26041">
         <variation name="CreateConfigurableProductEntityTestVariation1" summary="Create product with category and two new options">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_new_options</data>
             <data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options</data>
@@ -32,6 +33,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately"/>
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation2" summary="Create product with two options">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options</data>
             <data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options</data>
@@ -97,6 +99,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInCart" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation5" summary="Create Configurable Product and Assign it to Category" ticketId="MAGETWO-12620">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_fixed_price</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
@@ -113,7 +116,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation6" summary="Create Configurable Product with Creating New Category and New Attribute (Required Fields Only)" ticketId="MAGETWO-13361">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_searchable_options</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
@@ -129,6 +132,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation7" summary="Verify that variation's SKU based on parent SKU">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_new_options_with_empty_sku</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
@@ -137,6 +141,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsGeneratedSku" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation8" summary="Assert notice that existing sku automatically changed when saving product with same sku">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_new_options_with_parent_sku</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">existing_sku</data>
@@ -145,6 +150,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAutoincrementedSkuNoticeMessage" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation9" summary="Create configurable product and assign it to custom website">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_assigned_product_special_price</data>
             <data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_new_options_with_special_price</data>
@@ -156,6 +162,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOnCustomWebsite" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation10" summary="Create configurable product with tier price for one item">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_assigned_product_tier_price</data>
             <data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_new_options_with_special_price</data>
@@ -170,7 +177,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertProductTierPriceOnProductPage" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation11" summary="Create Configurable Product with out of stock child" ticketId="MAGETWO-65660">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">with_out_of_stock_item</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
@@ -189,7 +196,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductOutOfStockPage" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation12" summary="Create Configurable Product with disabled child" ticketId="MAGETWO-65661">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">with_disabled_item</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
@@ -207,7 +214,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductNotVisibleInCategory" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation13" summary="Create Configurable Product with one disabled child and with one out of stock child" ticketId="MAGETWO-65662">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">with_one_disabled_item_and_one_out_of_stock_item</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
@@ -225,6 +232,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation14" summary="Create configurable product with images" ticketId="MAGETWO-41354">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">color_and_size_with_images</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
@@ -238,6 +246,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductImages" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation15" summary="Create Configurable Product with 1 out of stock and several in stock options with displaying out of stock ones" ticketId="MAGETWO-89274">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">three_new_options_with_out_of_stock_product</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
@@ -254,6 +263,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertOutOfStockOptionIsAbsentOnProductPage" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation16" summary="Create Configurable Product with 1 out of stock and several in stock options" ticketId="MAGETWO-69508">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">three_new_options_with_out_of_stock_product</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
index a62bcf92ebf39..5af854cae5434 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\ValidateOrderOfProductTypeTest">
         <variation name="ValidateOrderOfProductTypeTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menu/1" xsi:type="string">Configurable Product</data>
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
index 5bb96dc13c739..ff87a1df60fe8 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Customer\Test\TestCase\CreateCustomerBackendEntityTest" summary="Create Customer from Backend" ticketId="MAGETWO-23424">
         <variation name="CreateCustomerBackendEntityTestVariation1" summary="General customer without address">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="customerAction" xsi:type="string">save</data>
             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
@@ -35,7 +36,7 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
         </variation>
         <variation name="CreateCustomerBackendEntityTestVariation3" summary="General customer from USA">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="customerAction" xsi:type="string">save</data>
             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
@@ -55,6 +56,7 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
         </variation>
         <variation name="CreateCustomerBackendEntityTestVariation4" summary="Retailer customer without address">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="customerAction" xsi:type="string">save</data>
             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
             <data name="customer/data/group_id/dataset" xsi:type="string">Retailer</data>
@@ -64,6 +66,7 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerInvalidEmail" />
         </variation>
         <variation name="CreateCustomerBackendEntityTestVariation5" summary="General customer from Poland">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="customerAction" xsi:type="string">save</data>
             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
@@ -83,6 +86,7 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
         </variation>
         <variation name="CreateCustomerBackendEntityTestVariation6" summary="Create New Customer on Backend" ticketId="MAGETWO-12516">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="customerAction" xsi:type="string">saveAndContinue</data>
             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
@@ -105,6 +109,7 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
         </variation>
         <variation name="CreateCustomerBackendEntityTestVariation8" summary="Verify required fields on Account Information tab.">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="customerAction" xsi:type="string">save</data>
             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
@@ -116,6 +121,7 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerBackendRequiredFields" />
         </variation>
         <variation name="CreateCustomerBackendEntityTestVariation9" summary="Verify required fields on the Add address modal.">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="customer/data/website_id" xsi:type="string">Main Website</data>
             <data name="customer/data/group_id/dataset" xsi:type="string">General</data>
             <data name="customer/data/firstname" xsi:type="string">John%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
index 24f68f686fdc1..095746cfdef57 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml
@@ -25,6 +25,7 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerInGrid" />
         </variation>
         <variation name="UpdateCustomerBackendEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCustomer/dataset" xsi:type="string">default</data>
             <data name="customer/data/email" xsi:type="string">-</data>
             <data name="address/data/prefix" xsi:type="string">Prefix%isolation%_</data>
@@ -75,6 +76,7 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerInGrid" />
         </variation>
         <variation name="UpdateCustomerBackendEntityTestVariation4" summary="Address w/o zip/state required, default billing/shipping checked">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCustomer/dataset" xsi:type="string">default</data>
             <data name="customer/data/email" xsi:type="string">-</data>
             <data name="address/data/default_billing" xsi:type="string">Yes</data>
@@ -95,6 +97,7 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerLogin" />
         </variation>
         <variation name="UpdateCustomerBackendEntityTestVariation5" summary="Default billing/shipping unchecked">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCustomer/dataset" xsi:type="string">johndoe_unique_TX</data>
             <data name="customer/data/email" xsi:type="string">-</data>
             <data name="address/data/default_billing" xsi:type="string">No</data>
@@ -114,6 +117,7 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
         </variation>
         <variation name="UpdateCustomerBackendEntityTestVariation6" summary="Delete customer address">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCustomer/dataset" xsi:type="string">johndoe_with_multiple_addresses</data>
             <data name="customer/data/email" xsi:type="string">-</data>
             <data name="addressIndexToDelete" xsi:type="number">1</data>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml
index 70a912a3b5ffe..e88e5161e474e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Customer\Test\TestCase\VerifyDisabledCustomerGroupFieldTest" summary="Check that field is disabled in system Customer Group" ticketId="MAGETWO-52481">
         <variation name="VerifyDisabledCustomerGroupField1" summary="Checks that customer_group_code field is disabled in NOT LOGGED IN Customer Group">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="customerGroup/dataset" xsi:type="string">NOT_LOGGED_IN</data>
             <data name="disabledFields" xsi:type="array">
                 <item name="0" xsi:type="string">customer_group_code</item>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/ValidateOrderOfProductTypeTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/ValidateOrderOfProductTypeTest.xml
index ccb74e1f79dc9..e807ec9134277 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/ValidateOrderOfProductTypeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/ValidateOrderOfProductTypeTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\ValidateOrderOfProductTypeTest">
         <variation name="ValidateOrderOfProductTypeTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menu/5" xsi:type="string">Downloadable Product</data>
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml
index cffcdbf45a6dc..a110dc6a89f8c 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
         <variation name="ExportProductsTestVariation6" summary="Export grouped product with special price" ticketId="MAGETWO-46116">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">groupedProduct</item>
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
index 5a5cfdd9adc4c..ac57cdeb92053 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/ValidateOrderOfProductTypeTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\ValidateOrderOfProductTypeTest">
         <variation name="ValidateOrderOfProductTypeTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menu/2" xsi:type="string">Grouped Product</data>
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
index cbdce59057195..bc529729f1217 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\PageCache\Test\TestCase\FlushStaticFilesCacheButtonVisibilityTest" summary="Flush Static Files Cache button visibility" ticketId="MAGETWO-39934">
         <variation name="FlushStaticFilesCacheButtonVisibilityTest">
-            <data name="tag" xsi:type="string">severity:S3</data>
+            <data name="tag" xsi:type="string">severity:S3, mftf_migrated:yes</data>
             <constraint name="Magento\PageCache\Test\Constraint\AssertFlushStaticFilesCacheButtonVisibility" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml
index 38ce04fa56d81..e05d0fea6b129 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml
@@ -8,17 +8,20 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sales\Test\TestCase\CreateCustomOrderStatusEntityTest" summary="Create Custom Order Status Entity" ticketId="MAGETWO-23412">
         <variation name="CreateCustomOrderStatusEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="orderStatus/data/status" xsi:type="string">order_status%isolation%</data>
             <data name="orderStatus/data/label" xsi:type="string">orderLabel%isolation%</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusInGrid" />
         </variation>
         <variation name="CreateCustomOrderStatusEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="orderStatus/data/status" xsi:type="string">pending</data>
             <data name="orderStatus/data/label" xsi:type="string">orderLabel%isolation%</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusDuplicateStatus" />
         </variation>
         <variation name="CreateCustomOrderStatusEntityTestVariation3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="orderStatus/data/status" xsi:type="string">order_status%isolation%</data>
             <data name="orderStatus/data/label" xsi:type="string">Suspected Fraud</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusSuccessCreateMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
index 586ad2acee203..4995c1feb048e 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
@@ -75,7 +75,6 @@
             <data name="salesRule/data/coupon_code" xsi:type="string">Lorem ipsum dolor sit amet, consectetur adipiscing elit - %isolation%</data>
             <data name="salesRule/data/simple_action" xsi:type="string">Fixed amount discount for whole cart</data>
             <data name="salesRule/data/discount_amount" xsi:type="string">60</data>
-            <data name="salesRule/data/apply_to_shipping" xsi:type="string">No</data>
             <data name="salesRule/data/simple_free_shipping" xsi:type="string">No</data>
             <data name="salesRule/data/store_labels/0" xsi:type="string">Coupon code+Fixed amount discount for whole cart</data>
             <data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml
index 5a547f69280e1..e35ef853d1b68 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Store\Test\TestCase\CreateWebsiteEntityTest" summary="Create Website" ticketId="MAGETWO-27665">
         <variation name="CreateWebsiteEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
             <data name="website/data/name" xsi:type="string">website_%isolation%</data>
             <data name="website/data/code" xsi:type="string">code_%isolation%</data>
             <constraint name="Magento\Store\Test\Constraint\AssertWebsiteSuccessSaveMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
index 306a9fd2024a4..cd37c555fdb1d 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Store\Test\TestCase\DeleteStoreEntityTest" summary="Delete Store View" ticketId="MAGETWO-27942">
         <variation name="DeleteStoreEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="store/dataset" xsi:type="string">custom</data>
             <data name="createBackup" xsi:type="string">Yes</data>
             <constraint name="Magento\Store\Test\Constraint\AssertStoreSuccessDeleteAndBackupMessages" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
index 66ae1d8179af5..865530862853a 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Store\Test\TestCase\DeleteStoreGroupEntityTest" summary="Delete Store Group" ticketId="MAGETWO-27596">
         <variation name="DeleteStoreGroupEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S3</data>
+            <data name="tag" xsi:type="string">severity:S3, mftf_migrated:yes</data>
             <data name="storeGroup/dataset" xsi:type="string">custom</data>
             <data name="createBackup" xsi:type="string">Yes</data>
             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupSuccessDeleteAndBackupMessages" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml
index ac857ad035f44..5db0e7f8baad4 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Store\Test\TestCase\UpdateWebsiteEntityTest" summary="Update Website" ticketId="MAGETWO-27690">
         <variation name="UpdateWebsiteEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="websiteOrigin/dataset" xsi:type="string">custom_website</data>
             <data name="website/data/name" xsi:type="string">website_upd%isolation%</data>
             <data name="website/data/code" xsi:type="string">code_upd%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml
index 730eb285d6d0c..1f888c3a2a8b9 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\UrlRewrite\Test\TestCase\CategoryUrlRewriteTest" summary="Check url rewrites in catalog categories after changing url key for store view and moving category." ticketId="MAGETWO-45385">
         <variation name="CategoryUrlRewriteTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="storeView/dataset" xsi:type="string">custom</data>
             <data name="childCategory/dataset" xsi:type="string">default</data>
             <data name="childCategory/data/category_products/dataset" xsi:type="string">catalogProductSimple::default</data>
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml
index 1917ec928bfaf..0cf2fd9c0d4e1 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateProductUrlRewriteEntityTest" summary="Create Product URL Rewrites" ticketId="MAGETWO-25150">
         <variation name="CreateProductUrlRewriteEntityTestVariation1" summary="Add Temporary Redirect for Product" ticketId="MAGETWO-12409">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
             <data name="product/dataset" xsi:type="string">product_with_category</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
@@ -19,6 +19,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteProductRedirect" />
         </variation>
         <variation name="CreateProductUrlRewriteEntityTestVariation2" summary="Create Product URL Rewrites with no redirect">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
             <data name="product/dataset" xsi:type="string">default</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
@@ -28,6 +29,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSaveMessage" />
         </variation>
         <variation name="CreateProductUrlRewriteEntityTestVariation3" summary="Create Product URL Rewrites with Temporary redirect">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
             <data name="product/dataset" xsi:type="string">default</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
@@ -38,6 +40,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteProductRedirect" />
         </variation>
         <variation name="CreateProductUrlRewriteEntityTestVariation4" summary="Create Product URL Rewrites with Permanent redirect">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
             <data name="product/dataset" xsi:type="string">default</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
@@ -48,6 +51,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteProductRedirect" />
         </variation>
         <variation name="CreateProductUrlRewriteEntityTestVariation5" summary="Autoupdate URL Rewrites if Subcategories deleted" ticketId="MAGETWO-27325">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
             <data name="product/dataset" xsi:type="string">product_with_category</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductWithSeveralWebsitesUrlRewriteTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductWithSeveralWebsitesUrlRewriteTest.xml
index 98e3f9e38382d..8e737f193cf94 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductWithSeveralWebsitesUrlRewriteTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductWithSeveralWebsitesUrlRewriteTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateProductWithSeveralWebsitesUrlRewriteTest" summary="Test product url rewrites when it is created in several websites">
         <variation name="CreateSimpleProductEntityWithSeveralWebsites" summary="Create product with several websites and check URL Rewites" ticketId="MAGETWO-27238">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml
index 90f5edec2f46b..8e0e8ebde99fb 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\UrlRewrite\Test\TestCase\DeleteCustomUrlRewriteEntityTest" summary="Delete Custom URL Rewrites" ticketId="MAGETWO-26337">
         <variation name="DeleteCustomUrlRewriteEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/dataset" xsi:type="string">default</data>
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteDeletedMessage" />
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteNotInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml
index 4a88ad01b5a75..b2be1a205212e 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\UrlRewrite\Test\TestCase\UpdateCategoryUrlRewriteEntityTest" summary="Update Category URL Rewrites" ticketId="MAGETWO-24838">
         <variation name="UpdateCategoryUrlRewriteEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="category/dataset" xsi:type="string">default_subcategory</data>
             <data name="categoryRewrite/dataset" xsi:type="string">default</data>
@@ -20,6 +21,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryRedirect" />
         </variation>
         <variation name="UpdateCategoryUrlRewriteEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="category/dataset" xsi:type="string">default_subcategory</data>
             <data name="categoryRewrite/dataset" xsi:type="string">default</data>
@@ -32,6 +34,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryRedirect" />
         </variation>
         <variation name="UpdateCategoryUrlRewriteEntityTestVariation3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="category/dataset" xsi:type="string">default_subcategory</data>
             <data name="categoryRewrite/dataset" xsi:type="string">default</data>
@@ -44,6 +47,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryRedirect" />
         </variation>
         <variation name="UpdateCategoryUrlRewriteEntityTestVariation4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="category/dataset" xsi:type="string">default_subcategory</data>
             <data name="categoryRewrite/dataset" xsi:type="string">default</data>
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml
index 3671cd767ece9..2405216c12203 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\UrlRewrite\Test\TestCase\UpdateCustomUrlRewriteEntityTest" summary="Update Custom URL Rewrites" ticketId="MAGETWO-25784">
         <variation name="UpdateCustomUrlRewriteEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialRewrite/dataset" xsi:type="string">default</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">wishlist/%isolation%</data>
@@ -19,7 +20,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSuccessOutsideRedirect" />
         </variation>
         <variation name="UpdateCustomUrlRewriteEntityTestVariation2">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="initialRewrite/dataset" xsi:type="string">custom_rewrite_wishlist</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">wishlist/%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml
index 60de554d594d2..8f12930aa417b 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\UrlRewrite\Test\TestCase\UpdateProductUrlRewriteEntityTest" summary="Update Product URL Rewrites" ticketId="MAGETWO-24819">
         <variation name="UpdateProductUrlRewriteEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/target_path/entity" xsi:type="string">product/%catalogProductSimple::product_100_dollar%</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">test_%isolation%.html</data>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
index f7c56ae1b9653..ecfbc8d353888 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
@@ -10,6 +10,7 @@
 use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\User\Test\Fixture\User;
+use Magento\User\Test\TestStep\LoginUserOnBackendWithErrorStep;
 
 /**
  * Asserts that user has only related permissions.
@@ -18,6 +19,8 @@ class AssertUserRoleRestrictedAccess extends AbstractConstraint
 {
     const DENIED_ACCESS = 'Sorry, you need permissions to view this content.';
 
+    protected $loginStep = 'Magento\User\Test\TestStep\LoginUserOnBackendStep';
+
     /**
      * Asserts that user has only related permissions.
      *
@@ -36,7 +39,7 @@ public function processAssert(
         $denyUrl
     ) {
         $this->objectManager->create(
-            \Magento\User\Test\TestStep\LoginUserOnBackendStep::class,
+            $this->loginStep,
             ['user' => $user]
         )->run();
 
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccessWithError.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccessWithError.php
new file mode 100644
index 0000000000000..b001893abb4c4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccessWithError.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\User\Test\Constraint;
+
+/**
+ * @inheritdoc
+ */
+class AssertUserRoleRestrictedAccessWithError extends AssertUserRoleRestrictedAccess
+{
+    protected $loginStep = 'Magento\User\Test\TestStep\LoginUserOnBackendWithErrorStep';
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
index c0c04628f744d..c4645e6e8916a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
@@ -7,14 +7,20 @@
 namespace Magento\User\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Magento\User\Test\Fixture\User;
 use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\User\Test\Fixture\User;
+use Magento\User\Test\TestStep\LoginUserOnBackendStep;
 
 /**
  * Verify whether customer has logged in to the Backend.
  */
 class AssertUserSuccessLogin extends AbstractConstraint
 {
+    /**
+     * @var string
+     */
+    protected $loginStep = LoginUserOnBackendStep::class;
+
     /**
      * Verify whether customer has logged in to the Backend.
      *
@@ -25,7 +31,7 @@ class AssertUserSuccessLogin extends AbstractConstraint
     public function processAssert(User $user, Dashboard $dashboard)
     {
         $this->objectManager->create(
-            \Magento\User\Test\TestStep\LoginUserOnBackendStep::class,
+            $this->loginStep,
             ['user' => $user]
         )->run();
         \PHPUnit\Framework\Assert::assertTrue(
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLoginWithError.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLoginWithError.php
new file mode 100644
index 0000000000000..9fed1f4df8573
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLoginWithError.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\Constraint;
+
+use Magento\User\Test\TestStep\LoginUserOnBackendWithErrorStep;
+
+/**
+ * Verify whether customer has logged in to the Backend with error alert.
+ */
+class AssertUserSuccessLoginWithError extends AssertUserSuccessLogin
+{
+    /**
+     * @var string
+     */
+    protected $loginStep = LoginUserOnBackendWithErrorStep::class;
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
index f7de667cf17ac..a89d1ede80112 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
@@ -32,7 +32,7 @@
             <constraint name="Magento\User\Test\Constraint\AssertUserInGrid" />
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogOut" />
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
-            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccess" />
+            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccessWithError" />
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
index cc1d0fc980fbf..58450abc71633 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
@@ -121,6 +121,11 @@ public function testUpdateAdminUserRolesEntity(
      */
     public function tearDown()
     {
+        sleep(3);
+        $modalMessage = $this->dashboard->getModalMessage();
+        if ($modalMessage->isVisible()) {
+            $modalMessage->acceptAlert();
+        }
         $this->dashboard->getAdminPanelHeader()->logOut();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
index 224ccbce10f96..db6a13d0f3551 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
@@ -29,8 +29,8 @@
             <constraint name="Magento\User\Test\Constraint\AssertRoleSuccessSaveMessage" />
             <constraint name="Magento\User\Test\Constraint\AssertRoleInGrid" />
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogOut" />
-            <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
-            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccess" />
+            <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLoginWithError"/>
+            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccessWithError" />
         </variation>
         <variation name="UpdateAdminUserRoleEntityTestVariation3">
             <data name="user/dataset" xsi:type="string">custom_admin_with_default_role</data>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php
new file mode 100644
index 0000000000000..51d48058c8ae5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\TestStep;
+
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Close access error modal message.
+ */
+class CloseErrorAlertStep implements TestStepInterface
+{
+    /**
+     * @var Dashboard
+     */
+    private $dashboard;
+
+    /**
+     * @var BrowserInterface
+     */
+    private $browser;
+
+    /**
+     * @param Dashboard $dashboard
+     * @param BrowserInterface $browser
+     */
+    public function __construct(
+        Dashboard $dashboard,
+        BrowserInterface $browser
+    ) {
+        $this->dashboard = $dashboard;
+        $this->browser = $browser;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $modalMessage = $this->dashboard->getModalMessage();
+        try {
+            $this->browser->waitUntil(
+                function () use ($modalMessage) {
+                    return $modalMessage->isVisible() ? true : null;
+                }
+            );
+            $modalMessage->acceptAlert();
+        } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+            //There is no modal to accept.
+        }
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
index 4f7e6deed7a85..c244e27d42899 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
@@ -50,7 +50,7 @@ class LoginUserOnBackendStep implements TestStepInterface
      *
      * @var BrowserInterface
      */
-    private $browser;
+    protected $browser;
 
     /**
      * Array of error messages on admin login form.
@@ -108,8 +108,6 @@ public function run()
                 }
             }
         }
-
-        $this->dashboard->getSystemMessageDialog()->closePopup();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendWithErrorStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendWithErrorStep.php
new file mode 100644
index 0000000000000..094f90d0a5d70
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendWithErrorStep.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\TestStep;
+
+use Magento\Backend\Test\Page\AdminAuthLogin;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\User\Test\Fixture\User;
+
+/**
+ * Login user on backend with access error.
+ */
+class LoginUserOnBackendWithErrorStep extends LoginUserOnBackendStep
+{
+    /**
+     * @var CloseErrorAlertStep
+     */
+    private $closeErrorAlertStep;
+
+    /**
+     * @param LogoutUserOnBackendStep $logoutUserOnBackendStep
+     * @param AdminAuthLogin $adminAuth
+     * @param User $user
+     * @param Dashboard $dashboard
+     * @param BrowserInterface $browser
+     */
+    public function __construct(
+        LogoutUserOnBackendStep $logoutUserOnBackendStep,
+        AdminAuthLogin $adminAuth,
+        User $user,
+        Dashboard $dashboard,
+        BrowserInterface $browser,
+        CloseErrorAlertStep $closeErrorAlertStep
+    ) {
+        parent::__construct($logoutUserOnBackendStep, $adminAuth, $user, $dashboard, $browser);
+        $this->closeErrorAlertStep = $closeErrorAlertStep;
+    }
+
+    /**
+     * Run step flow.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        parent::run();
+        $this->closeErrorAlertStep->run();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php
index 70a4080a0b4d5..7f366312bba24 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php
@@ -48,7 +48,6 @@ public function __construct(AdminAuthLogin $adminAuth, Dashboard $dashboard)
     public function run()
     {
         $this->adminAuth->open();
-        $this->dashboard->getSystemMessageDialog()->closePopup();
         $this->dashboard->getAdminPanelHeader()->logOut();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendWithErrorStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendWithErrorStep.php
new file mode 100644
index 0000000000000..ce49e86afc065
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendWithErrorStep.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\TestStep;
+
+use Magento\Backend\Test\Page\AdminAuthLogin;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+
+/**
+ * Logout user on backend with access error.
+ */
+class LogoutUserOnBackendWithErrorStep extends LogoutUserOnBackendStep
+{
+    /**
+     * @var CloseErrorAlertStep
+     */
+    private $closeErrorAlertStep;
+
+    public function __construct(
+        AdminAuthLogin $adminAuth,
+        Dashboard $dashboard,
+        CloseErrorAlertStep $closeErrorAlertStep
+    ) {
+        parent::__construct($adminAuth, $dashboard);
+        $this->closeErrorAlertStep = $closeErrorAlertStep;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $this->adminAuth->open();
+        $this->closeErrorAlertStep->run();
+        $this->dashboard->getAdminPanelHeader()->logOut();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/User/Test/etc/di.xml
new file mode 100644
index 0000000000000..1298bd56a8fb0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/etc/di.xml
@@ -0,0 +1,14 @@
+<?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\User\Test\TestStep\LoginUserOnBackendWithErrorStep">
+        <arguments>
+            <argument name="logoutUserOnBackendStep" xsi:type="object">\Magento\User\Test\TestStep\LogoutUserOnBackendWithErrorStep</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
index 9ca351aa1cf98..32240e68ae73e 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
@@ -95,17 +95,9 @@ public function initialize()
             $this->amqpHelper->deleteConnection($connectionName);
         }
         $this->amqpHelper->clearQueue("async.operations.all");
-        foreach ($this->consumers as $consumer) {
-            foreach ($this->getConsumerProcessIds($consumer) as $consumerProcessId) {
-                exec("kill {$consumerProcessId}");
-            }
-        }
-        foreach ($this->consumers as $consumer) {
-            if (!$this->getConsumerProcessIds($consumer)) {
-                exec("{$this->getConsumerStartCommand($consumer, true)} > /dev/null &");
-            }
-            sleep(5);
-        }
+
+        $this->stopConsumers();
+        $this->startConsumers();
 
         if (file_exists($this->logFilePath)) {
             // try to remove before failing the test
@@ -230,4 +222,19 @@ public function getPublisher()
     {
         return $this->publisher;
     }
+
+    /**
+     * Start consumers
+     *
+     * @return void
+     */
+    public function startConsumers(): void
+    {
+        foreach ($this->consumers as $consumer) {
+            if (!$this->getConsumerProcessIds($consumer)) {
+                exec("{$this->getConsumerStartCommand($consumer, true)} > /dev/null &");
+            }
+            sleep(5);
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
index 8aeee9cf12494..e11c5ce5d9cf3 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
@@ -87,41 +87,6 @@ public function testMassactionDefaultValues()
         $this->assertFalse($blockEmpty->isAvailable());
     }
 
-    public function testGetJavaScript()
-    {
-        $this->loadLayout();
-
-        $javascript = $this->_block->getJavaScript();
-
-        $expectedItemFirst = '#"option_id1":{"label":"Option One",' .
-            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
-            '"complete":"Test","id":"option_id1"}#';
-        $this->assertRegExp($expectedItemFirst, $javascript);
-
-        $expectedItemSecond = '#"option_id2":{"label":"Option Two",' .
-            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
-            '"confirm":"Are you sure\?","id":"option_id2"}#';
-        $this->assertRegExp($expectedItemSecond, $javascript);
-    }
-
-    public function testGetJavaScriptWithAddedItem()
-    {
-        $this->loadLayout();
-
-        $input = [
-            'id' => 'option_id3',
-            'label' => 'Option Three',
-            'url' => '*/*/option3',
-            'block_name' => 'admin.test.grid.massaction.option3',
-        ];
-        $expected = '#"option_id3":{"id":"option_id3","label":"Option Three",' .
-            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
-            '"block_name":"admin.test.grid.massaction.option3"}#';
-
-        $this->_block->addItem($input['id'], $input);
-        $this->assertRegExp($expected, $this->_block->getJavaScript());
-    }
-
     /**
      * @param string $mageMode
      * @param int $expectedCount
@@ -213,21 +178,4 @@ public function getItemsDataProvider()
             ]
         ];
     }
-
-    public function testGridContainsMassactionColumn()
-    {
-        $this->loadLayout();
-        $this->_layout->getBlock('admin.test.grid')->toHtml();
-
-        $gridMassactionColumn = $this->_layout->getBlock('admin.test.grid')
-            ->getColumnSet()
-            ->getChildBlock('massaction');
-
-        $this->assertNotNull($gridMassactionColumn, 'Massaction column does not exist in the grid column set');
-        $this->assertInstanceOf(
-            \Magento\Backend\Block\Widget\Grid\Column::class,
-            $gridMassactionColumn,
-            'Massaction column is not an instance of \Magento\Backend\Block\Widget\Column'
-        );
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
index 07af21505f180..89f1e5e5d53d6 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
@@ -21,6 +21,8 @@ public function testAjaxBlockAction()
 
     public function testTunnelAction()
     {
+        $this->markTestSkipped('MAGETWO-98800: TunnelAction fails when Google Chart API is not available');
+
         $testUrl = \Magento\Backend\Block\Dashboard\Graph::API_URL . '?cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World';
         $handle = curl_init();
         curl_setopt($handle, CURLOPT_URL, $testUrl);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php
new file mode 100644
index 0000000000000..fc79048f15f45
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Controller\Paypal;
+
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * ReviewTest
+ */
+class ReviewTest extends AbstractController
+{
+    /**
+     * @var Review
+     */
+    private $controller;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->controller = $this->_objectManager->create(Review::class);
+    }
+
+    /**
+     * Test controller implements correct interfaces
+     *
+     */
+    public function testInterfaceImplementation()
+    {
+        $this->assertInstanceOf(HttpGetActionInterface::class, $this->controller);
+        $this->assertInstanceOf(HttpPostActionInterface::class, $this->controller);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
index b97bd9f822666..e9cb2f2d6c9d4 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
@@ -13,7 +13,6 @@
  * @magentoDbIsolation disabled
  * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
  * @group indexer_dimension
- * @magentoAppArea frontend
  */
 class FixedBundlePriceCalculatorWithDimensionTest extends BundlePriceAbstract
 {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
index a2967878402d0..3ec8c806dcbb1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
@@ -5,13 +5,49 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action;
 
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\MessageQueue\PublisherConsumerController;
 
 /**
  * @magentoAppArea adminhtml
  */
 class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /** @var PublisherConsumerController */
+    private $publisherConsumerController;
+    private $consumers = ['product_action_attribute.update'];
+
+    protected function setUp()
+    {
+        $this->publisherConsumerController = Bootstrap::getObjectManager()->create(PublisherConsumerController::class, [
+            'consumers' => $this->consumers,
+            'logFilePath' => TESTS_TEMP_DIR . "/MessageQueueTestLog.txt",
+            'maxMessages' => null,
+            'appInitParams' => Bootstrap::getInstance()->getAppInitParams()
+        ]);
+
+        try {
+            $this->publisherConsumerController->startConsumers();
+        } catch (\Magento\TestFramework\MessageQueue\EnvironmentPreconditionException $e) {
+            $this->markTestSkipped($e->getMessage());
+        } catch (\Magento\TestFramework\MessageQueue\PreconditionFailedException $e) {
+            $this->fail(
+                $e->getMessage()
+            );
+        }
+
+        parent::setUp();
+    }
+
+    protected function tearDown()
+    {
+        $this->publisherConsumerController->stopConsumers();
+        parent::tearDown();
+    }
+
     /**
      * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save::execute
      *
@@ -20,7 +56,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
      */
     public function testSaveActionRedirectsSuccessfully()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** @var $session \Magento\Backend\Model\Session */
         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
@@ -59,13 +95,14 @@ public function testSaveActionRedirectsSuccessfully()
      */
     public function testSaveActionChangeVisibility($attributes)
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ProductRepository::class
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var ProductRepository $repository */
+        $repository = Bootstrap::getObjectManager()->create(
+            ProductRepository::class
         );
         $product = $repository->get('simple');
         $product->setOrigData();
-        $product->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE);
+        $product->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
         $product->save();
 
         /** @var $session \Magento\Backend\Model\Session */
@@ -75,15 +112,29 @@ public function testSaveActionChangeVisibility($attributes)
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
+
         /** @var \Magento\Catalog\Model\Category $category */
-        $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $categoryFactory = Bootstrap::getObjectManager()->get(
             \Magento\Catalog\Model\CategoryFactory::class
         );
         /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */
-        $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $listProduct = Bootstrap::getObjectManager()->get(
             \Magento\Catalog\Block\Product\ListProduct::class
         );
 
+        $this->publisherConsumerController->waitForAsynchronousResult(
+            function () use ($repository) {
+                sleep(3);
+                return $repository->get(
+                    'simple',
+                    false,
+                    null,
+                    true
+                )->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE;
+            },
+            []
+        );
+
         $category = $categoryFactory->create()->load(2);
         $layer = $listProduct->getLayer();
         $layer->setCurrentCategory($category);
@@ -105,7 +156,7 @@ public function testSaveActionChangeVisibility($attributes)
      */
     public function testValidateActionWithMassUpdate($attributes)
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** @var $session \Magento\Backend\Model\Session */
         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
@@ -156,8 +207,8 @@ public function validateActionDataProvider()
     public function saveActionVisibilityAttrDataProvider()
     {
         return [
-            ['arguments' => ['visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH]],
-            ['arguments' => ['visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG]]
+            ['arguments' => ['visibility' => Visibility::VISIBILITY_BOTH]],
+            ['arguments' => ['visibility' => Visibility::VISIBILITY_IN_CATALOG]]
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
index 5721982ab8dc3..d4926e78040d6 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
@@ -38,8 +38,7 @@ public function testGetProductCollection()
         /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
         $collection = $this->_model->getProductCollection();
         $this->assertInstanceOf(\Magento\Catalog\Model\ResourceModel\Product\Collection::class, $collection);
-        $ids = $collection->getAllIds();
-        $this->assertEquals(2, count($ids));
+        $this->assertEquals(2, $collection->count());
         $this->assertSame($collection, $this->_model->getProductCollection());
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
index 280e83a863325..fe39de2729eac 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product\Type;
@@ -108,7 +109,7 @@ public function testGetFinalPrice()
     }
 
     /**
-     * Get formated price
+     * Get formatted price
      */
     public function testGetFormatedPrice()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
index 7954e2c36227f..476f01eb277df 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
@@ -12,6 +12,11 @@
 
 class ProductTest extends TestCase
 {
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @var Product
      */
@@ -29,7 +34,8 @@ protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
 
-        $this->model = $this->objectManager->get(Product::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->model = $this->objectManager->create(Product::class);
     }
 
     /**
@@ -42,11 +48,29 @@ public function testGetAttributeRawValue()
         $sku = 'simple';
         $attribute = 'name';
 
-        /** @var ProductRepositoryInterface $productRepository */
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get($sku);
-
+        $product = $this->productRepository->get($sku);
         $actual = $this->model->getAttributeRawValue($product->getId(), $attribute, null);
         self::assertEquals($product->getName(), $actual);
     }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store catalog/price/scope 1
+     */
+    public function testUpdateStoreSpecificSpecialPrice()
+    {
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->get('simple', true, 1);
+        $this->assertEquals(5.99, $product->getSpecialPrice());
+
+        $product->setSpecialPrice('');
+        $this->model->save($product);
+        $product = $this->productRepository->get('simple', false, 1, true);
+        $this->assertEmpty($product->getSpecialPrice());
+
+        $product = $this->productRepository->get('simple', false, 0, true);
+        $this->assertEquals(5.99, $product->getSpecialPrice());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_full_option_set.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_full_option_set.php
index bd5dc541a15a5..5facba07d58f1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_full_option_set.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_full_option_set.php
@@ -187,6 +187,50 @@
         'price_type' => 'percent',
         'sku' => 'sku2',
         'max_characters' => 20,
+    ],
+    [
+        'title' => 'multiple option',
+        'type' => 'multiple',
+        'is_require' => true,
+        'sort_order' => 7,
+        'values' => [
+            [
+                'title' => 'multiple option 1',
+                'price' => 10,
+                'price_type' => 'fixed',
+                'sku' => 'multiple option 1 sku',
+                'sort_order' => 1,
+            ],
+            [
+                'title' => 'multiple option 2',
+                'price' => 20,
+                'price_type' => 'fixed',
+                'sku' => 'multiple option 2 sku',
+                'sort_order' => 2,
+            ],
+        ],
+    ],
+    [
+        'title' => 'checkbox option',
+        'type' => 'checkbox',
+        'is_require' => true,
+        'sort_order' => 6,
+        'values' => [
+            [
+                'title' => 'checkbox option 1',
+                'price' => 10,
+                'price_type' => 'fixed',
+                'sku' => 'checkbox option 1 sku',
+                'sort_order' => 1,
+            ],
+            [
+                'title' => 'checkbox option 2',
+                'price' => 20,
+                'price_type' => 'fixed',
+                'sku' => 'checkbox option 2 sku',
+                'sort_order' => 2,
+            ],
+        ],
     ]
 ];
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/text_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_text_attribute_rollback.php
similarity index 84%
rename from dev/tests/integration/testsuite/Magento/Catalog/_files/text_attribute_rollback.php
rename to dev/tests/integration/testsuite/Magento/Catalog/_files/product_text_attribute_rollback.php
index cbc0476efd1b5..a9ab0e11312b2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/text_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_text_attribute_rollback.php
@@ -3,13 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 /* Delete attribute with text_attribute code */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
+
 /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
 $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    'Magento\Catalog\Model\ResourceModel\Eav\Attribute'
+    \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
 );
 $attribute->load('text_attribute', 'attribute_code');
 $attribute->delete();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
index 168073bc6ab74..c57c7c3fd6a92 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
@@ -5,10 +5,10 @@
  */
 
 /** Delete all products */
-require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
 /** Delete text attribute */
-require dirname(dirname(__DIR__)) . '/Catalog/_files/text_attribute_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/product_text_attribute_rollback.php';
 
-require dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
+include dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
 
-require dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
index 168073bc6ab74..c57c7c3fd6a92 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
@@ -5,10 +5,10 @@
  */
 
 /** Delete all products */
-require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
 /** Delete text attribute */
-require dirname(dirname(__DIR__)) . '/Catalog/_files/text_attribute_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/product_text_attribute_rollback.php';
 
-require dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
+include dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
 
-require dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
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
index 994076badddae..60ccdb88676aa 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
@@ -22,6 +22,7 @@ class ResetQuoteAddressesTest extends \PHPUnit\Framework\TestCase
     /**
      * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
      *
+     * @magentoAppArea frontend
      * @return void
      */
     public function testAfterRemoveItem(): void
diff --git a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
index 73f1dd9e7b711..e59672f1b5e1a 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
@@ -7,6 +7,8 @@
 namespace Magento\Config\Console\Command;
 
 use Magento\Config\Model\Config\Backend\Admin\Custom;
+use Magento\Config\Model\Config\Structure\Converter;
+use Magento\Config\Model\Config\Structure\Data as StructureData;
 use Magento\Directory\Model\Currency;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -91,6 +93,8 @@ protected function setUp()
     {
         Bootstrap::getInstance()->reinitialize();
         $this->objectManager = Bootstrap::getObjectManager();
+        $this->extendSystemStructure();
+
         $this->scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
         $this->reader = $this->objectManager->get(FileReader::class);
         $this->filesystem = $this->objectManager->get(Filesystem::class);
@@ -123,6 +127,21 @@ protected function tearDown()
         $this->appConfig->reinit();
     }
 
+    /**
+     * Add test system structure to main system structure
+     *
+     * @return void
+     */
+    private function extendSystemStructure()
+    {
+        $document = new \DOMDocument();
+        $document->load(__DIR__ . '/../../_files/system.xml');
+        $converter = $this->objectManager->get(Converter::class);
+        $systemConfig = $converter->convert($document);
+        $structureData = $this->objectManager->get(StructureData::class);
+        $structureData->merge($systemConfig);
+    }
+
     /**
      * @return array
      */
@@ -191,6 +210,8 @@ public function runLockDataProvider()
             ['general/region/display_all', '1'],
             ['general/region/state_required', 'BR,FR', ScopeInterface::SCOPE_WEBSITE, 'base'],
             ['admin/security/use_form_key', '0'],
+            ['general/group/subgroup/field', 'default_value'],
+            ['general/group/subgroup/field', 'website_value', ScopeInterface::SCOPE_WEBSITE, 'base'],
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Config/_files/system.xml b/dev/tests/integration/testsuite/Magento/Config/_files/system.xml
new file mode 100644
index 0000000000000..f0063a3c0bf7f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Config/_files/system.xml
@@ -0,0 +1,20 @@
+<?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:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="general">
+            <group id="group">
+                <group id="subgroup">
+                    <field id="field" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Label</label>
+                    </field>
+                </group>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
index 234f0aae6a3ea..676433c0a1e6c 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
@@ -5,7 +5,19 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\Data;
 
-class AssociatedProductsTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Filters\FilterModifier;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\ConfigurablePanel;
+use Magento\Framework\App\RequestInterface;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * AssociatedProductsTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AssociatedProductsTest extends TestCase
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface $objectManager
@@ -17,7 +29,10 @@ class AssociatedProductsTest extends \PHPUnit\Framework\TestCase
      */
     private $registry;
 
-    public function setUp()
+    /**
+     * @inheritdoc
+     */
+    public function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->registry = $this->objectManager->get(\Magento\Framework\Registry::class);
@@ -64,6 +79,53 @@ public function testGetProductMatrix($interfaceLocale)
         }
     }
 
+    /**
+     * Tests configurable product won't appear in product listing.
+     *
+     * Tests configurable product won't appear in configurable associated product listing if its options attribute
+     * is not filterable in grid.
+     *
+     * @return void
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoAppArea adminhtml
+     */
+    public function testAddManuallyConfigurationsWithNotFilterableInGridAttribute(): void
+    {
+        /** @var RequestInterface $request */
+        $request = $this->objectManager->get(RequestInterface::class);
+        $request->setParams([
+            FilterModifier::FILTER_MODIFIER => [
+                'test_configurable' => [
+                    'condition_type' => 'notnull',
+                ],
+            ],
+            'attributes_codes' => [
+                'test_configurable'
+            ],
+        ]);
+        $context = $this->objectManager->create(ContextInterface::class, ['request' => $request]);
+        /** @var UiComponentFactory $uiComponentFactory */
+        $uiComponentFactory = $this->objectManager->get(UiComponentFactory::class);
+        $uiComponent = $uiComponentFactory->create(
+            ConfigurablePanel::ASSOCIATED_PRODUCT_LISTING,
+            null,
+            ['context' => $context]
+        );
+
+        foreach ($uiComponent->getChildComponents() as $childUiComponent) {
+            $childUiComponent->prepare();
+        }
+
+        $dataSource = $uiComponent->getDataSourceData();
+        $skus = array_column($dataSource['data']['items'], 'sku');
+
+        $this->assertNotContains(
+            'configurable',
+            $skus,
+            'Only products with specified attribute should be in product list'
+        );
+    }
+
     /**
      * @return array
      */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index ea7a7710acbc3..10b632c002475 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -751,6 +751,21 @@ public function loginPostRedirectDataProvider()
         ];
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoAppArea frontend
+     */
+    public function testCheckVisitorModel()
+    {
+        /** @var \Magento\Customer\Model\Visitor $visitor */
+        $visitor = $this->_objectManager->get(\Magento\Customer\Model\Visitor::class);
+        $this->login(1);
+        $this->assertNull($visitor->getId());
+        $this->dispatch('customer/account/index');
+        $this->assertNotNull($visitor->getId());
+    }
+
     /**
      * @param string $email
      * @return void
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
index 978815f665341..a52c5bb9e21b7 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
@@ -43,7 +43,7 @@ protected function setUp()
         $contentManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+        $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Client\Elasticsearch::class)
             ->disableOriginalConstructor()
             ->getMock();
         $contentManager
@@ -78,7 +78,7 @@ protected function setUp()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @return void
      */
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
index 61add5f7d0ea7..3eea2497daa1f 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
@@ -10,7 +10,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
 use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
 
@@ -95,7 +95,7 @@ private function search($text)
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductName()
@@ -104,7 +104,7 @@ public function testSearchConfigurableProductBySimpleProductName()
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeMultiselect()
@@ -113,7 +113,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeMultiselect
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeSelect()
@@ -122,7 +122,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeSelect()
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeShortDescription()
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
index 014aaf7679bc9..77533e83b719c 100755
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
@@ -13,7 +13,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
 use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
 use Magento\Indexer\Model\Indexer;
@@ -87,7 +87,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @return void
      */
@@ -106,7 +106,7 @@ public function testReindexAll(): void
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @return void
      */
@@ -131,7 +131,7 @@ public function testReindexRowAfterEdit(): void
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @return void
      */
@@ -170,7 +170,7 @@ public function testReindexRowAfterMassAction(): void
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @magentoAppArea adminhtml
      * @return void
@@ -192,7 +192,7 @@ public function testReindexRowAfterDelete(): void
     /**
      * @magentoDbIsolation enabled
      * @magentoAppArea adminhtml
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @magentoDataFixture Magento/Elasticsearch/_files/configurable_products.php
      * @return void
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
index d40ce9e8a0706..7d4aa8e005e4e 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
@@ -68,7 +68,7 @@ protected function setUp()
     /**
      * Test search of all products after full reindex
      *
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
      */
@@ -82,7 +82,7 @@ public function testSearchAll()
     /**
      * Test search of specific product after full reindex
      *
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
      */
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
index dc288a18fadb7..a3da32e0d6c40 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Elasticsearch\SearchAdapter;
 
-use Magento\Elasticsearch\Model\Config;
-
 /**
  * Class AdapterTest
  *
@@ -26,7 +24,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
     /**
      * @var string
      */
-    protected $searchEngine = Config::ENGINE_NAME;
+    protected $searchEngine = 'elasticsearch6';
 
     /**
      * Get request config path
@@ -43,12 +41,12 @@ protected function getRequestConfigPath()
      */
     protected function createAdapter()
     {
-        return $this->objectManager->create(\Magento\Elasticsearch\SearchAdapter\Adapter::class);
+        return $this->objectManager->create(\Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter::class);
     }
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchQuery()
@@ -58,7 +56,7 @@ public function testMatchQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchOrderedQuery()
@@ -70,7 +68,7 @@ public function testMatchOrderedQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAggregationsQuery()
@@ -80,7 +78,7 @@ public function testAggregationsQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchQueryFilters()
@@ -92,7 +90,7 @@ public function testMatchQueryFilters()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithAllFields()
@@ -104,7 +102,7 @@ public function testRangeFilterWithAllFields()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithoutFromField()
@@ -116,7 +114,7 @@ public function testRangeFilterWithoutFromField()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithoutToField()
@@ -128,7 +126,7 @@ public function testRangeFilterWithoutToField()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testTermFilter()
@@ -140,7 +138,7 @@ public function testTermFilter()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testTermFilterArray()
@@ -152,7 +150,7 @@ public function testTermFilterArray()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testWildcardFilter()
@@ -164,7 +162,7 @@ public function testWildcardFilter()
      * Request limits test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testSearchLimit()
@@ -176,7 +174,7 @@ public function testSearchLimit()
      * Bool filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilter()
@@ -188,7 +186,7 @@ public function testBoolFilter()
      * Test bool filter with nested negative bool filter
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilterWithNestedNegativeBoolFilter()
@@ -200,7 +198,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter()
      * Test range inside nested negative bool filter
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
@@ -213,7 +211,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
      *
      * @dataProvider elasticSearchAdvancedSearchDataProvider
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @param string $nameQuery
      * @param string $descriptionQuery
@@ -259,7 +257,7 @@ public function elasticSearchAdvancedSearchDataProvider()
     /**
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attribute.php
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testCustomFilterableAttribute()
@@ -274,7 +272,7 @@ public function testCustomFilterableAttribute()
      *
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attributes.php
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @dataProvider filterByAttributeValuesDataProvider
      * @param string $requestName
@@ -294,7 +292,7 @@ public function testFilterByAttributeValues($requestName, $additionalData)
      * @param $rangeFilter
      * @param $expectedRecordsCount
      * @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @magentoAppIsolation enabled
      * @dataProvider dateDataProvider
@@ -309,7 +307,7 @@ public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount)
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAdvancedSearchCompositeProductWithOutOfStockOption()
@@ -320,7 +318,7 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption()
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_disabled_child.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAdvancedSearchCompositeProductWithDisabledChild()
@@ -333,7 +331,7 @@ public function testAdvancedSearchCompositeProductWithDisabledChild()
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/search_weight_products.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testSearchQueryBoost()
@@ -369,4 +367,18 @@ public function dateDataProvider()
             [['from' => '2000-02-01T00:00:00Z', 'to' => ''], 0],
         ];
     }
+
+    public function filterByAttributeValuesDataProvider()
+    {
+        $variations = parent::filterByAttributeValuesDataProvider();
+
+        $variations['quick search by date'] = [
+            'quick_search_container',
+            [
+                'search_term' => '2000-10-30',
+            ],
+        ];
+
+        return $variations;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php
new file mode 100644
index 0000000000000..e64b3c505acf1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+/**
+ * \Magento\Framework\Lock\Backend\File test case
+ */
+class FileLockTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Lock\Backend\FileLock
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->create(
+            \Magento\Framework\Lock\Backend\FileLock::class,
+            ['path' => '/tmp']
+        );
+    }
+
+    public function testLockAndUnlock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+
+        $this->assertTrue($this->model->lock($name));
+        $this->assertTrue($this->model->isLocked($name));
+        $this->assertFalse($this->model->lock($name, 2));
+
+        $this->assertTrue($this->model->unlock($name));
+        $this->assertFalse($this->model->isLocked($name));
+    }
+
+    public function testUnlockWithoutExistingLock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+        $this->assertFalse($this->model->unlock($name));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
new file mode 100644
index 0000000000000..8d0caad5d55e4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\App\DeploymentConfig\FileReader;
+use Magento\Framework\Stdlib\ArrayManager;
+
+/**
+ * \Magento\Framework\Lock\Backend\Zookeeper test case
+ */
+class ZookeeperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FileReader
+     */
+    private $configReader;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var LockBackendFactory
+     */
+    private $lockBackendFactory;
+
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * @var ZookeeperLock
+     */
+    private $model;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        if (!extension_loaded('zookeeper')) {
+            $this->markTestSkipped('php extension Zookeeper is not installed.');
+        }
+
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->configReader = $this->objectManager->get(FileReader::class);
+        $this->lockBackendFactory = $this->objectManager->create(LockBackendFactory::class);
+        $this->arrayManager = $this->objectManager->create(ArrayManager::class);
+        $config = $this->configReader->load(ConfigFilePool::APP_ENV);
+
+        if ($this->arrayManager->get('lock/provider', $config) !== 'zookeeper') {
+            $this->markTestSkipped('Zookeeper is not configured during installation.');
+        }
+
+        $this->model = $this->lockBackendFactory->create();
+        $this->assertInstanceOf(ZookeeperLock::class, $this->model);
+    }
+
+    public function testLockAndUnlock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+
+        $this->assertTrue($this->model->lock($name));
+        $this->assertTrue($this->model->isLocked($name));
+        $this->assertFalse($this->model->lock($name, 2));
+
+        $this->assertTrue($this->model->unlock($name));
+        $this->assertFalse($this->model->isLocked($name));
+    }
+
+    public function testUnlockWithoutExistingLock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+        $this->assertFalse($this->model->unlock($name));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
index b09af48b5f943..f4f3337a253c0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
@@ -20,6 +20,10 @@
     CategorySetup::class,
     ['resourceName' => 'catalog_setup']
 );
+$productEntityTypeId = $installer->getEntityTypeId(
+    \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE
+);
+
 $selectOptions = [];
 $selectAttributes = [];
 foreach (range(1, 2) as $index) {
@@ -30,7 +34,7 @@
     $selectAttribute->setData(
         [
             'attribute_code' => 'select_attribute_' . $index,
-            'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
+            'entity_type_id' => $productEntityTypeId,
             'is_global' => 1,
             'is_user_defined' => 1,
             'frontend_input' => 'select',
@@ -56,7 +60,8 @@
     );
     $selectAttribute->save();
     /* Assign attribute to attribute set */
-    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $selectAttribute->getId());
+    $installer->addAttributeToGroup($productEntityTypeId, 'Default', 'General', $selectAttribute->getId());
+
     /** @var $selectOptions Collection */
     $selectOption = Bootstrap::getObjectManager()->create(
         Collection::class
@@ -65,6 +70,26 @@
     $selectAttributes[$index] = $selectAttribute;
     $selectOptions[$index] = $selectOption;
 }
+
+$dateAttribute = Bootstrap::getObjectManager()->create(Attribute::class);
+$dateAttribute->setData(
+    [
+        'attribute_code' => 'date_attribute',
+        'entity_type_id' => $productEntityTypeId,
+        'is_global' => 1,
+        'is_filterable' => 1,
+        'backend_type' => 'datetime',
+        'frontend_input' => 'date',
+        'frontend_label' => 'Test Date',
+        'is_searchable' => 1,
+        'is_filterable_in_search' => 1,
+    ]
+);
+$dateAttribute->save();
+/* Assign attribute to attribute set */
+$installer->addAttributeToGroup($productEntityTypeId, 'Default', 'General', $dateAttribute->getId());
+
+$productAttributeSetId = $installer->getAttributeSetId($productEntityTypeId, 'Default');
 /* Create simple products per each first attribute option */
 foreach ($selectOptions[1] as $option) {
     /** @var $product Product */
@@ -74,7 +99,7 @@
     $product->setTypeId(
         Type::TYPE_SIMPLE
     )->setAttributeSetId(
-        $installer->getAttributeSetId('catalog_product', 'Default')
+        $productAttributeSetId
     )->setWebsiteIds(
         [1]
     )->setName(
@@ -92,6 +117,7 @@
     )->setStockData(
         ['use_config_manage_stock' => 1, 'qty' => 5, 'is_in_stock' => 1]
     )->save();
+
     Bootstrap::getObjectManager()->get(
         Action::class
     )->updateAttributes(
@@ -99,6 +125,7 @@
         [
             $selectAttributes[1]->getAttributeCode() => $option->getId(),
             $selectAttributes[2]->getAttributeCode() => $selectOptions[2]->getLastItem()->getId(),
+            $dateAttribute->getAttributeCode() => '10/30/2000',
         ],
         $product->getStoreId()
     );
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php
index 18a5372d06d98..fd413726b2637 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php
@@ -13,6 +13,7 @@
 $registry = Bootstrap::getObjectManager()->get(Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
+
 /** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product\Collection */
 $productCollection = Bootstrap::getObjectManager()
     ->create(Product::class)
@@ -20,17 +21,26 @@
 foreach ($productCollection as $product) {
     $product->delete();
 }
+
 /** @var $attribute Attribute */
 $attribute = Bootstrap::getObjectManager()->create(
     Attribute::class
 );
 /** @var $installer CategorySetup */
 $installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
+$productEntityTypeId = $installer->getEntityTypeId(
+    \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE
+);
 foreach (range(1, 2) as $index) {
-    $attribute->loadByCode($installer->getEntityTypeId('catalog_product'), 'select_attribute_' . $index);
+    $attribute->loadByCode($productEntityTypeId, 'select_attribute_' . $index);
     if ($attribute->getId()) {
         $attribute->delete();
     }
 }
+$attribute->loadByCode($productEntityTypeId, 'date_attribute');
+if ($attribute->getId()) {
+    $attribute->delete();
+}
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
index 8586f47a0f7fa..0aaa3f4e15bda 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
@@ -35,6 +35,7 @@
             'match_query' => [
                 'value' => '$match_term_override$',
                 'name' => 'match_query',
+                'boost' => '1',
                 'match' => [
                     0 => [
                         'field' => 'match_field',
@@ -50,6 +51,7 @@
             ],
             'must_query' => [
                 'name' => 'must_query',
+                'boost' => '1',
                 'filterReference' =>  [
                     0 => [
                         'clause' => 'must',
@@ -60,6 +62,7 @@
             ],
             'should_query' => [
                 'name' => 'should_query',
+                'boost' => '1',
                 'filterReference' => [
                     0 => [
                         'clause' => 'should',
@@ -70,6 +73,7 @@
             ],
             'not_query' => [
                 'name' => 'not_query',
+                'boost' => '1',
                 'filterReference' => [
                     0 => [
                         'clause' => 'not',
@@ -80,6 +84,7 @@
             ],
             'match_query_2' => [
                 'value' => '$match_term_override$',
+                'boost' => '1',
                 'name' => 'match_query_2',
                 'match' => [
                     0 => [
@@ -163,6 +168,7 @@
         'queries' => [
             'filter_query' => [
                 'name' => 'filter_query',
+                'boost' => '1',
                 'filterReference' => [
                     0 =>
                         [
@@ -230,6 +236,7 @@
             'new_match_query' => [
                 'value' => '$match_term$',
                 'name' => 'new_match_query',
+                'boost' => '1',
                 'match' => [
                     0 =>
                         [
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
new file mode 100644
index 0000000000000..48d3356525f49
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber;
+
+/**
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ *
+ * @see \Magento\Newsletter\Block\Adminhtml\Subscriber\Grid
+ */
+class GridTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var null|\Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+    /**
+     * @var null|\Magento\Framework\View\LayoutInterface
+     */
+    private $layout = null;
+
+    /**
+     * Set up layout.
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->layout = $this->objectManager->create(\Magento\Framework\View\LayoutInterface::class);
+        $this->layout->getUpdate()->load('newsletter_subscriber_grid');
+        $this->layout->generateXml();
+        $this->layout->generateElements();
+    }
+
+    /**
+     * Check if mass action block exists.
+     */
+    public function testMassActionBlockExists()
+    {
+        $this->assertNotFalse(
+            $this->getMassActionBlock(),
+            'Mass action block does not exist in the grid, or it name was changed.'
+        );
+    }
+
+    /**
+     * Check if mass action id field is correct.
+     */
+    public function testMassActionFieldIdIsCorrect()
+    {
+        $this->assertEquals(
+            'subscriber_id',
+            $this->getMassActionBlock()->getMassactionIdField(),
+            'Mass action id field is incorrect.'
+        );
+    }
+
+    /**
+     * Check if function returns correct result.
+     *
+     * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
+     */
+    public function testMassActionBlockContainsCorrectIdList()
+    {
+        $this->assertEquals(
+            implode(',', $this->getAllSubscriberIdList()),
+            $this->getMassActionBlock()->getGridIdsJson(),
+            'Function returns incorrect result.'
+        );
+    }
+
+    /**
+     * Retrieve mass action block.
+     *
+     * @return bool|\Magento\Backend\Block\Widget\Grid\Massaction
+     */
+    private function getMassActionBlock()
+    {
+        return $this->layout->getBlock('adminhtml.newslettrer.subscriber.grid.massaction');
+    }
+
+    /**
+     * Retrieve list of id of all subscribers.
+     *
+     * @return array
+     */
+    private function getAllSubscriberIdList()
+    {
+        /** @var \Magento\Framework\App\ResourceConnection $resourceConnection */
+        $resourceConnection = $this->objectManager->get(\Magento\Framework\App\ResourceConnection::class);
+        $select = $resourceConnection->getConnection()
+            ->select()
+            ->from($resourceConnection->getTableName('newsletter_subscriber'))
+            ->columns(['subscriber_id' => 'subscriber_id']);
+
+        return $resourceConnection->getConnection()->fetchCol($select);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
new file mode 100644
index 0000000000000..08694bf8c7d0b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+
+$configWriter->save('carriers/flatrate/active', 1);
+$configWriter->save('carriers/tablerate/active', 1);
+$configWriter->save('carriers/freeshipping/active', 1);
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods_rollback.php
new file mode 100644
index 0000000000000..31a16f42adfce
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods_rollback.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer  $configWriter */
+$configWriter = $objectManager->create(WriterInterface::class);
+
+$configWriter->delete('carriers/flatrate/active');
+$configWriter->delete('carriers/tablerate/active');
+$configWriter->delete('carriers/freeshipping/active');
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight.php
new file mode 100644
index 0000000000000..40e01a81ac807
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$resource = $objectManager->get(\Magento\Framework\App\ResourceConnection::class);
+$connection = $resource->getConnection();
+$resourceModel = $objectManager->create(\Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate::class);
+$entityTable = $resourceModel->getTable('shipping_tablerate');
+$data =
+    [
+        'website_id' => 1,
+        'dest_country_id' => 'US',
+        'dest_region_id' => 0,
+        'dest_zip' => '*',
+        'condition_name' => 'package_weight',
+        'condition_value' => 0,
+        'price' => 10,
+        'cost' => 0
+    ];
+$connection->query(
+    "INSERT INTO {$entityTable} (`website_id`,  `dest_country_id`, `dest_region_id`, `dest_zip`, `condition_name`,"
+    . "`condition_value`, `price`, `cost`) VALUES (:website_id,  :dest_country_id, :dest_region_id, :dest_zip,"
+    . " :condition_name, :condition_value, :price, :cost);",
+    $data
+);
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight_rollback.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight_rollback.php
new file mode 100644
index 0000000000000..cb6e9353b8972
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_weight_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'tablerates_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
new file mode 100644
index 0000000000000..ac811e67c580a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$paymentMethodList = $objectManager->get(\Magento\Payment\Api\PaymentMethodListInterface::class);
+$rollbackConfigKey = 'test/payment/disabled_payment_methods';
+$configData = [];
+$disabledPaymentMethods = [];
+
+// Get all active Payment Methods
+foreach ($paymentMethodList->getActiveList(Store::DEFAULT_STORE_ID) as $paymentMethod) {
+    $configData['payment/' . $paymentMethod->getCode() . '/active'] = 0;
+    $disabledPaymentMethods[] = $paymentMethod->getCode();
+}
+// Remember all manually disabled Payment Methods for rollback
+$configData[$rollbackConfigKey] = implode(',', $disabledPaymentMethods);
+
+/** @var Config $defConfig */
+$defConfig = $objectManager->create(Config::class);
+$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+
+foreach ($configData as $key => $value) {
+    $defConfig->setDataByPath($key, $value);
+    $defConfig->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
new file mode 100644
index 0000000000000..4a56888058e4d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$rollbackConfigKey = 'test/payment/disabled_payment_methods';
+
+$configWriter = $objectManager->create(WriterInterface::class);
+$rollbackConfigValue = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
+    ->getStore(\Magento\Store\Model\Store::DEFAULT_STORE_ID)
+    ->getConfig($rollbackConfigKey);
+
+$disabledPaymentMethods = [];
+if (!empty($rollbackConfigValue)) {
+    $disabledPaymentMethods = explode(',', $rollbackConfigValue);
+}
+
+if (count($disabledPaymentMethods)) {
+    foreach ($disabledPaymentMethods as $keyToRemove) {
+        $configWriter->delete(sprintf('payment/%s/active', $keyToRemove));
+    }
+}
+$configWriter->delete($rollbackConfigKey);
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
index cb83fa3abd857..3f7f8719fd587 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
@@ -72,7 +72,7 @@ protected function setUp()
 
         $this->api = $this->getMockBuilder(Nvp::class)
             ->disableOriginalConstructor()
-            ->setMethods(['call', 'getExportedShippingAddress', 'getExportedBillingAddress'])
+            ->setMethods(['call', 'getExportedShippingAddress', 'getExportedBillingAddress', 'getShippingRateCode'])
             ->getMock();
 
         $this->api->expects($this->any())
@@ -302,6 +302,8 @@ public function testReturnFromPaypal()
     public function testReturnFromPaypalButton()
     {
         $quote = $this->getFixtureQuote();
+        $quote->getShippingAddress()->setShippingMethod('');
+
         $this->prepareCheckoutModel($quote);
         $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 1);
 
@@ -317,6 +319,8 @@ public function testReturnFromPaypalButton()
         $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone());
         $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail());
 
+        $this->assertEquals('flatrate_flatrate', $shippingAddress->getShippingMethod());
+
         $this->assertEquals([$exportedShippingData['street']], $billingAddress->getStreet());
         $this->assertEquals($exportedShippingData['firstname'], $billingAddress->getFirstname());
         $this->assertEquals($exportedShippingData['city'], $billingAddress->getCity());
@@ -551,6 +555,9 @@ private function prepareCheckoutModel(Quote $quote, $prefix = '')
         $this->api->method('getExportedShippingAddress')
             ->willReturn($exportedShippingAddress);
 
+        $this->api->method('getShippingRateCode')
+            ->willReturn('flatrate_flatrate Flat Rate - Fixed');
+
         $this->paypalInfo->method('importToPayment')
             ->with($this->api, $quote->getPayment());
     }
@@ -573,7 +580,7 @@ private function getExportedData(): array
                 'city'       => 'Denver',
                 'street'     => '66 Pearl St',
                 'postcode'   => '80203',
-                'telephone'  => '555-555-555'
+                'telephone'  => '555-555-555',
             ],
             'billing' => [
                 'email'      => 'customer@example.com',
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Guest/FormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Guest/FormTest.php
new file mode 100644
index 0000000000000..1067a474e19aa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Guest/FormTest.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Guest;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * @magentoAppIsolation enabled
+ */
+class FormTest extends AbstractController
+{
+    /**
+     * Test view order as guest with correct data
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     */
+    public function testViewOrderAsGuest()
+    {
+        $this->prepareRequestData();
+        $this->dispatch('sales/guest/view/');
+        $content = $this->getResponse()->getBody();
+        $this->assertContains('Order # 100000001', $content);
+    }
+
+    /**
+     * View order as logged in customer
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testViewOrderAsLoggedIn()
+    {
+        $this->login(1);
+        $this->dispatch('sales/guest/view/');
+        $this->assertRedirect($this->stringContains('sales/order/history/'));
+    }
+
+    /**
+     * Test attempting to open the Returns form as logged in customer
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testAttemptToOpenTheFormAsLoggedIn()
+    {
+        $this->login(1);
+        $this->dispatch('sales/guest/form/');
+        $this->assertRedirect($this->stringContains('customer/account'));
+    }
+
+    /**
+     * Test Return Order for guest with incorrect data
+     */
+    public function testViewOrderAsGuestWithIncorrectData()
+    {
+        $this->prepareRequestData(true);
+        $this->dispatch('sales/guest/view/');
+        $this->assertSessionMessages(
+            $this->equalTo(['You entered incorrect data. Please try again.']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Login the user
+     *
+     * @param string $customerId Customer to mark as logged in for the session
+     * @return void
+     */
+    protected function login($customerId)
+    {
+        /** @var Session $session */
+        $session = $this->_objectManager->get(Session::class);
+        $session->loginById($customerId);
+    }
+
+    /**
+     * @param bool $invalidData
+     * @return void
+     */
+    private function prepareRequestData($invalidData = false)
+    {
+        $orderId = 100000001;
+        $email = $invalidData ? 'wrong@example.com' : 'customer@null.com';
+
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'oar_order_id' => $orderId,
+            'oar_billing_lastname' => 'lastname',
+            'oar_type' => 'email',
+            'oar_email' => $email,
+            'oar_zip' => '',
+            'form_key' => $formKey->getFormKey(),
+        ];
+
+        $this->getRequest()->setMethod(Request::METHOD_POST);
+        $this->getRequest()->setPostValue($post);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.php
new file mode 100644
index 0000000000000..e35c480e44c66
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Service;
+
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Tests \Magento\Sales\Model\Service\InvoiceService
+ */
+class InvoiceServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var InvoiceService
+     */
+    private $invoiceService;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->invoiceService = Bootstrap::getObjectManager()->create(InvoiceService::class);
+    }
+
+    /**
+     * @param int $invoiceQty
+     * @magentoDataFixture Magento/Sales/_files/order_configurable_product.php
+     * @return void
+     * @dataProvider prepareInvoiceConfigurableProductDataProvider
+     */
+    public function testPrepareInvoiceConfigurableProduct(int $invoiceQty): void
+    {
+        /** @var OrderInterface $order */
+        $order = Bootstrap::getObjectManager()->create(Order::class)->load('100000001', 'increment_id');
+        $orderItems = $order->getItems();
+        foreach ($orderItems as $orderItem) {
+            if ($orderItem->getParentItemId()) {
+                $parentItemId = $orderItem->getParentItemId();
+            }
+        }
+        $invoice = $this->invoiceService->prepareInvoice($order, [$parentItemId => $invoiceQty]);
+        $invoiceItems = $invoice->getItems();
+        foreach ($invoiceItems as $invoiceItem) {
+            $this->assertEquals($invoiceQty, $invoiceItem->getQty());
+        }
+    }
+
+    public function prepareInvoiceConfigurableProductDataProvider()
+    {
+        return [
+            'full invoice' => [2],
+            'partial invoice' => [1]
+        ];
+    }
+
+    /**
+     * @param int $invoiceQty
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @return void
+     * @dataProvider prepareInvoiceSimpleProductDataProvider
+     */
+    public function testPrepareInvoiceSimpleProduct(int $invoiceQty): void
+    {
+        /** @var OrderInterface $order */
+        $order = Bootstrap::getObjectManager()->create(Order::class)->load('100000001', 'increment_id');
+        $orderItems = $order->getItems();
+        $invoiceQtys = [];
+        foreach ($orderItems as $orderItem) {
+            $invoiceQtys[$orderItem->getItemId()] = $invoiceQty;
+        }
+        $invoice = $this->invoiceService->prepareInvoice($order, $invoiceQtys);
+        $invoiceItems = $invoice->getItems();
+        foreach ($invoiceItems as $invoiceItem) {
+            $this->assertEquals($invoiceQty, $invoiceItem->getQty());
+        }
+    }
+
+    public function prepareInvoiceSimpleProductDataProvider()
+    {
+        return [
+            'full invoice' => [2],
+            'partial invoice' => [1]
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
index b9ba89ba53144..2d0020ba22680 100644
--- a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
@@ -48,7 +48,22 @@ public static function loadByPhraseDataProvider()
                 ['synonyms' => 'queen,monarch', 'store_id' => 1, 'website_id' => 0],
                 ['synonyms' => 'british,english', 'store_id' => 1, 'website_id' => 0]
                 ]
-            ]
+            ],
+            [
+                'query_value', []
+            ],
+            [
+                'query_value+', []
+            ],
+            [
+                'query_value-', []
+            ],
+            [
+                'query_@value', []
+            ],
+            [
+                'query_value+@', []
+            ],
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method.php b/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method.php
new file mode 100644
index 0000000000000..5c6c60866fafb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+
+$configWriter->save('carriers/ups/active', 1);
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method_rollback.php b/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method_rollback.php
new file mode 100644
index 0000000000000..6d7894879f97b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method_rollback.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer  $configWriter */
+$configWriter = $objectManager->create(WriterInterface::class);
+
+$configWriter->delete('carriers/ups/active');
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php
new file mode 100644
index 0000000000000..b6055f14e79d2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\UrlRewrite\Model;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrites.php
+ */
+class UrlFinderInterfaceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var UrlFinderInterface
+     */
+    private $urlFinder;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->urlFinder = Bootstrap::getObjectManager()->create(UrlFinderInterface::class);
+    }
+
+    /**
+     * @dataProvider findOneDataProvider
+     * @param string $requestPath
+     * @param string $targetPath
+     * @param int $redirectType
+     */
+    public function testFindOneByData(string $requestPath, string $targetPath, int $redirectType)
+    {
+        $data = [
+            UrlRewrite::REQUEST_PATH => $requestPath,
+        ];
+        $urlRewrite = $this->urlFinder->findOneByData($data);
+        $this->assertEquals($targetPath, $urlRewrite->getTargetPath());
+        $this->assertEquals($redirectType, $urlRewrite->getRedirectType());
+    }
+
+    /**
+     * @return array
+     */
+    public function findOneDataProvider(): array
+    {
+        return [
+            ['string', 'test_page1', 0],
+            ['string/', 'string', 301],
+            ['string_permanent', 'test_page1', 301],
+            ['string_permanent/', 'test_page1', 301],
+            ['string_temporary', 'test_page1', 302],
+            ['string_temporary/', 'test_page1', 302],
+            ['строка', 'test_page1', 0],
+            ['строка/', 'строка', 301],
+            [urlencode('строка'), 'test_page2', 0],
+            [urlencode('строка') . '/', urlencode('строка'), 301],
+            ['другая_строка', 'test_page1', 302],
+            ['другая_строка/', 'test_page1', 302],
+            [urlencode('другая_строка'), 'test_page1', 302],
+            [urlencode('другая_строка') . '/', 'test_page1', 302],
+            ['السلسلة', 'test_page1', 0],
+            [urlencode('السلسلة'), 'test_page1', 0],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php
new file mode 100644
index 0000000000000..9edc6507308ee
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$rewritesData = [
+    [
+        'string', 'test_page1', 0
+    ],
+    [
+        'string_permanent', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::PERMANENT
+    ],
+    [
+        'string_temporary', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::TEMPORARY
+    ],
+    [
+        'строка', 'test_page1', 0
+    ],
+    [
+        urlencode('строка'), 'test_page2', 0
+    ],
+    [
+        'другая_строка', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::TEMPORARY
+    ],
+    [
+        'السلسلة', 'test_page1', 0
+    ],
+];
+
+$rewriteResource = $objectManager->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewrite::class);
+foreach ($rewritesData as $rewriteData) {
+    list ($requestPath, $targetPath, $redirectType) = $rewriteData;
+    $rewrite = $objectManager->create(\Magento\UrlRewrite\Model\UrlRewrite::class);
+    $rewrite->setEntityType('custom')
+        ->setRequestPath($requestPath)
+        ->setTargetPath($targetPath)
+        ->setRedirectType($redirectType);
+    $rewriteResource->save($rewrite);
+}
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php
new file mode 100644
index 0000000000000..a98f947d614e0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$urlRewriteCollection = $objectManager->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection::class);
+$collection = $urlRewriteCollection
+    ->addFieldToFilter('target_path', ['test_page1', 'test_page2'])
+    ->load()
+    ->walk('delete');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
index 92eae7a3fe3d7..940d05eb4d5d7 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
@@ -128,6 +128,7 @@ public function testAddActionProductNameXss()
     public function testAllcartAction()
     {
         $formKey = $this->_objectManager->get(\Magento\Framework\Data\Form\FormKey::class)->getFormKey();
+        $this->getRequest()->setMethod('POST');
         $this->getRequest()->setParam('form_key', $formKey);
         $this->dispatch('wishlist/index/allcart');
 
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
new file mode 100644
index 0000000000000..47705262caaf3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Controller;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Area;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * @magentoAppIsolation enabled
+ */
+class ShareTest extends AbstractController
+{
+    /**
+     * Test share wishlist with correct data
+     *
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testSuccessfullyShareWishlist()
+    {
+        $this->login(1);
+        $this->prepareRequestData();
+        $this->dispatch('wishlist/index/send/');
+
+        $this->assertSessionMessages(
+            $this->equalTo(['Your wish list has been shared.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * Test share wishlist with incorrect data
+     *
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testShareWishlistWithoutEmails()
+    {
+        $this->login(1);
+        $this->prepareRequestData(true);
+        $this->dispatch('wishlist/index/send/');
+
+        $this->assertSessionMessages(
+            $this->equalTo(['Please enter an email address.']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Login the user
+     *
+     * @param string $customerId Customer to mark as logged in for the session
+     * @return void
+     */
+    protected function login($customerId)
+    {
+        /** @var Session $session */
+        $session = $this->_objectManager->get(Session::class);
+        $session->loginById($customerId);
+    }
+
+    /**
+     * Prepares the request with data
+     *
+     * @param bool $invalidData
+     * @return void
+     */
+    private function prepareRequestData($invalidData = false)
+    {
+        Bootstrap::getInstance()->loadArea(Area::AREA_FRONTEND);
+        $emails = !$invalidData ? 'email-1@example.com,email-2@example.com' : '';
+
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'emails' => $emails,
+            'message' => '',
+            'form_key' => $formKey->getFormKey(),
+        ];
+
+        $this->getRequest()->setMethod(Request::METHOD_POST);
+        $this->getRequest()->setPostValue($post);
+    }
+}
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
index 2e238eb993029..fc60fbb0bdccc 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
@@ -151,12 +151,14 @@ define([
                     }
                 }],
                 result = [{
+                    defaultLabelVisible: true,
                     label: 'Label 2',
                     name: 'Name 2',
                     required: false,
                     columnsHeaderClasses: '',
                     sortOrder: 5
                 }, {
+                    defaultLabelVisible: true,
                     label: 'Label 1',
                     name: 'Name 1',
                     required: false,
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/without_setup_version/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/without_setup_version/module.xml
new file mode 100644
index 0000000000000..ed831eb6e9354
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/without_setup_version/module.xml
@@ -0,0 +1,10 @@
+<?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:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule1"/>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/drop_table_with_external_dependency/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/drop_table_with_external_dependency/db_schema.xml
new file mode 100644
index 0000000000000..c22c41b7a5c03
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/drop_table_with_external_dependency/db_schema.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" disabled="true"/>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/without_setup_version/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/without_setup_version/module.xml
new file mode 100644
index 0000000000000..27e21dc3fe898
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/without_setup_version/module.xml
@@ -0,0 +1,10 @@
+<?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:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule3"/>
+</config>
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
index 6097348d4fabc..e8698965de007 100644
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
@@ -249,6 +249,45 @@ public function testInstallationWithDroppingTables()
         self::assertEquals($this->getData(), $shardData);
     }
 
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @moduleName Magento_TestSetupDeclarationModule3
+     */
+    public function testInstallationWithDroppingTablesFromSecondaryModule()
+    {
+        $modules = [
+            'Magento_TestSetupDeclarationModule1',
+            'Magento_TestSetupDeclarationModule3',
+        ];
+
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule3',
+            'drop_table_with_external_dependency',
+            'db_schema.xml',
+            'etc'
+        );
+
+        foreach ($modules as $moduleName) {
+            $this->moduleManager->updateRevision(
+                $moduleName,
+                'without_setup_version',
+                'module.xml',
+                'etc'
+            );
+        }
+
+        try {
+            $this->cliCommand->install($modules);
+        } catch (\Exception $e) {
+            $installException = $e->getPrevious();
+            self::assertSame(1, $installException->getCode());
+            self::assertContains(
+                'The reference table named "reference_table" is disabled',
+                $installException->getMessage()
+            );
+        }
+    }
+
     /**
      * @moduleName Magento_TestSetupDeclarationModule1
      * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.php
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php
new file mode 100644
index 0000000000000..b1a6da5e43822
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Dependency;
+
+/**
+ * Class provides dependency rule for analytics.xml config file.
+ */
+class AnalyticsConfigRule implements RuleInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
+    {
+        if ('config' != $fileType || !preg_match('#.*/analytics\.xml$#', $file)) {
+            return [];
+        }
+
+        $dependenciesInfo = [];
+        if (preg_match_all('#<[customProvider|reportProvider][^>]*class=[\'"]([^\'"]+)[\'"]#i', $contents, $matches)) {
+            $classes = array_pop($matches);
+            foreach ($classes as $class) {
+                $classParts = explode('\\', $class);
+                $module = implode('\\', array_slice($classParts, 0, 2));
+                if (strtolower($currentModule) !== strtolower($module)) {
+                    $dependenciesInfo[] = [
+                        'module' => $module,
+                        'type' => RuleInterface::TYPE_HARD,
+                        'source' => $file,
+                    ];
+                }
+            }
+        }
+
+        return $dependenciesInfo;
+    }
+}
diff --git a/dev/tests/static/framework/Magento/ruleset.xml b/dev/tests/static/framework/Magento/ruleset.xml
index d0f0d38f8fa03..9dde4b7bd7d32 100644
--- a/dev/tests/static/framework/Magento/ruleset.xml
+++ b/dev/tests/static/framework/Magento/ruleset.xml
@@ -84,5 +84,6 @@
 
     <rule ref="Squiz.Commenting.DocCommentAlignment"/>
     <rule ref="Squiz.Functions.GlobalFunction"/>
+    <rule ref="Squiz.Operators.ValidLogicalOperators"/>
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
 </ruleset>
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index a4113abed8030..e2e0357a38f77 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -16,6 +16,7 @@
 use Magento\TestFramework\Dependency\LayoutRule;
 use Magento\TestFramework\Dependency\PhpRule;
 use Magento\TestFramework\Dependency\ReportsConfigRule;
+use Magento\TestFramework\Dependency\AnalyticsConfigRule;
 use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
 
 /**
@@ -78,6 +79,17 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
      */
     protected static $_listRoutesXml = [];
 
+    /**
+     * List of analytics.xml
+     *
+     * Format: array(
+     *  '{Module_Name}' => '{Filename}'
+     * )
+     *
+     * @var array
+     */
+    protected static $_listAnalyticsXml = [];
+
     /**
      * List of routers
      *
@@ -176,6 +188,7 @@ public static function setUpBeforeClass()
         self::_prepareListConfigXml();
         self::_prepareListDbSchemaXml();
         self::_prepareListRoutesXml();
+        self::_prepareListAnalyticsXml();
 
         self::_prepareMapRouters();
         self::_prepareMapLayoutBlocks();
@@ -240,6 +253,7 @@ protected static function _initRules()
             ),
             new DiRule(new VirtualTypeMapper()),
             new ReportsConfigRule($dbRuleTables),
+            new AnalyticsConfigRule(),
         ];
     }
 
@@ -571,6 +585,20 @@ protected static function _prepareListRoutesXml()
         }
     }
 
+    /**
+     * Prepare list of analytics.xml files
+     */
+    protected static function _prepareListAnalyticsXml()
+    {
+        $files = Files::init()->getDbSchemaFiles('analytics.xml', [], false);
+        foreach ($files as $file) {
+            if (preg_match('/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)) {
+                $module = $matches['namespace'] . '\\' . $matches['module'];
+                self::$_listAnalyticsXml[$module] = $file;
+            }
+        }
+    }
+
     /**
      * Prepare map of routers
      */
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/RequestConfigTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/RequestConfigTest.php
index 4c0fed148aea8..f0177c449a3f9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/RequestConfigTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Search/RequestConfigTest.php
@@ -102,8 +102,7 @@ public function testFileSchemaUsingInvalidXml($expectedErrors = null)
 Element 'metric', attribute 'type': [facet 'enumeration'] " .
                 "The value 'sumasdasd' is not an element of the set {'sum', 'count', 'min', 'max', 'avg'}.
 Element 'metric', attribute 'type': 'sumasdasd' is not a valid value of the local atomic type.
-Element 'bucket': Missing child element(s). Expected is one of ( metrics, ranges ).
-Element 'request': Missing child element(s). Expected is ( from )."
+Element 'bucket': Missing child element(s). Expected is one of ( metrics, ranges )."
             )
         );
         parent::testFileSchemaUsingInvalidXml($expectedErrors);
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 0450ae1330cd8..35ba5803b09cc 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -209,3 +209,8 @@ Magento/Customer/Model/FileUploaderDataResolver.php
 Magento/Customer/Model/Customer/DataProvider.php
 Magento/InventoryShippingAdminUi/Ui/DataProvider
 Magento/Elasticsearch6/Model/Client
+Magento/CatalogSearch/Model/ResourceModel/Fulltext
+Magento/Elasticsearch/Model/Layer/Search
+Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver
+Magento/Elasticsearch6/Model/Client
+Magento/Config/App/Config/Type
diff --git a/lib/internal/Magento/Framework/App/FrontControllerInterface.php b/lib/internal/Magento/Framework/App/FrontControllerInterface.php
index a552d88e68f50..afd3091097d19 100644
--- a/lib/internal/Magento/Framework/App/FrontControllerInterface.php
+++ b/lib/internal/Magento/Framework/App/FrontControllerInterface.php
@@ -8,7 +8,7 @@
 /**
  * Application front controller responsible for dispatching application requests.
  * Front controller contains logic common for all actions.
- * Evary application area has own front controller
+ * Every application area has own front controller.
  *
  * @api
  */
diff --git a/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
new file mode 100644
index 0000000000000..216d8e9a0a01b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Cache;
+
+use Magento\Framework\Lock\LockManagerInterface;
+
+/**
+ * Default mutex that provide concurrent access to cache storage.
+ */
+class LockGuardedCacheLoader
+{
+    /**
+     * @var LockManagerInterface
+     */
+    private $locker;
+
+    /**
+     * Lifetime of the lock for write in cache.
+     *
+     * Value of the variable in milliseconds.
+     *
+     * @var int
+     */
+    private $lockTimeout;
+
+    /**
+     * Timeout between retrieves to load the configuration from the cache.
+     *
+     * Value of the variable in milliseconds.
+     *
+     * @var int
+     */
+    private $delayTimeout;
+
+    /**
+     * @param LockManagerInterface $locker
+     * @param int $lockTimeout
+     * @param int $delayTimeout
+     */
+    public function __construct(
+        LockManagerInterface $locker,
+        int $lockTimeout = 10000,
+        int $delayTimeout = 20
+    ) {
+        $this->locker = $locker;
+        $this->lockTimeout = $lockTimeout;
+        $this->delayTimeout = $delayTimeout;
+    }
+
+    /**
+     * Load data.
+     *
+     * @param string $lockName
+     * @param callable $dataLoader
+     * @param callable $dataCollector
+     * @param callable $dataSaver
+     * @return mixed
+     */
+    public function lockedLoadData(
+        string $lockName,
+        callable $dataLoader,
+        callable $dataCollector,
+        callable $dataSaver
+    ) {
+        $cachedData = $dataLoader(); //optimistic read
+
+        while ($cachedData === false && $this->locker->isLocked($lockName)) {
+            usleep($this->delayTimeout * 1000);
+            $cachedData = $dataLoader();
+        }
+
+        while ($cachedData === false) {
+            try {
+                if ($this->locker->lock($lockName, $this->lockTimeout / 1000)) {
+                    $data = $dataCollector();
+                    $dataSaver($data);
+                    $cachedData = $data;
+                }
+            } finally {
+                $this->locker->unlock($lockName);
+            }
+
+            if ($cachedData === false) {
+                usleep($this->delayTimeout * 1000);
+                $cachedData = $dataLoader();
+            }
+        }
+
+        return $cachedData;
+    }
+
+    /**
+     * Clean data.
+     *
+     * @param string $lockName
+     * @param callable $dataCleaner
+     * @return void
+     */
+    public function lockedCleanData(string $lockName, callable $dataCleaner)
+    {
+        while ($this->locker->isLocked($lockName)) {
+            usleep($this->delayTimeout * 1000);
+        }
+        try {
+            if ($this->locker->lock($lockName, $this->lockTimeout / 1000)) {
+                $dataCleaner();
+            }
+        } finally {
+            $this->locker->unlock($lockName);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php
index 1d995bab007e5..f4721660d8da6 100644
--- a/lib/internal/Magento/Framework/Config/Dom.php
+++ b/lib/internal/Magento/Framework/Config/Dom.php
@@ -318,7 +318,7 @@ public static function validateDomDocument(
         libxml_set_external_entity_loader([self::$urnResolver, 'registerEntityLoader']);
         $errors = [];
         try {
-            $result = $dom->schemaValidate($schema);
+            $result = $dom->schemaValidate($schema, LIBXML_SCHEMA_CREATE);
             if (!$result) {
                 $errors = self::getXmlErrors($errorFormat);
             }
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
index 5c8f66683877c..0508b5e4fb359 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
@@ -135,6 +135,48 @@ public function validateDataProvider()
         ];
     }
 
+    /**
+     * @param string $xml
+     * @param string $expectedValue
+     * @dataProvider validateWithDefaultValueDataProvider
+     */
+    public function testValidateWithDefaultValue($xml, $expectedValue)
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+
+        $actualErrors = [];
+
+        $dom = new \Magento\Framework\Config\Dom($xml, $this->validationStateMock);
+        $dom->validate(__DIR__ . '/_files/sample.xsd', $actualErrors);
+
+        $actualValue = $dom->getDom()
+            ->getElementsByTagName('root')->item(0)
+            ->getElementsByTagName('node')->item(0)
+            ->getAttribute('attribute_with_default_value');
+
+        $this->assertEmpty($actualErrors);
+        $this->assertEquals($expectedValue, $actualValue);
+    }
+
+    /**
+     * @return array
+     */
+    public function validateWithDefaultValueDataProvider()
+    {
+        return [
+            'default_value' => [
+                '<root><node id="id1"/></root>',
+                'default_value'
+            ],
+            'custom_value' => [
+                '<root><node id="id1" attribute_with_default_value="non_default_value"/></root>',
+                'non_default_value'
+            ],
+        ];
+    }
+
     public function testValidateCustomErrorFormat()
     {
         $xml = '<root><unknown_node/></root>';
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd b/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd
index 1f635b7081e05..701a2eb18c2a1 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd
@@ -21,6 +21,7 @@
         <xs:simpleContent>
             <xs:extension base="xs:string">
                 <xs:attribute name="id" type="xs:string" use="required"/>
+                <xs:attribute name="attribute_with_default_value" type="xs:string" default="default_value"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 90186707177c9..fb62b720e0b1c 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2154,7 +2154,6 @@ public function createTable(Table $table)
      */
     public function createTemporaryTable(\Magento\Framework\DB\Ddl\Table $table)
     {
-        $columns = $table->getColumns();
         $sqlFragment    = array_merge(
             $this->_getColumnsDefinition($table),
             $this->_getIndexesDefinition($table),
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index dbafc9734e091..9c789e81913c4 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Data\Collection\EntityFactoryInterface;
 use Magento\Framework\Option\ArrayInterface;
-use Magento\Framework\Exception\InputException;
 
 /**
  * Data collection
@@ -235,20 +234,12 @@ protected function _setIsLoaded($flag = true)
      * Get current collection page
      *
      * @param  int $displacement
-     * @throws \Magento\Framework\Exception\InputException
      * @return int
      */
     public function getCurPage($displacement = 0)
     {
         if ($this->_curPage + $displacement < 1) {
             return 1;
-        } elseif ($this->_curPage > $this->getLastPageNumber() && $displacement === 0) {
-            throw new InputException(
-                __(
-                    'currentPage value %1 specified is greater than the %2 page(s) available.',
-                    [$this->_curPage, $this->getLastPageNumber()]
-                )
-            );
         } elseif ($this->_curPage + $displacement > $this->getLastPageNumber()) {
             return $this->getLastPageNumber();
         } else {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
index 80c256d8553ef..daadeae2ac0e2 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
@@ -144,19 +144,6 @@ public function testGetCurPage()
         $this->assertEquals(1, $this->_model->getCurPage());
     }
 
-    /**
-     * Test for getCurPage with exception.
-     *
-     * @expectedException \Magento\Framework\Exception\StateException
-     * @return void
-     */
-    public function testGetCurPageWithException()
-    {
-        $this->_model->setCurPage(10);
-        $this->expectException(\Magento\Framework\Exception\InputException::class);
-        $this->_model->getCurPage();
-    }
-
     /**
      * Test for method possibleFlowWithItem.
      *
diff --git a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
index 20874f60791c1..b3ab51b948109 100644
--- a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
+++ b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
@@ -8,6 +8,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Filesystem;
 
 /**
@@ -96,7 +97,8 @@ public function __construct($root, array $config = [])
         static::validate($config);
         $this->root = $this->normalizePath($root);
         $this->directories = static::getDefaultConfig();
-        $this->directories[self::SYS_TMP] = [self::PATH => realpath(sys_get_temp_dir())];
+        $sysTmpPath = get_cfg_var('upload_tmp_dir') ?: sys_get_temp_dir();
+        $this->directories[self::SYS_TMP] = [self::PATH => realpath($sysTmpPath)];
 
         // inject custom values from constructor
         foreach ($this->directories as $code => $dir) {
diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php
index ca50cdb2440f4..adcffe01b910e 100644
--- a/lib/internal/Magento/Framework/Locale/Format.php
+++ b/lib/internal/Magento/Framework/Locale/Format.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Locale;
 
+/**
+ * Price locale format.
+ */
 class Format implements \Magento\Framework\Locale\FormatInterface
 {
     /**
@@ -38,7 +41,8 @@ public function __construct(
     }
 
     /**
-     * Returns the first found number from a string
+     * Returns the first found number from a string.
+     *
      * Parsing depends on given locale (grouping and decimal)
      *
      * Examples for input:
@@ -100,7 +104,7 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
         }
 
         $formatter = new \NumberFormatter(
-            $localeCode . '@currency=' . $currency->getCode(),
+            $currency->getCode() ? $localeCode . '@currency=' . $currency->getCode() : $localeCode,
             \NumberFormatter::CURRENCY
         );
         $format = $formatter->getPattern();
diff --git a/lib/internal/Magento/Framework/Locale/Resolver.php b/lib/internal/Magento/Framework/Locale/Resolver.php
index b401da8960f05..d058bfd41ab1a 100644
--- a/lib/internal/Magento/Framework/Locale/Resolver.php
+++ b/lib/internal/Magento/Framework/Locale/Resolver.php
@@ -6,7 +6,12 @@
 namespace Magento\Framework\Locale;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
 
+/**
+ * Manages locale config information.
+ */
 class Resolver implements ResolverInterface
 {
     /**
@@ -52,26 +57,34 @@ class Resolver implements ResolverInterface
      */
     private $defaultLocalePath;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param string $defaultLocalePath
      * @param string $scopeType
      * @param mixed $locale
+     * @param DeploymentConfig|null $deploymentConfig
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         $defaultLocalePath,
         $scopeType,
-        $locale = null
+        $locale = null,
+        DeploymentConfig $deploymentConfig = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->defaultLocalePath = $defaultLocalePath;
         $this->scopeType = $scopeType;
+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->create(DeploymentConfig::class);
         $this->setLocale($locale);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultLocalePath()
     {
@@ -79,7 +92,7 @@ public function getDefaultLocalePath()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDefaultLocale($locale)
     {
@@ -88,12 +101,15 @@ public function setDefaultLocale($locale)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultLocale()
     {
         if (!$this->defaultLocale) {
-            $locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
+            $locale = false;
+            if ($this->deploymentConfig->isAvailable() && $this->deploymentConfig->isDbAvailable()) {
+                $locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
+            }
             if (!$locale) {
                 $locale = self::DEFAULT_LOCALE;
             }
@@ -103,7 +119,7 @@ public function getDefaultLocale()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLocale($locale = null)
     {
@@ -116,7 +132,7 @@ public function setLocale($locale = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLocale()
     {
@@ -127,7 +143,7 @@ public function getLocale()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function emulate($scopeId)
     {
@@ -147,7 +163,7 @@ public function emulate($scopeId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function revert()
     {
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Cache.php b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
index 61818cbb8c53c..dfe6bbb828352 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Cache.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
@@ -14,6 +14,11 @@
  */
 class Cache implements \Magento\Framework\Lock\LockManagerInterface
 {
+    /**
+     * Prefix for marking that key is locked or not.
+     */
+    const LOCK_PREFIX = 'LOCKED_RECORD_INFO_';
+
     /**
      * @var FrontendInterface
      */
@@ -26,12 +31,13 @@ public function __construct(FrontendInterface $cache)
     {
         $this->cache = $cache;
     }
+
     /**
      * @inheritdoc
      */
     public function lock(string $name, int $timeout = -1): bool
     {
-        return $this->cache->save('1', $name, [], $timeout);
+        return $this->cache->save('1', $this->getIdentifier($name), [], $timeout);
     }
 
     /**
@@ -39,7 +45,7 @@ public function lock(string $name, int $timeout = -1): bool
      */
     public function unlock(string $name): bool
     {
-        return $this->cache->remove($name);
+        return $this->cache->remove($this->getIdentifier($name));
     }
 
     /**
@@ -47,6 +53,17 @@ public function unlock(string $name): bool
      */
     public function isLocked(string $name): bool
     {
-        return (bool)$this->cache->test($name);
+        return (bool)$this->cache->test($this->getIdentifier($name));
+    }
+
+    /**
+     * Get cache locked identifier based on cache identifier.
+     *
+     * @param string $cacheIdentifier
+     * @return string
+     */
+    private function getIdentifier(string $cacheIdentifier): string
+    {
+        return self::LOCK_PREFIX . $cacheIdentifier;
     }
 }
diff --git a/lib/internal/Magento/Framework/Lock/Backend/FileLock.php b/lib/internal/Magento/Framework/Lock/Backend/FileLock.php
new file mode 100644
index 0000000000000..d168e910a4ab7
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Backend/FileLock.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+use Magento\Framework\Lock\LockManagerInterface;
+use Magento\Framework\Filesystem\Driver\File as FileDriver;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Phrase;
+
+/**
+ * LockManager using the file system for locks
+ */
+class FileLock implements LockManagerInterface
+{
+    /**
+     * The file driver instance
+     *
+     * @var FileDriver
+     */
+    private $fileDriver;
+
+    /**
+     * The path to the locks storage folder
+     *
+     * @var string
+     */
+    private $path;
+
+    /**
+     * How many microseconds to wait before re-try to acquire a lock
+     *
+     * @var int
+     */
+    private $sleepCycle = 100000;
+
+    /**
+     * The mapping list of the path lock with the file resource
+     *
+     * @var array
+     */
+    private $locks = [];
+
+    /**
+     * @param FileDriver $fileDriver The file driver
+     * @param string $path The path to the locks storage folder
+     * @throws RuntimeException Throws RuntimeException if $path is empty
+     *         or cannot create the directory for locks
+     */
+    public function __construct(FileDriver $fileDriver, string $path)
+    {
+        if (!$path) {
+            throw new RuntimeException(new Phrase('The path needs to be a non-empty string.'));
+        }
+
+        $this->fileDriver = $fileDriver;
+        $this->path = rtrim($path, '/') . '/';
+
+        try {
+            if (!$this->fileDriver->isExists($this->path)) {
+                $this->fileDriver->createDirectory($this->path);
+            }
+        } catch (FileSystemException $exception) {
+            throw new RuntimeException(
+                new Phrase('Cannot create the directory for locks: %1', [$this->path]),
+                $exception
+            );
+        }
+    }
+
+    /**
+     * Acquires a lock by name
+     *
+     * @param string $name The lock name
+     * @param int $timeout Timeout in seconds. A negative timeout value means infinite timeout
+     * @return bool Returns true if the lock is acquired, otherwise returns false
+     * @throws RuntimeException Throws RuntimeException if cannot acquires the lock because FS problems
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        try {
+            $lockFile = $this->getLockPath($name);
+            $fileResource = $this->fileDriver->fileOpen($lockFile, 'w+');
+            $skipDeadline = $timeout < 0;
+            $deadline = microtime(true) + $timeout;
+
+            while (!$this->tryToLock($fileResource)) {
+                if (!$skipDeadline && $deadline <= microtime(true)) {
+                    $this->fileDriver->fileClose($fileResource);
+                    return false;
+                }
+                usleep($this->sleepCycle);
+            }
+        } catch (FileSystemException $exception) {
+            throw new RuntimeException(new Phrase('Cannot acquire a lock.'), $exception);
+        }
+
+        $this->locks[$lockFile] = $fileResource;
+        return true;
+    }
+
+    /**
+     * Checks if a lock exists by name
+     *
+     * @param string $name The lock name
+     * @return bool Returns true if the lock exists, otherwise returns false
+     * @throws RuntimeException Throws RuntimeException if cannot check that the lock exists
+     */
+    public function isLocked(string $name): bool
+    {
+        $lockFile = $this->getLockPath($name);
+        $result = false;
+
+        try {
+            if ($this->fileDriver->isExists($lockFile)) {
+                $fileResource = $this->fileDriver->fileOpen($lockFile, 'w+');
+                if ($this->tryToLock($fileResource)) {
+                    $result = false;
+                } else {
+                    $result = true;
+                }
+                $this->fileDriver->fileClose($fileResource);
+            }
+        } catch (FileSystemException $exception) {
+            throw new RuntimeException(new Phrase('Cannot verify that the lock exists.'), $exception);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove the lock by name
+     *
+     * @param string $name The lock name
+     * @return bool If the lock is removed returns true, otherwise returns false
+     */
+    public function unlock(string $name): bool
+    {
+        $lockFile = $this->getLockPath($name);
+
+        if (isset($this->locks[$lockFile]) && $this->tryToUnlock($this->locks[$lockFile])) {
+            unset($this->locks[$lockFile]);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the full path to the lock file by name
+     *
+     * @param string $name The lock name
+     * @return string The path to the lock file
+     */
+    private function getLockPath(string $name): string
+    {
+        return $this->path . $name;
+    }
+
+    /**
+     * Tries to lock a file resource
+     *
+     * @param resource $resource The file resource
+     * @return bool If the lock is acquired returns true, otherwise returns false
+     */
+    private function tryToLock($resource): bool
+    {
+        try {
+            return $this->fileDriver->fileLock($resource, LOCK_EX | LOCK_NB);
+        } catch (FileSystemException $exception) {
+            return false;
+        }
+    }
+
+    /**
+     * Tries to unlock a file resource
+     *
+     * @param resource $resource The file resource
+     * @return bool If the lock is removed returns true, otherwise returns false
+     */
+    private function tryToUnlock($resource): bool
+    {
+        try {
+            return $this->fileDriver->fileLock($resource, LOCK_UN | LOCK_NB);
+        } catch (FileSystemException $exception) {
+            return false;
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
new file mode 100644
index 0000000000000..cbba981ae1b51
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+use Magento\Framework\Lock\LockManagerInterface;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Phrase;
+
+/**
+ * LockManager using the Zookeeper for locks
+ */
+class Zookeeper implements LockManagerInterface
+{
+    /**
+     * Zookeeper provider
+     *
+     * @var \Zookeeper
+     */
+    private $zookeeper;
+
+    /**
+     * The base path to locks in Zookeeper
+     *
+     * @var string
+     */
+    private $path;
+
+    /**
+     * The name of sequence nodes
+     *
+     * @var string
+     */
+    private $lockName = 'lock-';
+
+    /**
+     * The host to connect to Zookeeper
+     *
+     * @var string
+     */
+    private $host;
+
+    /**
+     * How many seconds to wait before timing out on connections
+     *
+     * @var int
+     */
+    private $connectionTimeout = 2;
+
+    /**
+     * How many microseconds to wait before recheck connections or nodes
+     *
+     * @var int
+     */
+    private $sleepCycle = 100000;
+
+    /**
+     * The default permissions for Zookeeper nodes
+     *
+     * @var array
+     */
+    private $acl = [['perms'=>\Zookeeper::PERM_ALL, 'scheme' => 'world', 'id' => 'anyone']];
+
+    /**
+     * The mapping list of the lock name with the full lock path
+     *
+     * @var array
+     */
+    private $locks = [];
+
+    /**
+     * The default path to storage locks
+     */
+    const DEFAULT_PATH = '/magento/locks';
+
+    /**
+     * @param string $host The host to connect to Zookeeper
+     * @param string $path The base path to locks in Zookeeper
+     * @throws RuntimeException
+     */
+    public function __construct(string $host, string $path = self::DEFAULT_PATH)
+    {
+        if (!$path) {
+            throw new RuntimeException(
+                new Phrase('The path needs to be a non-empty string.')
+            );
+        }
+
+        if (!$host) {
+            throw new RuntimeException(
+                new Phrase('The host needs to be a non-empty string.')
+            );
+        }
+
+        $this->host = $host;
+        $this->path = rtrim($path, '/') . '/';
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * You can see the lock algorithm by the link
+     * @link https://zookeeper.apache.org/doc/r3.1.2/recipes.html#sc_recipes_Locks
+     *
+     * @throws RuntimeException
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        $skipDeadline = $timeout < 0;
+        $lockPath = $this->getFullPathToLock($name);
+        $deadline = microtime(true) + $timeout;
+
+        if (!$this->checkAndCreateParentNode($lockPath)) {
+            throw new RuntimeException(new Phrase('Failed creating the path %1', [$lockPath]));
+        }
+
+        $lockKey = $this->getProvider()
+            ->create($lockPath, '1', $this->acl, \Zookeeper::EPHEMERAL | \Zookeeper::SEQUENCE);
+
+        if (!$lockKey) {
+            throw new RuntimeException(new Phrase('Failed creating lock %1', [$lockPath]));
+        }
+
+        while ($this->isAnyLock($lockKey, $this->getIndex($lockKey))) {
+            if (!$skipDeadline && $deadline <= microtime(true)) {
+                $this->getProvider()->delete($lockKey);
+                return false;
+            }
+
+            usleep($this->sleepCycle);
+        }
+
+        $this->locks[$name] = $lockKey;
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws RuntimeException
+     */
+    public function unlock(string $name): bool
+    {
+        if (!isset($this->locks[$name])) {
+            return false;
+        }
+
+        return $this->getProvider()->delete($this->locks[$name]);
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws RuntimeException
+     */
+    public function isLocked(string $name): bool
+    {
+        return $this->isAnyLock($this->getFullPathToLock($name));
+    }
+
+    /**
+     * Gets full path to lock by its name
+     *
+     * @param string $name
+     * @return string
+     */
+    private function getFullPathToLock(string $name): string
+    {
+        return $this->path . $name . '/' . $this->lockName;
+    }
+
+    /**
+     * Initiolizes and returns Zookeeper provider
+     *
+     * @return \Zookeeper
+     * @throws RuntimeException
+     */
+    private function getProvider(): \Zookeeper
+    {
+        if (!$this->zookeeper) {
+            $this->zookeeper = new \Zookeeper($this->host);
+        }
+
+        $deadline = microtime(true) + $this->connectionTimeout;
+        while ($this->zookeeper->getState() != \Zookeeper::CONNECTED_STATE) {
+            if ($deadline <= microtime(true)) {
+                throw new RuntimeException(new Phrase('Zookeeper connection timed out!'));
+            }
+            usleep($this->sleepCycle);
+        }
+
+        return $this->zookeeper;
+    }
+
+    /**
+     * Checks and creates base path recursively
+     *
+     * @param string $path
+     * @return bool
+     * @throws RuntimeException
+     */
+    private function checkAndCreateParentNode(string $path): bool
+    {
+        $path = dirname($path);
+        if ($this->getProvider()->exists($path)) {
+            return true;
+        }
+
+        if (!$this->checkAndCreateParentNode($path)) {
+            return false;
+        }
+
+        if ($this->getProvider()->create($path, '1', $this->acl)) {
+            return true;
+        }
+
+        return $this->getProvider()->exists($path);
+    }
+
+    /**
+     * Gets int increment of lock key
+     *
+     * @param string $key
+     * @return int|null
+     */
+    private function getIndex(string $key)
+    {
+        if (!preg_match('/' . $this->lockName . '([0-9]+)$/', $key, $matches)) {
+            return null;
+        }
+
+        return intval($matches[1]);
+    }
+
+    /**
+     * Checks if there is any sequence node under parent of $fullKey.
+     *
+     * At first checks that the $fullKey node is present, if not - returns false.
+     * If $indexKey is non-null and there is a smaller index than $indexKey then returns true,
+     * otherwise returns false.
+     *
+     * @param string $fullKey The full path without any sequence info
+     * @param int|null $indexKey The index to compare
+     * @return bool
+     * @throws RuntimeException
+     */
+    private function isAnyLock(string $fullKey, int $indexKey = null): bool
+    {
+        $parent = dirname($fullKey);
+
+        if (!$this->getProvider()->exists($parent)) {
+            return false;
+        }
+
+        $children = $this->getProvider()->getChildren($parent);
+
+        if (null === $indexKey && !empty($children)) {
+            return true;
+        }
+
+        foreach ($children as $childKey) {
+            $childIndex = $this->getIndex($childKey);
+
+            if (null === $childIndex) {
+                continue;
+            }
+
+            if ($childIndex < $indexKey) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
new file mode 100644
index 0000000000000..b142085ef6563
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock;
+
+use Magento\Framework\Phrase;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Lock\Backend\Database as DatabaseLock;
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\Backend\Cache as CacheLock;
+use Magento\Framework\Lock\Backend\FileLock;
+
+/**
+ * The factory to create object that implements LockManagerInterface
+ */
+class LockBackendFactory
+{
+    /**
+     * The Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * The Application deployment configuration
+     *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * DB lock provider name
+     *
+     * @const string
+     */
+    const LOCK_DB = 'db';
+
+    /**
+     * Zookeeper lock provider name
+     *
+     * @const string
+     */
+    const LOCK_ZOOKEEPER = 'zookeeper';
+
+    /**
+     * Cache lock provider name
+     *
+     * @const string
+     */
+    const LOCK_CACHE = 'cache';
+
+    /**
+     * File lock provider name
+     *
+     * @const string
+     */
+    const LOCK_FILE = 'file';
+
+    /**
+     * The list of lock providers with mapping on classes
+     *
+     * @var array
+     */
+    private $lockers = [
+        self::LOCK_DB => DatabaseLock::class,
+        self::LOCK_ZOOKEEPER => ZookeeperLock::class,
+        self::LOCK_CACHE => CacheLock::class,
+        self::LOCK_FILE => FileLock::class,
+    ];
+
+    /**
+     * @param ObjectManagerInterface $objectManager The Object Manager instance
+     * @param DeploymentConfig $deploymentConfig The Application deployment configuration
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        DeploymentConfig $deploymentConfig
+    ) {
+        $this->objectManager = $objectManager;
+        $this->deploymentConfig = $deploymentConfig;
+    }
+
+    /**
+     * Creates an instance of LockManagerInterface using information from deployment config
+     *
+     * @return LockManagerInterface
+     * @throws RuntimeException
+     */
+    public function create(): LockManagerInterface
+    {
+        $provider = $this->deploymentConfig->get('lock/provider', self::LOCK_DB);
+        $config = $this->deploymentConfig->get('lock/config', []);
+
+        if (!isset($this->lockers[$provider])) {
+            throw new RuntimeException(new Phrase('Unknown locks provider: %1', [$provider]));
+        }
+
+        if (self::LOCK_ZOOKEEPER === $provider && !extension_loaded(self::LOCK_ZOOKEEPER)) {
+            throw new RuntimeException(new Phrase('php extension Zookeeper is not installed.'));
+        }
+
+        return $this->objectManager->create($this->lockers[$provider], $config);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Proxy.php b/lib/internal/Magento/Framework/Lock/Proxy.php
new file mode 100644
index 0000000000000..2718bf6cb3456
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Proxy.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock;
+
+use Magento\Framework\Exception\RuntimeException;
+
+/**
+ * Proxy for LockManagers
+ */
+class Proxy implements LockManagerInterface
+{
+    /**
+     * The factory to create LockManagerInterface implementation
+     *
+     * @var LockBackendFactory
+     */
+    private $factory;
+
+    /**
+     * A LockManagerInterface implementation
+     *
+     * @var LockManagerInterface
+     */
+    private $locker;
+
+    /**
+     * @param LockBackendFactory $factory The factory to create LockManagerInterface implementation
+     */
+    public function __construct(LockBackendFactory $factory)
+    {
+        $this->factory = $factory;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws RuntimeException
+     */
+    public function isLocked(string $name): bool
+    {
+        return $this->getLocker()->isLocked($name);
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws RuntimeException
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        return $this->getLocker()->lock($name, $timeout);
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws RuntimeException
+     */
+    public function unlock(string $name): bool
+    {
+        return $this->getLocker()->unlock($name);
+    }
+
+    /**
+     * Gets LockManagerInterface implementation using Factory
+     *
+     * @return LockManagerInterface
+     * @throws RuntimeException
+     */
+    private function getLocker(): LockManagerInterface
+    {
+        if (!$this->locker) {
+            $this->locker = $this->factory->create();
+        }
+
+        return $this->locker;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
new file mode 100644
index 0000000000000..62521b9de3082
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Test\Unit\Backend;
+
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperProvider;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class ZookeeperTest extends TestCase
+{
+    /**
+     * @var ZookeeperProvider
+     */
+    private $zookeeperProvider;
+
+    /**
+     * @var string
+     */
+    private $host = 'localhost:123';
+
+    /**
+     * @var string
+     */
+    private $path = '/some/path';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        if (!extension_loaded('zookeeper')) {
+            $this->markTestSkipped('Test was skipped because php extension Zookeeper is not installed.');
+        }
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage The path needs to be a non-empty string.
+     * @return void
+     */
+    public function testConstructionWithPathException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider($this->host, '');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage The host needs to be a non-empty string.
+     * @return void
+     */
+    public function testConstructionWithHostException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider('', $this->path);
+    }
+
+    /**
+     * @return void
+     */
+    public function testConstructionWithoutException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider($this->host, $this->path);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
new file mode 100644
index 0000000000000..ebf2f54f3e093
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Test\Unit;
+
+use Magento\Framework\Lock\Backend\Database as DatabaseLock;
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\Backend\Cache as CacheLock;
+use Magento\Framework\Lock\Backend\FileLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Lock\LockManagerInterface;
+use Magento\Framework\App\DeploymentConfig;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class LockBackendFactoryTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var LockBackendFactory
+     */
+    private $factory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->factory = new LockBackendFactory($this->objectManagerMock, $this->deploymentConfigMock);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage Unknown locks provider: someProvider
+     */
+    public function testCreateWithException()
+    {
+        $this->deploymentConfigMock->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(['lock/provider', LockBackendFactory::LOCK_DB], ['lock/config', []])
+            ->willReturnOnConsecutiveCalls('someProvider', []);
+
+        $this->factory->create();
+    }
+
+    /**
+     * @param string $lockProvider
+     * @param string $lockProviderClass
+     * @param array $config
+     * @dataProvider createDataProvider
+     */
+    public function testCreate(string $lockProvider, string $lockProviderClass, array $config)
+    {
+        $lockManagerMock = $this->getMockForAbstractClass(LockManagerInterface::class);
+        $this->deploymentConfigMock->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(['lock/provider', LockBackendFactory::LOCK_DB], ['lock/config', []])
+            ->willReturnOnConsecutiveCalls($lockProvider, $config);
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($lockProviderClass, $config)
+            ->willReturn($lockManagerMock);
+
+        $this->assertSame($lockManagerMock, $this->factory->create());
+    }
+
+    /**
+     * @return array
+     */
+    public function createDataProvider(): array
+    {
+        $data = [
+            'db' => [
+                'lockProvider' => LockBackendFactory::LOCK_DB,
+                'lockProviderClass' => DatabaseLock::class,
+                'config' => ['prefix' => 'somePrefix'],
+            ],
+            'cache' => [
+                'lockProvider' => LockBackendFactory::LOCK_CACHE,
+                'lockProviderClass' => CacheLock::class,
+                'config' => [],
+            ],
+            'file' => [
+                'lockProvider' => LockBackendFactory::LOCK_FILE,
+                'lockProviderClass' => FileLock::class,
+                'config' => ['path' => '/my/path'],
+            ],
+        ];
+
+        if (extension_loaded('zookeeper')) {
+            $data['zookeeper'] = [
+                'lockProvider' => LockBackendFactory::LOCK_ZOOKEEPER,
+                'lockProviderClass' => ZookeeperLock::class,
+                'config' => ['host' => 'some host'],
+            ];
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php
new file mode 100644
index 0000000000000..c71dad701d715
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Test\Unit;
+
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\Lock\Proxy;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\Lock\LockManagerInterface;
+
+/**
+ * @inheritdoc
+ */
+class ProxyTest extends TestCase
+{
+    /**
+     * @var LockBackendFactory|MockObject
+     */
+    private $factoryMock;
+
+    /**
+     * @var LockManagerInterface|MockObject
+     */
+    private $lockerMock;
+
+    /**
+     * @var Proxy
+     */
+    private $proxy;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->factoryMock = $this->createMock(LockBackendFactory::class);
+        $this->lockerMock = $this->getMockForAbstractClass(LockManagerInterface::class);
+        $this->proxy = new Proxy($this->factoryMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testIsLocked()
+    {
+        $lockName = 'testLock';
+        $this->factoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->lockerMock);
+        $this->lockerMock->expects($this->exactly(2))
+            ->method('isLocked')
+            ->with($lockName)
+            ->willReturn(true);
+
+        $this->assertTrue($this->proxy->isLocked($lockName));
+
+        // Call one more time to check that method Factory::create is called one time
+        $this->assertTrue($this->proxy->isLocked($lockName));
+    }
+
+    /**
+     * @return void
+     */
+    public function testLock()
+    {
+        $lockName = 'testLock';
+        $timeout = 123;
+        $this->factoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->lockerMock);
+        $this->lockerMock->expects($this->exactly(2))
+            ->method('lock')
+            ->with($lockName, $timeout)
+            ->willReturn(true);
+
+        $this->assertTrue($this->proxy->lock($lockName, $timeout));
+
+        // Call one more time to check that method Factory::create is called one time
+        $this->assertTrue($this->proxy->lock($lockName, $timeout));
+    }
+
+    /**
+     * @return void
+     */
+    public function testUnlock()
+    {
+        $lockName = 'testLock';
+        $this->factoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->lockerMock);
+        $this->lockerMock->expects($this->exactly(2))
+            ->method('unlock')
+            ->with($lockName)
+            ->willReturn(true);
+
+        $this->assertTrue($this->proxy->unlock($lockName));
+
+        // Call one more time to check that method Factory::create is called one time
+        $this->assertTrue($this->proxy->unlock($lockName));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
index cb80bc4becaec..48c33c48f12e6 100644
--- a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
@@ -9,7 +9,7 @@
 /**
  * Class CallbackInvoker to invoke callbacks for consumer classes
  */
-class CallbackInvoker
+class CallbackInvoker implements CallbackInvokerInterface
 {
     /**
      * Run short running process
diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
new file mode 100644
index 0000000000000..36658f2e4eebe
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Callback invoker interface
+ */
+interface CallbackInvokerInterface
+{
+    /**
+     * Run short running process
+     *
+     * @param QueueInterface $queue
+     * @param int $maxNumberOfMessages
+     * @param \Closure $callback
+     * @return void
+     */
+    public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
index 9bdacfbc1ff6c..8f65a2d8c5ed2 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
@@ -38,7 +38,7 @@ class Consumer implements ConsumerInterface
     private $messageEncoder;
 
     /**
-     * @var CallbackInvoker
+     * @var CallbackInvokerInterface
      */
     private $invoker;
 
@@ -80,7 +80,7 @@ class Consumer implements ConsumerInterface
     /**
      * Initialize dependencies.
      *
-     * @param CallbackInvoker $invoker
+     * @param CallbackInvokerInterface $invoker
      * @param MessageEncoder $messageEncoder
      * @param ResourceConnection $resource
      * @param ConsumerConfigurationInterface $configuration
@@ -89,7 +89,7 @@ class Consumer implements ConsumerInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
-        CallbackInvoker $invoker,
+        CallbackInvokerInterface $invoker,
         MessageEncoder $messageEncoder,
         ResourceConnection $resource,
         ConsumerConfigurationInterface $configuration,
@@ -103,7 +103,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process($maxNumberOfMessages = null)
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
index 5e64d737034c8..73841a2a964cc 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
@@ -75,7 +75,7 @@ public function testProcess()
             ->getMockForAbstractClass();
         $configuration->expects($this->atLeastOnce())->method('getHandlers')->willReturn([]);
         $this->messageStatusProcessor->expects($this->exactly(2))->method('acknowledgeMessages');
-        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\Api\CustomAttributesDataInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
@@ -116,7 +116,7 @@ public function testProcessWithConnectionLostException()
         $exception = new \Magento\Framework\MessageQueue\ConnectionLostException(__('Exception Message'));
         $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
         $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
-        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\Api\CustomAttributesDataInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
@@ -158,7 +158,7 @@ public function testProcessWithException()
         $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
         $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
         $this->messageStatusProcessor->expects($this->atLeastOnce())->method('rejectMessages');
-        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\Api\CustomAttributesDataInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
diff --git a/lib/internal/Magento/Framework/Oauth/Oauth.php b/lib/internal/Magento/Framework/Oauth/Oauth.php
index 5e48fb5ed30f9..919b0e4c86ba0 100644
--- a/lib/internal/Magento/Framework/Oauth/Oauth.php
+++ b/lib/internal/Magento/Framework/Oauth/Oauth.php
@@ -9,6 +9,9 @@
 use Magento\Framework\Encryption\Helper\Security;
 use Magento\Framework\Phrase;
 
+/**
+ * Authorization service.
+ */
 class Oauth implements OauthInterface
 {
     /**
@@ -61,7 +64,7 @@ public static function getSupportedSignatureMethods()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRequestToken($params, $requestUrl, $httpMethod = 'POST')
     {
@@ -74,7 +77,7 @@ public function getRequestToken($params, $requestUrl, $httpMethod = 'POST')
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAccessToken($params, $requestUrl, $httpMethod = 'POST')
     {
@@ -102,7 +105,7 @@ public function getAccessToken($params, $requestUrl, $httpMethod = 'POST')
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validateAccessTokenRequest($params, $requestUrl, $httpMethod = 'POST')
     {
@@ -125,7 +128,7 @@ public function validateAccessTokenRequest($params, $requestUrl, $httpMethod = '
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validateAccessToken($accessToken)
     {
@@ -133,7 +136,7 @@ public function validateAccessToken($accessToken)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function buildAuthorizationHeader(
         $params,
@@ -199,7 +202,7 @@ protected function _validateSignature($params, $consumerSecret, $httpMethod, $re
         );
 
         if (!Security::compareStrings($calculatedSign, $params['oauth_signature'])) {
-            throw new Exception(new Phrase('The signatire is invalid. Verify and try again.'));
+            throw new Exception(new Phrase('The signature is invalid. Verify and try again.'));
         }
     }
 
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
index 897b67d8d46ec..e1b423d738a20 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder as AggregationBuilder;
 use Magento\Framework\Search\AdapterInterface;
 use Magento\Framework\Search\RequestInterface;
@@ -49,6 +50,16 @@ class Adapter implements AdapterInterface
      */
     private $temporaryStorageFactory;
 
+    /**
+     * Query Select Parts to be skipped when prepare query for count
+     *
+     * @var array
+     */
+    private $countSqlSkipParts = [
+        \Magento\Framework\DB\Select::LIMIT_COUNT => true,
+        \Magento\Framework\DB\Select::LIMIT_OFFSET => true,
+    ];
+
     /**
      * @param Mapper $mapper
      * @param ResponseFactory $responseFactory
@@ -86,6 +97,7 @@ public function query(RequestInterface $request)
         $response = [
             'documents' => $documents,
             'aggregations' => $aggregations,
+            'total' => $this->getSize($query)
         ];
         return $this->responseFactory->create($response);
     }
@@ -114,4 +126,39 @@ private function getConnection()
     {
         return $this->resource->getConnection();
     }
+
+    /**
+     * Get rows size
+     *
+     * @param Select $query
+     * @return int
+     */
+    private function getSize(Select $query): int
+    {
+        $sql = $this->getSelectCountSql($query);
+        $parentSelect = $this->getConnection()->select();
+        $parentSelect->from(['core_select' => $sql]);
+        $parentSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
+        $parentSelect->columns('COUNT(*)');
+        $totalRecords = $this->getConnection()->fetchOne($parentSelect);
+
+        return intval($totalRecords);
+    }
+
+    /**
+     * Reset limit and offset
+     *
+     * @param Select $query
+     * @return Select
+     */
+    private function getSelectCountSql(Select $query): Select
+    {
+        foreach ($this->countSqlSkipParts as $part => $toSkip) {
+            if ($toSkip) {
+                $query->reset($part);
+            }
+        }
+
+        return $query;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
index 776dab93c2dcd..b41a43883fde5 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ResponseFactory.php
@@ -68,7 +68,8 @@ public function create($rawResponse)
             \Magento\Framework\Search\Response\QueryResponse::class,
             [
                 'documents' => $documents,
-                'aggregations' => $aggregations
+                'aggregations' => $aggregations,
+                'total' => $rawResponse['total']
             ]
         );
     }
diff --git a/lib/internal/Magento/Framework/Search/Request.php b/lib/internal/Magento/Framework/Search/Request.php
index d55b2085e87ef..60f3338046613 100644
--- a/lib/internal/Magento/Framework/Search/Request.php
+++ b/lib/internal/Magento/Framework/Search/Request.php
@@ -54,6 +54,11 @@ class Request implements RequestInterface
      */
     protected $dimensions;
 
+    /**
+     * @var array
+     */
+    private $sort;
+
     /**
      * @param string $name
      * @param string $indexName
@@ -62,6 +67,7 @@ class Request implements RequestInterface
      * @param int|null $size
      * @param Dimension[] $dimensions
      * @param RequestBucketInterface[] $buckets
+     * @param array $sort
      */
     public function __construct(
         $name,
@@ -70,7 +76,8 @@ public function __construct(
         $from = null,
         $size = null,
         array $dimensions = [],
-        array $buckets = []
+        array $buckets = [],
+        $sort = []
     ) {
         $this->name = $name;
         $this->index = $indexName;
@@ -79,10 +86,11 @@ public function __construct(
         $this->size = $size;
         $this->buckets = $buckets;
         $this->dimensions = $dimensions;
+        $this->sort = $sort;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getName()
     {
@@ -90,7 +98,7 @@ public function getName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIndex()
     {
@@ -98,7 +106,7 @@ public function getIndex()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDimensions()
     {
@@ -106,7 +114,7 @@ public function getDimensions()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAggregation()
     {
@@ -114,7 +122,7 @@ public function getAggregation()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getQuery()
     {
@@ -122,7 +130,7 @@ public function getQuery()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFrom()
     {
@@ -130,10 +138,18 @@ public function getFrom()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSize()
     {
         return $this->size;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSort()
+    {
+        return $this->sort;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Search/Request/Binder.php b/lib/internal/Magento/Framework/Search/Request/Binder.php
index 34b5d72005e74..9df1ee87eb869 100644
--- a/lib/internal/Magento/Framework/Search/Request/Binder.php
+++ b/lib/internal/Magento/Framework/Search/Request/Binder.php
@@ -6,6 +6,8 @@
 namespace Magento\Framework\Search\Request;
 
 /**
+ * Data binder for search request.
+ *
  * @api
  */
 class Binder
@@ -24,6 +26,9 @@ public function bind(array $requestData, array $bindData)
         $data['queries'] = $this->processData($requestData['queries'], $bindData['placeholder']);
         $data['filters'] = $this->processData($requestData['filters'], $bindData['placeholder']);
         $data['aggregations'] = $this->processData($requestData['aggregations'], $bindData['placeholder']);
+        if (isset($bindData['sort']) && isset($requestData['sort'])) {
+            $data['sort'] = $this->processData($requestData['sort'], $bindData['sort']);
+        }
 
         return $data;
     }
@@ -48,6 +53,8 @@ private function processLimits($data, $bindData)
     }
 
     /**
+     * Dimensions process.
+     *
      * @param array $data
      * @param array $bindData
      * @return array
diff --git a/lib/internal/Magento/Framework/Search/Request/Builder.php b/lib/internal/Magento/Framework/Search/Request/Builder.php
index a16b3369cdda0..74bc65010a934 100644
--- a/lib/internal/Magento/Framework/Search/Request/Builder.php
+++ b/lib/internal/Magento/Framework/Search/Request/Builder.php
@@ -11,7 +11,10 @@
 use Magento\Framework\Search\RequestInterface;
 
 /**
+ * Search request builder.
+ *
  * @api
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Builder
 {
@@ -95,6 +98,18 @@ public function setFrom($from)
         return $this;
     }
 
+    /**
+     * Set sort.
+     *
+     * @param \Magento\Framework\Api\SortOrder[] $sort
+     * @return $this
+     */
+    public function setSort($sort)
+    {
+        $this->data['sort'] = $sort;
+        return $this;
+    }
+
     /**
      * Bind dimension data by name
      *
@@ -139,6 +154,9 @@ public function create()
         }
 
         $data = $this->binder->bind($data, $this->data);
+        if (isset($this->data['sort'])) {
+            $data['sort'] = $this->prepareSorts($this->data['sort']);
+        }
         $data = $this->cleaner->clean($data);
 
         $this->clear();
@@ -146,6 +164,25 @@ public function create()
         return $this->convert($data);
     }
 
+    /**
+     * Prepare sort data for request.
+     *
+     * @param array $sorts
+     * @return array
+     */
+    private function prepareSorts(array $sorts)
+    {
+        $sortData = [];
+        foreach ($sorts as $sortField => $direction) {
+            $sortData[] = [
+                'field' => $sortField,
+                'direction' => $direction,
+            ];
+        }
+
+        return $sortData;
+    }
+
     /**
      * Clear data
      *
@@ -178,21 +215,27 @@ private function convert($data)
                 'filters' => $data['filters']
             ]
         );
+        $requestData = [
+            'name' => $data['query'],
+            'indexName' => $data['index'],
+            'from' => $data['from'],
+            'size' => $data['size'],
+            'query' => $mapper->getRootQuery(),
+            'dimensions' => $this->buildDimensions(isset($data['dimensions']) ? $data['dimensions'] : []),
+            'buckets' => $mapper->getBuckets()
+        ];
+        if (isset($data['sort'])) {
+            $requestData['sort'] = $data['sort'];
+        }
         return $this->objectManager->create(
             \Magento\Framework\Search\Request::class,
-            [
-                'name' => $data['query'],
-                'indexName' => $data['index'],
-                'from' => $data['from'],
-                'size' => $data['size'],
-                'query' => $mapper->getRootQuery(),
-                'dimensions' => $this->buildDimensions(isset($data['dimensions']) ? $data['dimensions'] : []),
-                'buckets' => $mapper->getBuckets()
-            ]
+            $requestData
         );
     }
 
     /**
+     * Build dimensions.
+     *
      * @param array $dimensionsData
      * @return array
      */
diff --git a/lib/internal/Magento/Framework/Search/RequestInterface.php b/lib/internal/Magento/Framework/Search/RequestInterface.php
index 16df80f755c07..2de756e754a27 100644
--- a/lib/internal/Magento/Framework/Search/RequestInterface.php
+++ b/lib/internal/Magento/Framework/Search/RequestInterface.php
@@ -64,4 +64,11 @@ public function getFrom();
      * @return int|null
      */
     public function getSize();
+
+    /**
+     * Get Sort items
+     *
+     * @return array
+     */
+    public function getSort();
 }
diff --git a/lib/internal/Magento/Framework/Search/Response/QueryResponse.php b/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
index c2328398e53dc..90c7056ea2549 100644
--- a/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
+++ b/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
@@ -29,18 +29,26 @@ class QueryResponse implements ResponseInterface
      */
     protected $aggregations;
 
+    /**
+     * @var int
+     */
+    private $total;
+
     /**
      * @param Document[] $documents
      * @param AggregationInterface $aggregations
+     * @param int $total
      */
-    public function __construct(array $documents, AggregationInterface $aggregations)
+    public function __construct(array $documents, AggregationInterface $aggregations, int $total = 0)
     {
         $this->documents = $documents;
         $this->aggregations = $aggregations;
+        $this->total = $total;
     }
 
     /**
-     * Countable: return count of fields in document
+     * Countable: return count of fields in document.
+     *
      * @return int
      */
     public function count()
@@ -59,10 +67,18 @@ public function getIterator()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAggregations()
     {
         return $this->aggregations;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTotal(): int
+    {
+        return $this->total;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Search/ResponseInterface.php b/lib/internal/Magento/Framework/Search/ResponseInterface.php
index 3b89528532602..c6c0d0ab59e10 100644
--- a/lib/internal/Magento/Framework/Search/ResponseInterface.php
+++ b/lib/internal/Magento/Framework/Search/ResponseInterface.php
@@ -16,4 +16,11 @@ interface ResponseInterface extends \IteratorAggregate, \Countable
      * @return \Magento\Framework\Api\Search\AggregationInterface
      */
     public function getAggregations();
+
+    /**
+     * Return total count of items.
+     *
+     * @return int
+     */
+    public function getTotal(): int;
 }
diff --git a/lib/internal/Magento/Framework/Search/Search.php b/lib/internal/Magento/Framework/Search/Search.php
index 16dfc6fdd1ddb..fe228546b55fb 100644
--- a/lib/internal/Magento/Framework/Search/Search.php
+++ b/lib/internal/Magento/Framework/Search/Search.php
@@ -10,6 +10,9 @@
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\Search\Request\Builder;
 
+/**
+ * Search API for all requests.
+ */
 class Search implements SearchInterface
 {
     /**
@@ -51,7 +54,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function search(SearchCriteriaInterface $searchCriteria)
     {
@@ -68,6 +71,7 @@ public function search(SearchCriteriaInterface $searchCriteria)
 
         $this->requestBuilder->setFrom($searchCriteria->getCurrentPage() * $searchCriteria->getPageSize());
         $this->requestBuilder->setSize($searchCriteria->getPageSize());
+        $this->requestBuilder->setSort($searchCriteria->getSortOrders());
         $request = $this->requestBuilder->create();
         $searchResponse = $this->searchEngine->search($request);
 
diff --git a/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php b/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
index 40fcd493861d7..2314252f4609c 100644
--- a/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
+++ b/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
@@ -9,6 +9,9 @@
 use Magento\Framework\Api\Search\DocumentFactory;
 use Magento\Framework\Api\Search\SearchResultFactory;
 
+/**
+ * Builder for search response.
+ */
 class SearchResponseBuilder
 {
     /**
@@ -35,6 +38,8 @@ public function __construct(
     }
 
     /**
+     * Build search result by search response.
+     *
      * @param ResponseInterface $response
      * @return SearchResultInterface
      */
@@ -46,7 +51,7 @@ public function build(ResponseInterface $response)
         $documents = iterator_to_array($response);
         $searchResult->setItems($documents);
         $searchResult->setAggregations($response->getAggregations());
-        $searchResult->setTotalCount(count($documents));
+        $searchResult->setTotalCount($response->getTotal());
 
         return $searchResult;
     }
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
index 55d26493ca379..fbb56361bfe71 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
@@ -155,15 +155,22 @@ public function testQuery()
                     'aggregation2' => [2, 4],
                 ],
             ],
+            'total' => 1
         ];
 
         $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->connectionAdapter->expects($this->once())
+
+        $this->connectionAdapter->expects($this->exactly(2))
             ->method('select')
             ->willReturn($select);
 
+        $this->connectionAdapter->expects($this->once())
+            ->method('fetchOne')
+            ->with($select)
+            ->willReturn($selectResult['total']);
+
         $table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/ResponseFactoryTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/ResponseFactoryTest.php
index c0699156decd0..3d21064b13d47 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/ResponseFactoryTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/ResponseFactoryTest.php
@@ -49,6 +49,7 @@ public function testCreate()
                 ['title' => 'twoTitle', 'description' => 'twoDescription'],
             ],
             'aggregations' => [],
+            'total' => 2
         ];
 
         $this->documentFactory->expects($this->at(0))->method('create')
@@ -61,7 +62,7 @@ public function testCreate()
         $this->objectManager->expects($this->once())->method('create')
             ->with(
                 $this->equalTo(\Magento\Framework\Search\Response\QueryResponse::class),
-                $this->equalTo(['documents' => ['document1', 'document2'], 'aggregations' => null])
+                $this->equalTo(['documents' => ['document1', 'document2'], 'aggregations' => null, 'total' => 2])
             )
             ->will($this->returnValue('QueryResponseObject'));
 
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Response/QueryResponseTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Response/QueryResponseTest.php
index a60a280cb602a..a994559f28f0b 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Response/QueryResponseTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Response/QueryResponseTest.php
@@ -46,6 +46,7 @@ protected function setUp()
             [
                 'documents' => $this->documents,
                 'aggregations' => $this->aggregations,
+                'total' => 1
             ]
         );
     }
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/SearchResponseBuilderTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/SearchResponseBuilderTest.php
index a0b11959a42db..9ffafae9622f3 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/SearchResponseBuilderTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/SearchResponseBuilderTest.php
@@ -67,7 +67,7 @@ public function testBuild()
 
         /** @var QueryResponse|\PHPUnit_Framework_MockObject_MockObject $response */
         $response = $this->getMockBuilder(\Magento\Framework\Search\Response\QueryResponse::class)
-            ->setMethods(['getIterator', 'getAggregations'])
+            ->setMethods(['getIterator', 'getAggregations', 'getTotal'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $response->expects($this->any())
@@ -76,6 +76,9 @@ public function testBuild()
         $response->expects($this->once())
             ->method('getAggregations')
             ->willReturn($aggregations);
+        $response->expects($this->any())
+            ->method('getTotal')
+            ->willReturn(1);
 
         $result = $this->model->build($response);
 
diff --git a/lib/internal/Magento/Framework/Search/etc/requests.xsd b/lib/internal/Magento/Framework/Search/etc/requests.xsd
index a49124748b295..7d277382b698f 100644
--- a/lib/internal/Magento/Framework/Search/etc/requests.xsd
+++ b/lib/internal/Magento/Framework/Search/etc/requests.xsd
@@ -28,8 +28,8 @@
           <xs:field xpath="@name" />
         </xs:key>
       </xs:element>
-      <xs:element type="xs:string" name="from" />
-      <xs:element type="xs:string" name="size" />
+      <xs:element type="xs:string" name="from" minOccurs="0" />
+      <xs:element type="xs:string" name="size" minOccurs="0" />
     </xs:sequence>
     <xs:attribute type="xs:string" name="query" use="required" />
     <xs:attribute type="xs:string" name="index" use="required" />
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
index 34a99f26a4ef1..4c65d8a70bed5 100644
--- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
@@ -350,6 +350,13 @@ private function processConstraints(array $tableData, string $resource, Schema $
             if ($constraintData['type'] === 'foreign') {
                 $constraintData['column'] = $this->getColumnByName($constraintData['column'], $table);
                 $referenceTableData = $this->tablesData[$constraintData['referenceTable']];
+
+                if ($this->isDisabled($referenceTableData)) {
+                    throw new \LogicException(
+                        sprintf('The reference table named "%s" is disabled', $referenceTableData['name'])
+                    );
+                }
+
                 //If we are referenced to the same table we need to specify it
                 //Get table name from resource connection regarding prefix settings
                 $refTableName = $this->resourceConnection->getTableName($referenceTableData['name']);
diff --git a/lib/internal/Magento/Framework/Setup/OldDbValidator.php b/lib/internal/Magento/Framework/Setup/OldDbValidator.php
index 4c224a6c713ef..018b010e8fe4a 100644
--- a/lib/internal/Magento/Framework/Setup/OldDbValidator.php
+++ b/lib/internal/Magento/Framework/Setup/OldDbValidator.php
@@ -13,7 +13,7 @@
 /**
  * Old Validator for database
  *
- * Used in order to support backward compatability of modules that are installed
+ * Used in order to support backward compatibility of modules that are installed
  * in old way (with Install/Upgrade Schema/Data scripts)
  */
 class OldDbValidator implements UpToDateValidatorInterface
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 335006555d2f1..6c4746d8218ea 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\View\Element;
 
+use Magento\Framework\Cache\LockGuardedCacheLoader;
 use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Base class for all blocks.
@@ -175,14 +178,23 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      */
     protected $_cache;
 
+    /**
+     * @var LockGuardedCacheLoader
+     */
+    private $lockQuery;
+
     /**
      * Constructor
      *
      * @param \Magento\Framework\View\Element\Context $context
      * @param array $data
+     * @param LockGuardedCacheLoader|null $lockQuery
      */
-    public function __construct(\Magento\Framework\View\Element\Context $context, array $data = [])
-    {
+    public function __construct(
+        \Magento\Framework\View\Element\Context $context,
+        array $data = [],
+        LockGuardedCacheLoader $lockQuery = null
+    ) {
         $this->_request = $context->getRequest();
         $this->_layout = $context->getLayout();
         $this->_eventManager = $context->getEventManager();
@@ -204,6 +216,8 @@ public function __construct(\Magento\Framework\View\Element\Context $context, ar
             $this->jsLayout = $data['jsLayout'];
             unset($data['jsLayout']);
         }
+        $this->lockQuery = $lockQuery
+            ?: ObjectManager::getInstance()->get(LockGuardedCacheLoader::class);
         parent::__construct($data);
         $this->_construct();
     }
@@ -658,19 +672,6 @@ public function toHtml()
         }
 
         $html = $this->_loadCache();
-        if ($html === false) {
-            if ($this->hasData('translate_inline')) {
-                $this->inlineTranslation->suspend($this->getData('translate_inline'));
-            }
-
-            $this->_beforeToHtml();
-            $html = $this->_toHtml();
-            $this->_saveCache($html);
-
-            if ($this->hasData('translate_inline')) {
-                $this->inlineTranslation->resume();
-            }
-        }
         $html = $this->_afterToHtml($html);
 
         /** @var \Magento\Framework\DataObject */
@@ -1083,23 +1084,54 @@ protected function getCacheLifetime()
     /**
      * Load block html from cache storage
      *
-     * @return string|false
+     * @return string
      */
     protected function _loadCache()
     {
+        $collectAction = function () {
+            if ($this->hasData('translate_inline')) {
+                $this->inlineTranslation->suspend($this->getData('translate_inline'));
+            }
+
+            $this->_beforeToHtml();
+            return $this->_toHtml();
+        };
+
         if ($this->getCacheLifetime() === null || !$this->_cacheState->isEnabled(self::CACHE_GROUP)) {
-            return false;
-        }
-        $cacheKey = $this->getCacheKey();
-        $cacheData = $this->_cache->load($cacheKey);
-        if ($cacheData) {
-            $cacheData = str_replace(
-                $this->_getSidPlaceholder($cacheKey),
-                $this->_sidResolver->getSessionIdQueryParam($this->_session) . '=' . $this->_session->getSessionId(),
-                $cacheData
-            );
+            $html = $collectAction();
+            if ($this->hasData('translate_inline')) {
+                $this->inlineTranslation->resume();
+            }
+            return $html;
         }
-        return $cacheData;
+        $loadAction = function () {
+            $cacheKey = $this->getCacheKey();
+            $cacheData = $this->_cache->load($cacheKey);
+            if ($cacheData) {
+                $cacheData = str_replace(
+                    $this->_getSidPlaceholder($cacheKey),
+                    $this->_sidResolver->getSessionIdQueryParam($this->_session)
+                    . '='
+                    . $this->_session->getSessionId(),
+                    $cacheData
+                );
+            }
+            return $cacheData;
+        };
+
+        $saveAction = function ($data) {
+            $this->_saveCache($data);
+            if ($this->hasData('translate_inline')) {
+                $this->inlineTranslation->resume();
+            }
+        };
+
+        return (string)$this->lockQuery->lockedLoadData(
+            $this->getCacheKey(),
+            $loadAction,
+            $collectAction,
+            $saveAction
+        );
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
index 5f7508438a6ed..dba775ea894f4 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Framework\View\Test\Unit\Element;
 
+use Magento\Framework\Cache\LockGuardedCacheLoader;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Context;
 use Magento\Framework\Config\View;
@@ -13,7 +14,6 @@
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Cache\StateInterface as CacheStateInterface;
-use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Session\SidResolverInterface;
 use Magento\Framework\Session\SessionManagerInterface;
 
@@ -42,11 +42,6 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
      */
     private $cacheStateMock;
 
-    /**
-     * @var CacheInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $cacheMock;
-
     /**
      * @var SidResolverInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -57,6 +52,11 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
      */
     private $sessionMock;
 
+    /**
+     * @var LockGuardedCacheLoader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $lockQuery;
+
     /**
      * @return void
      */
@@ -65,7 +65,10 @@ protected function setUp()
         $this->eventManagerMock = $this->getMockForAbstractClass(EventManagerInterface::class);
         $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->cacheStateMock = $this->getMockForAbstractClass(CacheStateInterface::class);
-        $this->cacheMock = $this->getMockForAbstractClass(CacheInterface::class);
+        $this->lockQuery = $this->getMockBuilder(LockGuardedCacheLoader::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['lockedLoadData'])
+            ->getMockForAbstractClass();
         $this->sidResolverMock = $this->getMockForAbstractClass(SidResolverInterface::class);
         $this->sessionMock = $this->getMockForAbstractClass(SessionManagerInterface::class);
         $contextMock = $this->createMock(Context::class);
@@ -78,9 +81,6 @@ protected function setUp()
         $contextMock->expects($this->once())
             ->method('getCacheState')
             ->willReturn($this->cacheStateMock);
-        $contextMock->expects($this->once())
-            ->method('getCache')
-            ->willReturn($this->cacheMock);
         $contextMock->expects($this->once())
             ->method('getSidResolver')
             ->willReturn($this->sidResolverMock);
@@ -89,7 +89,11 @@ protected function setUp()
             ->willReturn($this->sessionMock);
         $this->block = $this->getMockForAbstractClass(
             AbstractBlock::class,
-            ['context' => $contextMock]
+            [
+                'context' => $contextMock,
+                'data' => [],
+                'lockQuery' => $this->lockQuery
+            ]
         );
     }
 
@@ -219,10 +223,7 @@ public function testToHtmlWhenModuleIsDisabled()
     /**
      * @param string|bool $cacheLifetime
      * @param string|bool $dataFromCache
-     * @param string $dataForSaveCache
      * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsDispatchEvent
-     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheLoad
-     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheSave
      * @param string $expectedResult
      * @return void
      * @dataProvider getCacheLifetimeDataProvider
@@ -230,10 +231,7 @@ public function testToHtmlWhenModuleIsDisabled()
     public function testGetCacheLifetimeViaToHtml(
         $cacheLifetime,
         $dataFromCache,
-        $dataForSaveCache,
         $expectsDispatchEvent,
-        $expectsCacheLoad,
-        $expectsCacheSave,
         $expectedResult
     ) {
         $moduleName = 'Test';
@@ -252,13 +250,9 @@ public function testGetCacheLifetimeViaToHtml(
             ->method('isEnabled')
             ->with(AbstractBlock::CACHE_GROUP)
             ->willReturn(true);
-        $this->cacheMock->expects($expectsCacheLoad)
-            ->method('load')
-            ->with(AbstractBlock::CACHE_KEY_PREFIX . $cacheKey)
+        $this->lockQuery->expects($this->any())
+            ->method('lockedLoadData')
             ->willReturn($dataFromCache);
-        $this->cacheMock->expects($expectsCacheSave)
-            ->method('save')
-            ->with($dataForSaveCache, AbstractBlock::CACHE_KEY_PREFIX . $cacheKey);
         $this->sidResolverMock->expects($this->any())
             ->method('getSessionIdQueryParam')
             ->with($this->sessionMock)
@@ -279,46 +273,31 @@ public function getCacheLifetimeDataProvider()
             [
                 'cacheLifetime' => null,
                 'dataFromCache' => 'dataFromCache',
-                'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->never(),
-                'expectsCacheSave' => $this->never(),
                 'expectedResult' => '',
             ],
             [
                 'cacheLifetime' => false,
                 'dataFromCache' => 'dataFromCache',
-                'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->never(),
-                'expectsCacheSave' => $this->never(),
                 'expectedResult' => '',
             ],
             [
                 'cacheLifetime' => 120,
                 'dataFromCache' => 'dataFromCache',
-                'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->once(),
-                'expectsCacheSave' => $this->never(),
                 'expectedResult' => 'dataFromCache',
             ],
             [
                 'cacheLifetime' => '120string',
                 'dataFromCache' => 'dataFromCache',
-                'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->once(),
-                'expectsCacheSave' => $this->never(),
                 'expectedResult' => 'dataFromCache',
             ],
             [
                 'cacheLifetime' => 120,
                 'dataFromCache' => false,
-                'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->once(),
-                'expectsCacheSave' => $this->once(),
                 'expectedResult' => '',
             ],
         ];
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
index b911a38dbb488..4c76087bfea12 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\View\Test\Unit\Element\Html;
 
 class LinkTest extends \PHPUnit\Framework\TestCase
 {
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+    }
+
     /**
      * @var array
      */
@@ -24,24 +32,8 @@ class LinkTest extends \PHPUnit\Framework\TestCase
      */
     protected $link;
 
-    /**
-     * @param \Magento\Framework\View\Element\Html\Link $link
-     * @param string $expected
-     *
-     * @dataProvider getLinkAttributesDataProvider
-     */
-    public function testGetLinkAttributes($link, $expected)
-    {
-        $this->assertEquals($expected, $link->getLinkAttributes());
-    }
-
-    /**
-     * @return array
-     */
-    public function getLinkAttributesDataProvider()
+    public function testGetLinkAttributes()
     {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
         $escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
             ->setMethods(['escapeHtml'])->disableOriginalConstructor()->getMock();
 
@@ -54,13 +46,19 @@ public function getLinkAttributesDataProvider()
 
         $urlBuilderMock->expects($this->any())
             ->method('getUrl')
-            ->will($this->returnArgument('http://site.com/link.html'));
+            ->willReturn('http://site.com/link.html');
 
         $validtorMock = $this->getMockBuilder(\Magento\Framework\View\Element\Template\File\Validator::class)
             ->setMethods(['isValid'])->disableOriginalConstructor()->getMock();
+        $validtorMock->expects($this->any())
+            ->method('isValid')
+            ->willReturn(false);
 
         $scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config::class)
             ->setMethods(['isSetFlag'])->disableOriginalConstructor()->getMock();
+        $scopeConfigMock->expects($this->any())
+            ->method('isSetFlag')
+            ->willReturn(true);
 
         $resolverMock = $this->getMockBuilder(\Magento\Framework\View\Element\Template\File\Resolver::class)
             ->setMethods([])->disableOriginalConstructor()->getMock();
@@ -72,48 +70,48 @@ public function getLinkAttributesDataProvider()
 
         $contextMock->expects($this->any())
             ->method('getValidator')
-            ->will($this->returnValue($validtorMock));
+            ->willReturn($validtorMock);
 
         $contextMock->expects($this->any())
             ->method('getResolver')
-            ->will($this->returnValue($resolverMock));
+            ->willReturn($resolverMock);
 
         $contextMock->expects($this->any())
             ->method('getEscaper')
-            ->will($this->returnValue($escaperMock));
+            ->willReturn($escaperMock);
 
         $contextMock->expects($this->any())
             ->method('getUrlBuilder')
-            ->will($this->returnValue($urlBuilderMock));
+            ->willReturn($urlBuilderMock);
 
         $contextMock->expects($this->any())
             ->method('getScopeConfig')
-            ->will($this->returnValue($scopeConfigMock));
+            ->willReturn($scopeConfigMock);
 
         /** @var \Magento\Framework\View\Element\Html\Link $linkWithAttributes */
-        $linkWithAttributes = $objectManagerHelper->getObject(
+        $linkWithAttributes = $this->objectManager->getObject(
             \Magento\Framework\View\Element\Html\Link::class,
             ['context' => $contextMock]
         );
+
+        $this->assertEquals(
+            'href="http://site.com/link.html"',
+            $linkWithAttributes->getLinkAttributes()
+        );
+
         /** @var \Magento\Framework\View\Element\Html\Link $linkWithoutAttributes */
-        $linkWithoutAttributes = $objectManagerHelper->getObject(
+        $linkWithoutAttributes = $this->objectManager->getObject(
             \Magento\Framework\View\Element\Html\Link::class,
             ['context' => $contextMock]
         );
-
         foreach ($this->allowedAttributes as $attribute) {
-            $linkWithAttributes->setDataUsingMethod($attribute, $attribute);
+            $linkWithoutAttributes->setDataUsingMethod($attribute, $attribute);
         }
 
-        return [
-            'full' => [
-                'link' => $linkWithAttributes,
-                'expected' => 'shape="shape" tabindex="tabindex" onfocus="onfocus" onblur="onblur" id="id"',
-            ],
-            'empty' => [
-                'link' => $linkWithoutAttributes,
-                'expected' => '',
-            ],
-        ];
+        $this->assertEquals(
+            'href="http://site.com/link.html" shape="shape" tabindex="tabindex"'
+            . ' onfocus="onfocus" onblur="onblur" id="id"',
+            $linkWithoutAttributes->getLinkAttributes()
+        );
     }
 }
diff --git a/lib/web/css/source/lib/_resets.less b/lib/web/css/source/lib/_resets.less
index 4499c314ce6ca..08d16842b849c 100644
--- a/lib/web/css/source/lib/_resets.less
+++ b/lib/web/css/source/lib/_resets.less
@@ -105,13 +105,6 @@
             .lib-css(box-shadow, @focus__box-shadow);
         }
     }
-
-    input[type="radio"],
-    input[type="checkbox"] {
-        &:focus { 
-            box-shadow: none;
-        }
-    }
 }
 
 //
diff --git a/lib/web/mage/adminhtml/globals.js b/lib/web/mage/adminhtml/globals.js
index 12c97fdfcd2c5..683606e576497 100644
--- a/lib/web/mage/adminhtml/globals.js
+++ b/lib/web/mage/adminhtml/globals.js
@@ -12,7 +12,7 @@ define([
 
     /**
      * Set of a temporary methods used to provide
-     * backward compatability with a legacy code.
+     * backward compatibility with a legacy code.
      */
     window.setLocation = function (url) {
         window.location.href = url;
diff --git a/lib/web/mage/backend/floating-header.js b/lib/web/mage/backend/floating-header.js
index 06861277559a4..a6f767259488a 100644
--- a/lib/web/mage/backend/floating-header.js
+++ b/lib/web/mage/backend/floating-header.js
@@ -48,6 +48,7 @@ define([
             this.element.wrapInner($('<div/>', {
                 'class': 'page-actions-inner', 'data-title': title
             }));
+            this.element.removeClass('floating-header');
         },
 
         /**
diff --git a/lib/web/mage/tabs.js b/lib/web/mage/tabs.js
index b441477ab8d8a..65c452d33bf12 100644
--- a/lib/web/mage/tabs.js
+++ b/lib/web/mage/tabs.js
@@ -72,7 +72,7 @@ define([
 
             if (anchor && isValid) {
                 $.each(self.contents, function (i) {
-                    if ($(this).attr('id') === anchorId) {
+                    if ($(this).attr('id') === anchorId || $(this).find('#' + anchorId).length) {
                         self.collapsibles.not(self.collapsibles.eq(i)).collapsible('forceDeactivate');
 
                         return false;
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 765d0a616f77c..0e1860405e946 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -27267,843 +27267,6 @@ if (testLabel
             <stringProp name="ThreadGroup.delay"/>
         <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
         <hashTree>
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Product Grid Mass Actions" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${productGridMassActionPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Product Grid Mass Actions");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-        <stringProp name="script">
-        function getFormKeyFromResponse()
-        {
-            var url = prev.getUrlAsString(),
-            responseCode =  prev.getResponseCode(),
-            formKey = null;
-            searchPattern = /var FORM_KEY = '(.+)'/;
-            if (responseCode == "200" &amp;&amp; url) {
-                response = prev.getResponseDataAsString();
-                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-            }
-            return formKey;
-        }
-
-        formKey = vars.get("form_key_storage");
-
-	   currentFormKey = getFormKeyFromResponse();
-
-	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-		  vars.put("form_key_storage", currentFormKey);
-	   }
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-        <hashTree/>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-            <stringProp name="script">
-                formKey =  vars.get("form_key_storage");
-                if (formKey
-                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-                    &amp;&amp; sampler.getMethod() == "POST")
-                    {
-                        arguments = sampler.getArguments();
-                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-                        {
-                            argument = arguments.getArgument(i);
-                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-                            argument.setValue(formKey);
-                        }
-                    }
-                }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        </JSR223PreProcessor>
-        <hashTree/>
-    
-    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-      <collectionProp name="CookieManager.cookies"/>
-      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-    <hashTree>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">
-adminUserList = props.get("adminUserList");
-adminUserListIterator = props.get("adminUserListIterator");
-adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-
-if (adminUsersDistribution == 1) {
-    adminUser = adminUserList.poll();
-} else {
-    if (!adminUserListIterator.hasNext()) {
-        adminUserListIterator = adminUserList.descendingIterator();
-    }
-
-    adminUser = adminUserListIterator.next();
-}
-
-if (adminUser == null) {
-  SampleResult.setResponseMessage("adminUser list is empty");
-  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-  IsSuccess=false;
-  SampleResult.setSuccessful(false);
-  SampleResult.setStopThread(true);
-}
-vars.put("admin_user", adminUser);
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
-    <hashTree/>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1397214398">Welcome</stringProp>
-          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_form_key</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="dummy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">dummy</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="login[password]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_password}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[password]</stringProp>
-          </elementProp>
-          <elementProp name="login[username]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_user}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[username]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">1</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-        <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Pages Count" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">product_listing</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="search" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">search</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">20</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[current]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[current]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">entity_id</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[field]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">asc</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[direction]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="isAjax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">isAjax</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/get_product_pages_count.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-        <stringProp name="EXPECTED_VALUE">0</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">true</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-        <stringProp name="VAR">products_number</stringProp>
-        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Calculate pages count" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">var productsPageSize = Integer.parseInt(vars.get("products_page_size"));
-var productsTotal = Integer.parseInt(vars.get("products_number"));
-var pageCountProducts = Math.round(productsTotal/productsPageSize);
-
-vars.put("pages_count_product", String.valueOf(pageCountProducts));</stringProp>
-      </BeanShellPostProcessor>
-      <hashTree/>
-    </hashTree>
-  
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-      <stringProp name="BeanShellSampler.query">
-import java.util.Random;
-Random random = new Random();
-if (${seedForRandom} &gt; 0) {
-random.setSeed(${seedForRandom});
-}
-var productsPageSize = Integer.parseInt(vars.get("products_page_size"));
-var totalNumberOfPages = Integer.parseInt(vars.get("pages_count_product"));
-
-// Randomly select a page.
-var randomProductsPage = random.nextInt(totalNumberOfPages) + 1;
-
-// Get the first and last product id on that page.
-var lastProductIdOnPage = randomProductsPage * productsPageSize;
-var firstProductIdOnPage = lastProductIdOnPage - productsPageSize + 1;
-
-var randomProductId1 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
-var randomProductId2 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
-var randomProductId3 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
-
-vars.put("page_number", String.valueOf(randomProductsPage));
-vars.put("productId1", String.valueOf(randomProductId1));
-vars.put("productId2", String.valueOf(randomProductId2));
-vars.put("productId3", String.valueOf(randomProductId3));
-
-var randomQuantity = random.nextInt(1000) + 1;
-var randomPrice = random.nextInt(500) + 10;
-var randomVisibility = random.nextInt(4) + 1;
-
-vars.put("quantity", String.valueOf(randomQuantity));
-vars.put("price", String.valueOf(randomPrice));
-vars.put("visibility", String.valueOf(randomVisibility));
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/setup.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select Products and Update Attributes mass action" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">product_listing</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="search" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">search</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${products_page_size}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[current]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${page_number}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[current]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">entity_id</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[field]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">asc</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[direction]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="isAjax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">isAjax</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/display_grid.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1637639774">totalRecords</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Display Update Attributes" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="selected[0]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${productId1}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">selected[0]</stringProp>
-          </elementProp>
-          <elementProp name="selected[1]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${productId2}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">selected[1]</stringProp>
-          </elementProp>
-          <elementProp name="selected[2]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${productId3}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">selected[2]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">product_listing</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/edit</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/display_update_attributes.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1862384910">Update Attributes</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Validate Attributes" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="isAjax" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">isAjax</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="inventory[qty]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${quantity}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">inventory[qty]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="attributes[price]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${price}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[price]</stringProp>
-        </elementProp>
-        <elementProp name="attributes[visibility]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${visibility}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[visibility]</stringProp>
-        </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/validate</stringProp>
-    <stringProp name="HTTPSampler.method">POST</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/change_attributes.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1853918323">{"error":false}</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Attributes" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="isAjax" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">isAjax</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
-        </elementProp>
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
-        </elementProp>
-        <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="inventory[qty]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${quantity}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">inventory[qty]</stringProp>
-        </elementProp>
-        <elementProp name="toggle_qty" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">on</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">toggle_price</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="attributes[price]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${price}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[price]</stringProp>
-        </elementProp>
-        <elementProp name="toggle_price" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">on</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">toggle_price</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="attributes[visibility]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${visibility}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[visibility]</stringProp>
-        </elementProp>
-        <elementProp name="toggle_visibility" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">on</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">toggle_visibility</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/save/store/0/active_tab/attributes</stringProp>
-    <stringProp name="HTTPSampler.method">POST</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  </HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1848809106">were updated.</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
-</hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-    
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-        if (adminUsersDistribution == 1) {
-            adminUserList = props.get("adminUserList");
-            adminUserList.add(vars.get("admin_user"));
-        }
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
-  </hashTree>
-  </hashTree>
-
-  
     <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Import Products" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
diff --git a/setup/src/Magento/Setup/Controller/Session.php b/setup/src/Magento/Setup/Controller/Session.php
index e310dd485ace5..c9caa5a8de792 100644
--- a/setup/src/Magento/Setup/Controller/Session.php
+++ b/setup/src/Magento/Setup/Controller/Session.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Setup\Controller;
 
+/**
+ * Sets up session for setup/index.php/session/prolong or redirects to error page
+ */
 class Session extends \Zend\Mvc\Controller\AbstractActionController
 {
     /**
@@ -52,23 +55,28 @@ public function prolongAction()
         try {
             if ($this->serviceManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
                 $objectManager = $this->objectManagerProvider->get();
-                /** @var \Magento\Framework\App\State $adminAppState */
-                $adminAppState = $objectManager->get(\Magento\Framework\App\State::class);
-                $adminAppState->setAreaCode(\Magento\Framework\App\Area::AREA_ADMINHTML);
-                $sessionConfig = $objectManager->get(\Magento\Backend\Model\Session\AdminConfig::class);
-                /** @var \Magento\Backend\Model\Url $backendUrl */
-                $backendUrl = $objectManager->get(\Magento\Backend\Model\Url::class);
-                $urlPath = parse_url($backendUrl->getBaseUrl(), PHP_URL_PATH);
-                $cookiePath = $urlPath . 'setup';
-                $sessionConfig->setCookiePath($cookiePath);
                 /* @var \Magento\Backend\Model\Auth\Session $session */
-                $session = $objectManager->create(
-                    \Magento\Backend\Model\Auth\Session::class,
-                    [
-                        'sessionConfig' => $sessionConfig,
-                        'appState' => $adminAppState
-                    ]
-                );
+                $session = $objectManager->get(\Magento\Backend\Model\Auth\Session::class);
+                // check if session was already set in \Magento\Setup\Mvc\Bootstrap\InitParamListener::authPreDispatch
+                if (!$session->isSessionExists()) {
+                    /** @var \Magento\Framework\App\State $adminAppState */
+                    $adminAppState = $objectManager->get(\Magento\Framework\App\State::class);
+                    $adminAppState->setAreaCode(\Magento\Framework\App\Area::AREA_ADMINHTML);
+                    $sessionConfig = $objectManager->get(\Magento\Backend\Model\Session\AdminConfig::class);
+                    /** @var \Magento\Backend\Model\Url $backendUrl */
+                    $backendUrl = $objectManager->get(\Magento\Backend\Model\Url::class);
+                    $urlPath = parse_url($backendUrl->getBaseUrl(), PHP_URL_PATH);
+                    $cookiePath = $urlPath . 'setup';
+                    $sessionConfig->setCookiePath($cookiePath);
+                    /* @var \Magento\Backend\Model\Auth\Session $session */
+                    $session = $objectManager->create(
+                        \Magento\Backend\Model\Auth\Session::class,
+                        [
+                            'sessionConfig' => $sessionConfig,
+                            'appState' => $adminAppState
+                        ]
+                    );
+                }
                 $session->prolong();
                 return new \Zend\View\Model\JsonModel(['success' => true]);
             }
@@ -78,6 +86,8 @@ public function prolongAction()
     }
 
     /**
+     * Unlogin action, return 401 error page
+     *
      * @return \Zend\View\Model\ViewModel|\Zend\Http\Response
      */
     public function unloginAction()
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList.php b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
index afe1a5d9e2591..3f2aedae1373c 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
@@ -50,7 +50,8 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     private $configOptionsListClasses = [
         \Magento\Setup\Model\ConfigOptionsList\Session::class,
         \Magento\Setup\Model\ConfigOptionsList\Cache::class,
-        \Magento\Setup\Model\ConfigOptionsList\PageCache::class
+        \Magento\Setup\Model\ConfigOptionsList\PageCache::class,
+        \Magento\Setup\Model\ConfigOptionsList\Lock::class,
     ];
 
     /**
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
new file mode 100644
index 0000000000000..66f41128c46b1
--- /dev/null
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
@@ -0,0 +1,342 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Model\ConfigOptionsList;
+
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\ConfigOptionsListInterface;
+use Magento\Framework\Setup\Option\SelectConfigOption;
+use Magento\Framework\Setup\Option\TextConfigOption;
+
+/**
+ * Deployment configuration options for locks
+ */
+class Lock implements ConfigOptionsListInterface
+{
+    /**
+     * The name of an option to set lock provider
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_PROVIDER = 'lock-provider';
+
+    /**
+     * The name of an option to set DB prefix
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_DB_PREFIX = 'lock-db-prefix';
+
+    /**
+     * The name of an option to set Zookeeper host
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_ZOOKEEPER_HOST = 'lock-zookeeper-host';
+
+    /**
+     * The name of an option to set Zookeeper path
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_ZOOKEEPER_PATH = 'lock-zookeeper-path';
+
+    /**
+     * The name of an option to set File path
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_FILE_PATH = 'lock-file-path';
+
+    /**
+     * The configuration path to save lock provider
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_PROVIDER = 'lock/provider';
+
+    /**
+     * The configuration path to save DB prefix
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_DB_PREFIX = 'lock/config/prefix';
+
+    /**
+     * The configuration path to save Zookeeper host
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_ZOOKEEPER_HOST = 'lock/config/host';
+
+    /**
+     * The configuration path to save Zookeeper path
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_ZOOKEEPER_PATH = 'lock/config/path';
+
+    /**
+     * The configuration path to save locks directory path
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_FILE_PATH = 'lock/config/path';
+
+    /**
+     * The list of lock providers
+     *
+     * @var array
+     */
+    private $validLockProviders = [
+        LockBackendFactory::LOCK_DB,
+        LockBackendFactory::LOCK_ZOOKEEPER,
+        LockBackendFactory::LOCK_CACHE,
+        LockBackendFactory::LOCK_FILE,
+    ];
+
+    /**
+     * The mapping input keys with their configuration paths
+     *
+     * @var array
+     */
+    private $mappingInputKeyToConfigPath = [
+        LockBackendFactory::LOCK_DB => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+            self::INPUT_KEY_LOCK_DB_PREFIX => self::CONFIG_PATH_LOCK_DB_PREFIX,
+        ],
+        LockBackendFactory::LOCK_ZOOKEEPER => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+            self::INPUT_KEY_LOCK_ZOOKEEPER_HOST => self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
+            self::INPUT_KEY_LOCK_ZOOKEEPER_PATH => self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
+        ],
+        LockBackendFactory::LOCK_CACHE => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+        ],
+        LockBackendFactory::LOCK_FILE => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+            self::INPUT_KEY_LOCK_FILE_PATH => self::CONFIG_PATH_LOCK_FILE_PATH,
+        ],
+    ];
+
+    /**
+     * The list of default values
+     *
+     * @var array
+     */
+    private $defaultConfigValues = [
+        self::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
+        self::INPUT_KEY_LOCK_DB_PREFIX => null,
+        self::INPUT_KEY_LOCK_ZOOKEEPER_PATH => ZookeeperLock::DEFAULT_PATH,
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function getOptions()
+    {
+        return [
+            new SelectConfigOption(
+                self::INPUT_KEY_LOCK_PROVIDER,
+                SelectConfigOption::FRONTEND_WIZARD_SELECT,
+                $this->validLockProviders,
+                self::CONFIG_PATH_LOCK_PROVIDER,
+                'Lock provider name',
+                LockBackendFactory::LOCK_DB
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_DB_PREFIX,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_DB_PREFIX,
+                'Installation specific lock prefix to avoid lock conflicts'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_ZOOKEEPER_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
+                'Host and port to connect to Zookeeper cluster. For example: 127.0.0.1:2181'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_ZOOKEEPER_PATH,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
+                'The path where Zookeeper will save locks. The default path is: ' . ZookeeperLock::DEFAULT_PATH
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_FILE_PATH,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_FILE_PATH,
+                'The path where file locks will be saved.'
+            ),
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createConfig(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData->setOverrideWhenSave(true);
+        $lockProvider = $this->getLockProvider($options, $deploymentConfig);
+
+        $this->setDefaultConfiguration($configData, $deploymentConfig, $lockProvider);
+
+        foreach ($this->mappingInputKeyToConfigPath[$lockProvider] as $input => $path) {
+            if (isset($options[$input])) {
+                $configData->set($path, $options[$input]);
+            }
+        }
+
+        return $configData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $lockProvider = $this->getLockProvider($options, $deploymentConfig);
+        switch ($lockProvider) {
+            case LockBackendFactory::LOCK_ZOOKEEPER:
+                $errors = $this->validateZookeeperConfig($options, $deploymentConfig);
+                break;
+            case LockBackendFactory::LOCK_FILE:
+                $errors = $this->validateFileConfig($options, $deploymentConfig);
+                break;
+            case LockBackendFactory::LOCK_CACHE:
+            case LockBackendFactory::LOCK_DB:
+                $errors = [];
+                break;
+            default:
+                $errors[] = 'The lock provider ' . $lockProvider . ' does not exist.';
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Validates File locks configuration
+     *
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return array
+     */
+    private function validateFileConfig(array $options, DeploymentConfig $deploymentConfig): array
+    {
+        $errors = [];
+
+        $path = $options[self::INPUT_KEY_LOCK_FILE_PATH]
+            ?? $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_FILE_PATH,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_FILE_PATH)
+            );
+
+        if (!$path) {
+            $errors[] = 'The path needs to be a non-empty string.';
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Validates Zookeeper configuration
+     *
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return array
+     */
+    private function validateZookeeperConfig(array $options, DeploymentConfig $deploymentConfig): array
+    {
+        $errors = [];
+
+        if (!extension_loaded(LockBackendFactory::LOCK_ZOOKEEPER)) {
+            $errors[] = 'php extension Zookeeper is not installed.';
+        }
+
+        $host = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_HOST]
+            ?? $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_HOST)
+            );
+        $path = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_PATH]
+            ?? $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_PATH)
+            );
+
+        if (!$path) {
+            $errors[] = 'Zookeeper path needs to be a non-empty string.';
+        }
+
+        if (!$host) {
+            $errors[] = 'Zookeeper host is should be set.';
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Returns the name of lock provider
+     *
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return string
+     */
+    private function getLockProvider(array $options, DeploymentConfig $deploymentConfig): string
+    {
+        if (!isset($options[self::INPUT_KEY_LOCK_PROVIDER])) {
+            return (string) $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_PROVIDER,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_PROVIDER)
+            );
+        }
+
+        return (string) $options[self::INPUT_KEY_LOCK_PROVIDER];
+    }
+
+    /**
+     * Sets default configuration for locks
+     *
+     * @param ConfigData $configData
+     * @param DeploymentConfig $deploymentConfig
+     * @param string $lockProvider
+     * @return ConfigData
+     */
+    private function setDefaultConfiguration(
+        ConfigData $configData,
+        DeploymentConfig $deploymentConfig,
+        string $lockProvider
+    ) {
+        foreach ($this->mappingInputKeyToConfigPath[$lockProvider] as $input => $path) {
+            $configData->set($path, $deploymentConfig->get($path, $this->getDefaultValue($input)));
+        }
+
+        return $configData;
+    }
+
+    /**
+     * Returns default value by input key
+     *
+     * If default value is not set returns null
+     *
+     * @param string $inputKey
+     * @return mixed|null
+     */
+    private function getDefaultValue(string $inputKey)
+    {
+        if (isset($this->defaultConfigValues[$inputKey])) {
+            return $this->defaultConfigValues[$inputKey];
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
index f8e5e7cdc4d70..216013ebfc8d9 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
@@ -48,6 +48,12 @@ public function testUnloginAction()
             $this->createPartialMock(\Magento\Framework\App\DeploymentConfig::class, ['isAvailable']);
         $deployConfigMock->expects($this->once())->method('isAvailable')->will($this->returnValue(true));
 
+        $sessionMock = $this->createPartialMock(
+            \Magento\Backend\Model\Auth\Session::class,
+            ['prolong', 'isSessionExists']
+        );
+        $sessionMock->expects($this->once())->method('isSessionExists')->will($this->returnValue(false));
+
         $stateMock = $this->createPartialMock(\Magento\Framework\App\State::class, ['setAreaCode']);
         $stateMock->expects($this->once())->method('setAreaCode');
 
@@ -57,6 +63,7 @@ public function testUnloginAction()
         $urlMock = $this->createMock(\Magento\Backend\Model\Url::class);
 
         $returnValueMap = [
+            [\Magento\Backend\Model\Auth\Session::class, $sessionMock],
             [\Magento\Framework\App\State::class, $stateMock],
             [\Magento\Backend\Model\Session\AdminConfig::class, $sessionConfigMock],
             [\Magento\Backend\Model\Url::class, $urlMock]
@@ -68,7 +75,6 @@ public function testUnloginAction()
             ->method('get')
             ->will($this->returnValueMap($returnValueMap));
 
-        $sessionMock = $this->createPartialMock(\Magento\Backend\Model\Auth\Session::class, ['prolong']);
         $this->objectManager->expects($this->once())
             ->method('create')
             ->will($this->returnValue($sessionMock));
@@ -87,4 +93,29 @@ public function testIndexAction()
         $viewModel = $controller->unloginAction();
         $this->assertInstanceOf(\Zend\View\Model\ViewModel::class, $viewModel);
     }
+
+    /**
+     * @covers \Magento\Setup\Controller\SystemConfig::prolongAction
+     */
+    public function testProlongActionWithExistingSession()
+    {
+        $this->objectManagerProvider->expects($this->once())->method('get')->will(
+            $this->returnValue($this->objectManager)
+        );
+        $deployConfigMock =
+            $this->createPartialMock(\Magento\Framework\App\DeploymentConfig::class, ['isAvailable']);
+        $deployConfigMock->expects($this->once())->method('isAvailable')->will($this->returnValue(true));
+        $sessionMock = $this->createPartialMock(
+            \Magento\Backend\Model\Auth\Session::class,
+            ['prolong', 'isSessionExists']
+        );
+        $sessionMock->expects($this->once())->method('isSessionExists')->will($this->returnValue(true));
+
+        $this->serviceManager->expects($this->once())->method('get')->will($this->returnValue($deployConfigMock));
+        $this->objectManager->expects($this->once())
+            ->method('get')
+            ->will($this->returnValue($sessionMock));
+        $controller = new Session($this->serviceManager, $this->objectManagerProvider);
+        $this->assertEquals(new \Zend\View\Model\JsonModel(['success' => true]), $controller->prolongAction());
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
new file mode 100644
index 0000000000000..1a46bddf5f21a
--- /dev/null
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Test\Unit\Model\ConfigOptionsList;
+
+use Magento\Setup\Model\ConfigOptionsList\Lock as LockConfigOptionsList;
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Setup\Option\SelectConfigOption;
+use Magento\Framework\Setup\Option\TextConfigOption;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class LockTest extends TestCase
+{
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var LockConfigOptionsList
+     */
+    private $lockConfigOptionsList;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->lockConfigOptionsList = new LockConfigOptionsList();
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetOptions()
+    {
+        $options = $this->lockConfigOptionsList->getOptions();
+        $this->assertSame(5, count($options));
+
+        $this->assertArrayHasKey(0, $options);
+        $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER, $options[0]->getName());
+
+        $this->assertArrayHasKey(1, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[1]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX, $options[1]->getName());
+
+        $this->assertArrayHasKey(2, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[2]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST, $options[2]->getName());
+
+        $this->assertArrayHasKey(3, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[3]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH, $options[3]->getName());
+
+        $this->assertArrayHasKey(4, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[4]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH, $options[4]->getName());
+    }
+
+    /**
+     * @param array $options
+     * @param array $expectedResult
+     * @dataProvider createConfigDataProvider
+     */
+    public function testCreateConfig(array $options, array $expectedResult)
+    {
+        $this->deploymentConfigMock->expects($this->any())
+            ->method('get')
+            ->willReturnArgument(1);
+        $data = $this->lockConfigOptionsList->createConfig($options, $this->deploymentConfigMock);
+        $this->assertInstanceOf(ConfigData::class, $data);
+        $this->assertTrue($data->isOverrideWhenSave());
+        $this->assertSame($expectedResult, $data->getData());
+    }
+
+    /**
+     * @return array
+     */
+    public function createConfigDataProvider(): array
+    {
+        return [
+            'Check default values' => [
+                'options' => [],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => null,
+                        ],
+                    ],
+                ],
+            ],
+            'Check default value for cache lock' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_CACHE,
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_CACHE,
+                    ],
+                ],
+            ],
+            'Check default value for zookeeper lock' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_ZOOKEEPER,
+                        'config' => [
+                            'host' => null,
+                            'path' => ZookeeperLock::DEFAULT_PATH,
+                        ],
+                    ],
+                ],
+            ],
+            'Check specific db lock options' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX => 'my_prefix'
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => 'my_prefix',
+                        ],
+                    ],
+                ],
+            ],
+            'Check specific zookeeper lock options' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST => '123.45.67.89:10',
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH => '/some/path',
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_ZOOKEEPER,
+                        'config' => [
+                            'host' => '123.45.67.89:10',
+                            'path' => '/some/path',
+                        ],
+                    ],
+                ],
+            ],
+            'Check specific file lock options' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_FILE,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH => '/my/path'
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_FILE,
+                        'config' => [
+                            'path' => '/my/path',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @param array $options
+     * @param array $expectedResult
+     * @dataProvider validateDataProvider
+     */
+    public function testValidate(array $options, array $expectedResult)
+    {
+        $this->deploymentConfigMock->expects($this->any())
+            ->method('get')
+            ->willReturnArgument(1);
+        $this->assertSame(
+            $expectedResult,
+            $this->lockConfigOptionsList->validate($options, $this->deploymentConfigMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function validateDataProvider(): array
+    {
+        return [
+            'Wrong lock provider' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => 'SomeProvider',
+                ],
+                'expectedResult' => [
+                    'The lock provider SomeProvider does not exist.',
+                ],
+            ],
+            'Empty host and path for Zookeeper' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST => '',
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH => '',
+                ],
+                'expectedResult' => extension_loaded('zookeeper')
+                    ? [
+                        'Zookeeper path needs to be a non-empty string.',
+                        'Zookeeper host is should be set.',
+                    ]
+                    : [
+                        'php extension Zookeeper is not installed.',
+                        'Zookeeper path needs to be a non-empty string.',
+                        'Zookeeper host is should be set.',
+                    ],
+            ],
+            'Empty path for File lock' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_FILE,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH => '',
+                ],
+                'expectedResult' => [
+                    'The path needs to be a non-empty string.',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
index d7f680309c9ef..a85b468cebc92 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Setup\Test\Unit\Model;
 
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Setup\Model\ConfigOptionsList\Lock;
 use Magento\Setup\Model\ConfigGenerator;
 use Magento\Setup\Model\ConfigOptionsList;
 use Magento\Setup\Validator\DbValidator;
@@ -82,7 +83,7 @@ public function testCreateOptions()
         $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);
         $this->generator->expects($this->once())->method('createCacheHostsConfig')->willReturn($configDataMock);
 
-        $configData = $this->object->createConfig([], $this->deploymentConfig);
+        $configData = $this->object->createConfig([Lock::INPUT_KEY_LOCK_PROVIDER => 'db'], $this->deploymentConfig);
         $this->assertGreaterThanOrEqual(6, count($configData));
     }
 
@@ -96,7 +97,7 @@ public function testCreateOptionsWithOptionalNull()
         $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);
         $this->generator->expects($this->once())->method('createCacheHostsConfig')->willReturn($configDataMock);
 
-        $configData = $this->object->createConfig([], $this->deploymentConfig);
+        $configData = $this->object->createConfig([Lock::INPUT_KEY_LOCK_PROVIDER => 'db'], $this->deploymentConfig);
         $this->assertGreaterThanOrEqual(6, count($configData));
     }
 
@@ -109,7 +110,8 @@ public function testValidateSuccess()
             ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'name',
             ConfigOptionsListConstants::INPUT_KEY_DB_HOST => 'host',
             ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'user',
-            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass'
+            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass',
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $this->prepareValidationMocks();
 
@@ -127,7 +129,8 @@ public function testValidateInvalidSessionHandler()
             ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'name',
             ConfigOptionsListConstants::INPUT_KEY_DB_HOST => 'host',
             ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'user',
-            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass'
+            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass',
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $this->prepareValidationMocks();
 
@@ -141,7 +144,8 @@ public function testValidateEmptyEncryptionKey()
     {
         $options = [
             ConfigOptionsListConstants::INPUT_KEY_SKIP_DB_VALIDATION => true,
-            ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => ''
+            ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => '',
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $this->assertEquals(
             ['Invalid encryption key. Encryption key must be 32 character string without any white space.'],
@@ -167,7 +171,8 @@ public function testValidateCacheHosts($hosts, $expectedError)
     {
         $options = [
             ConfigOptionsListConstants::INPUT_KEY_SKIP_DB_VALIDATION => true,
-            ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS => $hosts
+            ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS => $hosts,
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $result = $this->object->validate($options, $this->deploymentConfig);
         if ($expectedError) {