diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
index 8721b600ed396..c2379e9dff062 100644
--- a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
@@ -10,6 +10,10 @@
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 
 /**
  * @api
@@ -29,22 +33,30 @@ class Index extends AbstractDb
      */
     protected $metadataPool;
 
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
     /**
      * Index constructor.
      * @param Context $context
      * @param StoreManagerInterface $storeManager
      * @param MetadataPool $metadataPool
      * @param null $connectionName
+     * @param TableResolver|null $tableResolver
      */
     public function __construct(
         Context $context,
         StoreManagerInterface $storeManager,
         MetadataPool $metadataPool,
-        $connectionName = null
+        $connectionName = null,
+        TableResolver $tableResolver = null
     ) {
         parent::__construct($context, $connectionName);
         $this->storeManager = $storeManager;
         $this->metadataPool = $metadataPool;
+        $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
     }
 
     /**
@@ -116,8 +128,17 @@ public function getCategoryProductIndexData($storeId = null, $productIds = null)
     {
         $connection = $this->getConnection();
 
+        $catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $storeId);
+
+        $catalogCategoryProductTableName = $this->tableResolver->resolve(
+            AbstractAction::MAIN_INDEX_TABLE,
+            [
+                $catalogCategoryProductDimension
+            ]
+        );
+
         $select = $connection->select()->from(
-            [$this->getTable('catalog_category_product_index')],
+            [$catalogCategoryProductTableName],
             ['category_id', 'product_id', 'position', 'store_id']
         )->where(
             'store_id = ?',
diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
index d0f39b54c1492..3ae4451a2592f 100644
--- a/app/code/Magento/Backend/Block/Template.php
+++ b/app/code/Magento/Backend/Block/Template.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backend\Block;
 
 /**
@@ -17,10 +20,12 @@
  * Example:
  * <block name="my.block" class="Magento\Backend\Block\Template" template="My_Module::template.phtml" >
  *      <arguments>
- *          <argument name="viewModel" xsi:type="object">My\Module\ViewModel\Custom</argument>
+ *          <argument name="view_model" xsi:type="object">My\Module\ViewModel\Custom</argument>
  *      </arguments>
  * </block>
  *
+ * Your class object can then be accessed by doing $block->getViewModel()
+ *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @since 100.0.2
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
index 320713f8b57c4..a611e91f32f00 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
@@ -65,7 +65,7 @@ public function render(\Magento\Framework\DataObject $row)
      */
     protected function _getCheckboxHtml($value, $checked)
     {
-        $id = 'id_' . rand(0, 999);
+        $id = 'id_' . random_int(0, 999);
         $html = '<label class="data-grid-checkbox-cell-inner" for="'. $id .'">';
         $html .= '<input type="checkbox" name="' . $this->getColumn()->getName() . '" ';
         $html .= 'id="' . $id . '" data-role="select-row"';
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 6d950ae2c91ba..86a2f3b772d2a 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -136,7 +136,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Add Block Names to Hints</label>
+                    <label>Add Block Class Type to Hints</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
diff --git a/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php b/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php
index f68b7eca047f5..2a9923a333cef 100644
--- a/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php
+++ b/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php
@@ -66,6 +66,13 @@ public function __construct(
     public function beforeSave()
     {
         $value = $this->getValue();
+        if (!is_array($value)) {
+            try {
+                $value = $this->serializer->unserialize($value);
+            } catch (\InvalidArgumentException $e) {
+                $value = [];
+            }
+        }
         $result = [];
         foreach ($value as $data) {
             if (empty($data['country_id']) || empty($data['cc_types'])) {
diff --git a/app/code/Magento/Bundle/Model/Option/SaveAction.php b/app/code/Magento/Bundle/Model/Option/SaveAction.php
new file mode 100644
index 0000000000000..00c5b05d532f5
--- /dev/null
+++ b/app/code/Magento/Bundle/Model/Option/SaveAction.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\Option;
+
+use Magento\Bundle\Api\Data\OptionInterface;
+use Magento\Bundle\Model\ResourceModel\Option;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Bundle\Model\Product\Type;
+use Magento\Bundle\Api\ProductLinkManagementInterface;
+
+/**
+ * Encapsulates logic for saving a bundle option, including coalescing the parent product's data.
+ */
+class SaveAction
+{
+    /**
+     * @var Option
+     */
+    private $optionResource;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @var ProductLinkManagementInterface
+     */
+    private $linkManagement;
+
+    /**
+     * @param Option $optionResource
+     * @param MetadataPool $metadataPool
+     * @param Type $type
+     * @param ProductLinkManagementInterface $linkManagement
+     */
+    public function __construct(
+        Option $optionResource,
+        MetadataPool $metadataPool,
+        Type $type,
+        ProductLinkManagementInterface $linkManagement
+    ) {
+        $this->optionResource = $optionResource;
+        $this->metadataPool = $metadataPool;
+        $this->type = $type;
+        $this->linkManagement = $linkManagement;
+    }
+
+    /**
+     * Manage the logic of saving a bundle option, including the coalescence of its parent product data.
+     *
+     * @param ProductInterface $bundleProduct
+     * @param OptionInterface $option
+     * @return OptionInterface
+     * @throws CouldNotSaveException
+     * @throws \Exception
+     */
+    public function save(ProductInterface $bundleProduct, OptionInterface $option)
+    {
+        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+
+        $option->setStoreId($bundleProduct->getStoreId());
+        $parentId = $bundleProduct->getData($metadata->getLinkField());
+        $option->setParentId($parentId);
+
+        $optionId = $option->getOptionId();
+        $linksToAdd = [];
+        $optionCollection = $this->type->getOptionsCollection($bundleProduct);
+        $optionCollection->setIdFilter($option->getOptionId());
+        $optionCollection->setProductLinkFilter($parentId);
+
+        /** @var \Magento\Bundle\Model\Option $existingOption */
+        $existingOption = $optionCollection->getFirstItem();
+        if (!$optionId || $existingOption->getParentId() != $parentId) {
+            //If option ID is empty or existing option's parent ID is different
+            //we'd need a new ID for the option.
+            $option->setOptionId(null);
+            $option->setDefaultTitle($option->getTitle());
+            if (is_array($option->getProductLinks())) {
+                $linksToAdd = $option->getProductLinks();
+            }
+        } else {
+            if (!$existingOption->getOptionId()) {
+                throw new NoSuchEntityException(
+                    __("The option that was requested doesn't exist. Verify the entity and try again.")
+                );
+            }
+
+            $option->setData(array_merge($existingOption->getData(), $option->getData()));
+            $this->updateOptionSelection($bundleProduct, $option);
+        }
+
+        try {
+            $this->optionResource->save($option);
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(__("The option couldn't be saved."), $e);
+        }
+
+        /** @var \Magento\Bundle\Api\Data\LinkInterface $linkedProduct */
+        foreach ($linksToAdd as $linkedProduct) {
+            $this->linkManagement->addChild($bundleProduct, $option->getOptionId(), $linkedProduct);
+        }
+
+        $bundleProduct->setIsRelationsChanged(true);
+
+        return $option;
+    }
+
+    /**
+     * Update option selections
+     *
+     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param \Magento\Bundle\Api\Data\OptionInterface $option
+     * @return void
+     */
+    private function updateOptionSelection(ProductInterface $product, OptionInterface $option)
+    {
+        $optionId = $option->getOptionId();
+        $existingLinks = $this->linkManagement->getChildren($product->getSku(), $optionId);
+        $linksToAdd = [];
+        $linksToUpdate = [];
+        $linksToDelete = [];
+        if (is_array($option->getProductLinks())) {
+            $productLinks = $option->getProductLinks();
+            foreach ($productLinks as $productLink) {
+                if (!$productLink->getId() && !$productLink->getSelectionId()) {
+                    $linksToAdd[] = $productLink;
+                } else {
+                    $linksToUpdate[] = $productLink;
+                }
+            }
+            /** @var \Magento\Bundle\Api\Data\LinkInterface[] $linksToDelete */
+            $linksToDelete = $this->compareLinks($existingLinks, $linksToUpdate);
+        }
+        foreach ($linksToUpdate as $linkedProduct) {
+            $this->linkManagement->saveChild($product->getSku(), $linkedProduct);
+        }
+        foreach ($linksToDelete as $linkedProduct) {
+            $this->linkManagement->removeChild(
+                $product->getSku(),
+                $option->getOptionId(),
+                $linkedProduct->getSku()
+            );
+        }
+        foreach ($linksToAdd as $linkedProduct) {
+            $this->linkManagement->addChild($product, $option->getOptionId(), $linkedProduct);
+        }
+    }
+
+    /**
+     * Compute the difference between given arrays.
+     *
+     * @param \Magento\Bundle\Api\Data\LinkInterface[] $firstArray
+     * @param \Magento\Bundle\Api\Data\LinkInterface[] $secondArray
+     *
+     * @return array
+     */
+    private function compareLinks(array $firstArray, array $secondArray)
+    {
+        $result = [];
+
+        $firstArrayIds = [];
+        $firstArrayMap = [];
+
+        $secondArrayIds = [];
+
+        foreach ($firstArray as $item) {
+            $firstArrayIds[] = $item->getId();
+
+            $firstArrayMap[$item->getId()] = $item;
+        }
+
+        foreach ($secondArray as $item) {
+            $secondArrayIds[] = $item->getId();
+        }
+
+        foreach (array_diff($firstArrayIds, $secondArrayIds) as $id) {
+            $result[] = $firstArrayMap[$id];
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Bundle/Model/OptionRepository.php b/app/code/Magento/Bundle/Model/OptionRepository.php
index b5e5244a11fda..a70f4af56e989 100644
--- a/app/code/Magento/Bundle/Model/OptionRepository.php
+++ b/app/code/Magento/Bundle/Model/OptionRepository.php
@@ -7,14 +7,14 @@
 
 namespace Magento\Bundle\Model;
 
+use Magento\Bundle\Model\Option\SaveAction;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
+ * Repository for performing CRUD operations for a bundle product's options.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInterface
@@ -39,11 +39,6 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
      */
     protected $optionResource;
 
-    /**
-     * @var \Magento\Store\Model\StoreManager
-     */
-    protected $storeManager;
-
     /**
      * @var \Magento\Bundle\Api\ProductLinkManagementInterface
      */
@@ -54,53 +49,44 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
      */
     protected $productOptionList;
 
-    /**
-     * @var Product\LinksList
-     */
-    protected $linkList;
-
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
      */
     protected $dataObjectHelper;
 
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var SaveAction
      */
-    private $metadataPool;
+    private $optionSave;
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param Product\Type $type
      * @param \Magento\Bundle\Api\Data\OptionInterfaceFactory $optionFactory
      * @param \Magento\Bundle\Model\ResourceModel\Option $optionResource
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Bundle\Api\ProductLinkManagementInterface $linkManagement
      * @param Product\OptionList $productOptionList
-     * @param Product\LinksList $linkList
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @param SaveAction $optionSave
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Bundle\Model\Product\Type $type,
         \Magento\Bundle\Api\Data\OptionInterfaceFactory $optionFactory,
         \Magento\Bundle\Model\ResourceModel\Option $optionResource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Bundle\Api\ProductLinkManagementInterface $linkManagement,
         \Magento\Bundle\Model\Product\OptionList $productOptionList,
-        \Magento\Bundle\Model\Product\LinksList $linkList,
-        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
+        SaveAction $optionSave
     ) {
         $this->productRepository = $productRepository;
         $this->type = $type;
         $this->optionFactory = $optionFactory;
         $this->optionResource = $optionResource;
-        $this->storeManager = $storeManager;
         $this->linkManagement = $linkManagement;
         $this->productOptionList = $productOptionList;
-        $this->linkList = $linkList;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->optionSave = $optionSave;
     }
 
     /**
@@ -118,7 +104,7 @@ public function get($sku, $optionId)
             );
         }
 
-        $productLinks = $this->linkList->getItems($product, $optionId);
+        $productLinks = $this->linkManagement->getChildren($product->getSku(), $optionId);
 
         /** @var \Magento\Bundle\Api\Data\OptionInterface $option */
         $optionDataObject = $this->optionFactory->create();
@@ -177,7 +163,9 @@ public function deleteById($sku, $optionId)
         $product = $this->getProduct($sku);
         $optionCollection = $this->type->getOptionsCollection($product);
         $optionCollection->setIdFilter($optionId);
-        return $this->delete($optionCollection->getFirstItem());
+        $hasBeenDeleted = $this->delete($optionCollection->getFirstItem());
+
+        return $hasBeenDeleted;
     }
 
     /**
@@ -187,51 +175,12 @@ public function save(
         \Magento\Catalog\Api\Data\ProductInterface $product,
         \Magento\Bundle\Api\Data\OptionInterface $option
     ) {
-        $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-
-        $option->setStoreId($product->getStoreId());
-        $parentId = $product->getData($metadata->getLinkField());
-        $option->setParentId($parentId);
-
-        $optionId = $option->getOptionId();
-        $linksToAdd = [];
-        $optionCollection = $this->type->getOptionsCollection($product);
-        $optionCollection->setIdFilter($option->getOptionId());
-        $optionCollection->setProductLinkFilter($parentId);
-
-        /** @var \Magento\Bundle\Model\Option $existingOption */
-        $existingOption = $optionCollection->getFirstItem();
-        if (!$optionId || $existingOption->getParentId() != $parentId) {
-            //If option ID is empty or existing option's parent ID is different
-            //we'd need a new ID for the option.
-            $option->setOptionId(null);
-            $option->setDefaultTitle($option->getTitle());
-            if (is_array($option->getProductLinks())) {
-                $linksToAdd = $option->getProductLinks();
-            }
-        } else {
-            if (!$existingOption->getOptionId()) {
-                throw new NoSuchEntityException(
-                    __("The option that was requested doesn't exist. Verify the entity and try again.")
-                );
-            }
+        $savedOption = $this->optionSave->save($product, $option);
 
-            $option->setData(array_merge($existingOption->getData(), $option->getData()));
-            $this->updateOptionSelection($product, $option);
-        }
+        $productToSave = $this->productRepository->get($product->getSku());
+        $this->productRepository->save($productToSave);
 
-        try {
-            $this->optionResource->save($option);
-        } catch (\Exception $e) {
-            throw new CouldNotSaveException(__("The option couldn't be saved."), $e);
-        }
-
-        /** @var \Magento\Bundle\Api\Data\LinkInterface $linkedProduct */
-        foreach ($linksToAdd as $linkedProduct) {
-            $this->linkManagement->addChild($product, $option->getOptionId(), $linkedProduct);
-        }
-        $product->setIsRelationsChanged(true);
-        return $option->getOptionId();
+        return $savedOption->getOptionId();
     }
 
     /**
@@ -325,16 +274,4 @@ private function compareLinks(array $firstArray, array $secondArray)
 
         return $result;
     }
-
-    /**
-     * Get MetadataPool instance
-     * @return MetadataPool
-     */
-    private function getMetadataPool()
-    {
-        if (!$this->metadataPool) {
-            $this->metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
-        }
-        return $this->metadataPool;
-    }
 }
diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
index 8517cec6aff6d..e5fa688c7fece 100644
--- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php
+++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
@@ -6,6 +6,7 @@
 namespace Magento\Bundle\Model\Product;
 
 use Magento\Bundle\Api\Data\OptionInterface;
+use Magento\Bundle\Model\Option\SaveAction;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Bundle\Api\ProductOptionRepositoryInterface as OptionRepository;
 use Magento\Bundle\Api\ProductLinkManagementInterface;
@@ -33,19 +34,26 @@ class SaveHandler implements ExtensionInterface
      */
     private $metadataPool;
 
+    /**
+     * @var SaveAction
+     */
+    private $optionSave;
+
     /**
      * @param OptionRepository $optionRepository
      * @param ProductLinkManagementInterface $productLinkManagement
+     * @param SaveAction $optionSave
      * @param MetadataPool|null $metadataPool
      */
     public function __construct(
         OptionRepository $optionRepository,
         ProductLinkManagementInterface $productLinkManagement,
+        SaveAction $optionSave,
         MetadataPool $metadataPool = null
     ) {
         $this->optionRepository = $optionRepository;
         $this->productLinkManagement = $productLinkManagement;
-
+        $this->optionSave = $optionSave;
         $this->metadataPool = $metadataPool
             ?: ObjectManager::getInstance()->get(MetadataPool::class);
     }
@@ -103,7 +111,7 @@ public function execute($entity, $arguments = [])
         }
         //Saving active options.
         foreach ($options as $option) {
-            $this->optionRepository->save($entity, $option);
+            $this->optionSave->save($entity, $option);
         }
 
         $entity->setCopyFromView(false);
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php b/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
index 7549d402a57ff..b4a466b413af0 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
@@ -14,11 +14,6 @@
  */
 class OptionRepositoryTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $metadataPoolMock;
-
     /**
      * @var \Magento\Bundle\Model\OptionRepository
      */
@@ -67,12 +62,12 @@ class OptionRepositoryTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $linkListMock;
+    protected $dataObjectHelperMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Bundle\Model\Option\SaveAction|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $dataObjectHelperMock;
+    private $optionSaveActionMock;
 
     protected function setUp()
     {
@@ -94,24 +89,18 @@ protected function setUp()
         $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->linkManagementMock = $this->createMock(\Magento\Bundle\Api\ProductLinkManagementInterface::class);
         $this->optionListMock = $this->createMock(\Magento\Bundle\Model\Product\OptionList::class);
-        $this->linkListMock = $this->createMock(\Magento\Bundle\Model\Product\LinksList::class);
-        $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $this->optionSaveActionMock = $this->createMock(\Magento\Bundle\Model\Option\SaveAction::class);
 
         $this->model = new OptionRepository(
             $this->productRepositoryMock,
             $this->typeMock,
             $this->optionFactoryMock,
             $this->optionResourceMock,
-            $this->storeManagerMock,
             $this->linkManagementMock,
             $this->optionListMock,
-            $this->linkListMock,
-            $this->dataObjectHelperMock
+            $this->dataObjectHelperMock,
+            $this->optionSaveActionMock
         );
-        $refClass = new \ReflectionClass(OptionRepository::class);
-        $refProperty = $refClass->getProperty('metadataPool');
-        $refProperty->setAccessible(true);
-        $refProperty->setValue($this->model, $this->metadataPoolMock);
     }
 
     /**
@@ -174,7 +163,7 @@ public function testGet()
         $productMock->expects($this->once())
             ->method('getTypeId')
             ->willReturn(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE);
-        $productMock->expects($this->once())->method('getSku')->willReturn($productSku);
+        $productMock->expects($this->exactly(2))->method('getSku')->willReturn($productSku);
 
         $this->productRepositoryMock->expects($this->once())
             ->method('get')
@@ -194,7 +183,6 @@ public function testGet()
         $optionMock->expects($this->once())->method('getData')->willReturn($optionData);
 
         $linkMock = ['item'];
-        $this->linkListMock->expects($this->once())->method('getItems')->with($productMock, 100)->willReturn($linkMock);
 
         $newOptionMock = $this->createMock(\Magento\Bundle\Api\Data\OptionInterface::class);
         $this->dataObjectHelperMock->expects($this->once())
@@ -207,10 +195,10 @@ public function testGet()
             ->with($optionData['title'])
             ->willReturnSelf();
         $newOptionMock->expects($this->once())->method('setSku')->with()->willReturnSelf();
-        $newOptionMock->expects($this->once())
-            ->method('setProductLinks')
-            ->with($linkMock)
-            ->willReturnSelf();
+        $this->linkManagementMock->expects($this->once())
+            ->method('getChildren')
+            ->with($productSku, $optionId)
+            ->willReturn($linkMock);
 
         $this->optionFactoryMock->expects($this->once())->method('create')->willReturn($newOptionMock);
 
@@ -272,172 +260,67 @@ public function testDeleteById()
      */
     public function testSaveExistingOption()
     {
-        $productId = 1;
-
-        $storeId = 2;
         $optionId = 5;
-        $existingLinkToUpdateId = '23';
+
+        $productSku = 'sku';
 
         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $productMock->expects($this->once())->method('getData')->willReturn($productId);
-        $productMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
-        $optionCollectionMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->typeMock->expects($this->once())
-            ->method('getOptionsCollection')
-            ->with($productMock)
-            ->willReturn($optionCollectionMock);
-        $optionCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
+        $productMock->expects($this->once())->method('getSku')->willReturn($productSku);
 
         $optionMock = $this->createPartialMock(
             \Magento\Bundle\Model\Option::class,
             ['setStoreId', 'setParentId', 'getProductLinks', 'getOptionId', 'getResource']
         );
-        $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
 
-        $metadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadata::class);
-        $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
-
-        $this->metadataPoolMock->expects($this->once())->method('getMetadata')
-            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->willReturn($metadataMock);
         $optionMock->expects($this->atLeastOnce())->method('getOptionId')->willReturn($optionId);
 
-        $productLinkUpdate = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $productLinkUpdate->expects($this->any())->method('getId')->willReturn($existingLinkToUpdateId);
-        $productLinkNew = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $productLinkNew->expects($this->any())->method('getId')->willReturn(null);
-        $optionMock->expects($this->exactly(2))
-            ->method('getProductLinks')
-            ->willReturn([$productLinkUpdate, $productLinkNew]);
+        $this->optionSaveActionMock->expects($this->once())->method('save')->with($productMock, $optionMock)
+            ->willReturn($optionMock);
+
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($productSku)
+            ->willReturn($productMock);
 
-        $this->linkManagementMock->expects($this->exactly(2))
-            ->method('addChild')
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('save')
             ->with($productMock);
+
         $this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
     }
 
     public function testSaveNewOption()
     {
-        $productId = 1;
-        $productSku = 'bundle_sku';
-        $storeId = 2;
         $optionId = 5;
 
-        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $productMock->expects($this->once())->method('getData')->willReturn($productId);
-        $productMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
-        $productMock->expects($this->any())->method('getSku')->willReturn($productSku);
+        $productSku = 'sku';
 
-        $optionCollectionMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->typeMock->expects($this->once())
-            ->method('getOptionsCollection')
-            ->with($productMock)
-            ->willReturn($optionCollectionMock);
-        $optionCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
+        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $productMock->expects($this->once())->method('getSku')->willReturn($productSku);
 
         $optionMock = $this->createPartialMock(
             \Magento\Bundle\Model\Option::class,
-            [
-                'setStoreId',
-                'setParentId',
-                'getProductLinks',
-                'getOptionId',
-                'setOptionId',
-                'setDefaultTitle',
-                'getTitle',
-                'getResource'
-            ]
-        );
-        $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
-        $metadataMock = $this->createMock(
-            \Magento\Framework\EntityManager\EntityMetadata::class
+            ['setStoreId', 'setParentId', 'getProductLinks', 'getOptionId', 'getResource']
         );
-        $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
-
-        $this->metadataPoolMock->expects($this->once())->method('getMetadata')
-            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->willReturn($metadataMock);
-        $optionMock->method('getOptionId')
-            ->willReturn($optionId);
-
-        $productLink1 = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $productLink2 = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $optionMock->expects($this->exactly(2))
-            ->method('getProductLinks')
-            ->willReturn([$productLink1, $productLink2]);
-
-        $this->optionResourceMock->expects($this->once())->method('save')->with($optionMock)->willReturnSelf();
-        $this->linkManagementMock->expects($this->at(0))
-            ->method('addChild')
-            ->with($productMock, $optionId, $productLink1);
-        $this->linkManagementMock->expects($this->at(1))
-            ->method('addChild')
-            ->with($productMock, $optionId, $productLink2);
-        $this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
-    }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage The option couldn't be saved.
-     */
-    public function testSaveCanNotSave()
-    {
-        $productId = 1;
-        $productSku = 'bundle_sku';
-        $storeId = 2;
-        $optionId = 5;
+        $optionMock->expects($this->atLeastOnce())->method('getOptionId')->willReturn($optionId);
 
-        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $productMock->expects($this->once())->method('getData')->willReturn($productId);
-        $productMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
-        $productMock->expects($this->any())->method('getSku')->willReturn($productSku);
+        $this->optionSaveActionMock->expects($this->once())->method('save')->with($productMock, $optionMock)
+            ->willReturn($optionMock);
 
-        $optionCollectionMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->typeMock->expects($this->once())
-            ->method('getOptionsCollection')
-            ->with($productMock)
-            ->willReturn($optionCollectionMock);
-        $optionCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($productSku)
+            ->willReturn($productMock);
 
-        $optionMock = $this->createPartialMock(
-            \Magento\Bundle\Model\Option::class,
-            [
-                'setStoreId',
-                'setParentId',
-                'getProductLinks',
-                'getOptionId',
-                'setOptionId',
-                'setDefaultTitle',
-                'getTitle',
-                'getResource'
-            ]
-        );
-        $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
-        $metadataMock = $this->createMock(
-            \Magento\Framework\EntityManager\EntityMetadata::class
-        );
-        $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
-
-        $this->metadataPoolMock->expects($this->once())->method('getMetadata')
-            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->willReturn($metadataMock);
-        $optionMock->method('getOptionId')->willReturn($optionId);
-
-        $productLink1 = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $productLink2 = $this->createMock(\Magento\Bundle\Api\Data\LinkInterface::class);
-        $optionMock->expects($this->exactly(2))
-            ->method('getProductLinks')
-            ->willReturn([$productLink1, $productLink2]);
-
-        $this->optionResourceMock->expects($this->once())->method('save')->with($optionMock)
-            ->willThrowException($this->createMock(\Exception::class));
-        $this->model->save($productMock, $optionMock);
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('save')
+            ->with($productMock);
+        $this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
     }
 
     public function testGetList()
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index ee63d3400ade5..c1b255c762dbb 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -356,7 +356,7 @@ public function getIdentities()
      * Get post parameters
      *
      * @param Product $product
-     * @return string
+     * @return array
      */
     public function getAddToCartPostParams(Product $product)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 46080ab5c3330..c53691ecada24 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -689,7 +689,7 @@ public function getWidgetOptionsJson(array $customOptions = [])
             'limit' => ToolbarModel::LIMIT_PARAM_NAME,
             'modeDefault' => $defaultMode,
             'directionDefault' => $this->_direction ?: ProductList::DEFAULT_SORT_DIRECTION,
-            'orderDefault' => $this->_productListHelper->getDefaultSortField(),
+            'orderDefault' => $this->getOrderField(),
             'limitDefault' => $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
             'url' => $this->getPagerUrl(),
         ];
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
index 237168282afae..ee3a6d491e92f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
 
 use \Magento\Catalog\Model\Product;
@@ -28,14 +31,25 @@ class AttributeFilter
     public function prepareProductAttributes(Product $product, array $productData, array $useDefaults)
     {
         foreach ($productData as $attribute => $value) {
-            $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
-            if ($value === '' && $considerUseDefaultsAttribute) {
-                /** @var $product Product */
-                if ((bool)$product->getData($attribute) === (bool)$value) {
-                    unset($productData[$attribute]);
-                }
+            if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) {
+                unset($productData[$attribute]);
             }
         }
+
         return $productData;
     }
+
+    /**
+     * @param Product $product
+     * @param $useDefaults
+     * @param $attribute
+     * @param $value
+     * @return bool
+     */
+    private function isAttributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value) : bool
+    {
+        $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
+
+        return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute));
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index 3270416137b67..6a499883ac723 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -9,8 +9,8 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Model\Store;
@@ -42,6 +42,7 @@ abstract class AbstractAction
 
     /**
      * Suffix for table to show it is temporary
+     * @deprecated
      */
     const TEMPORARY_TABLE_SUFFIX = '_tmp';
 
@@ -106,6 +107,11 @@ abstract class AbstractAction
      */
     protected $metadataPool;
 
+    /**
+     * @var TableMaintainer
+     */
+    protected $tableMaintainer;
+
     /**
      * @var string
      * @since 101.0.0
@@ -121,15 +127,17 @@ abstract class AbstractAction
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Config $config
-     * @param QueryGenerator|null $queryGenerator
+     * @param QueryGenerator $queryGenerator
      * @param MetadataPool|null $metadataPool
+     * @param TableMaintainer|null $tableMaintainer
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Config $config,
         QueryGenerator $queryGenerator = null,
-        MetadataPool $metadataPool = null
+        MetadataPool $metadataPool = null,
+        TableMaintainer $tableMaintainer = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -137,6 +145,7 @@ public function __construct(
         $this->config = $config;
         $this->queryGenerator = $queryGenerator ?: ObjectManager::getInstance()->get(QueryGenerator::class);
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
     }
 
     /**
@@ -180,6 +189,7 @@ protected function getTable($table)
      * The name is switched between 'catalog_category_product_index' and 'catalog_category_product_index_replica'
      *
      * @return string
+     * @deprecated
      */
     protected function getMainTable()
     {
@@ -190,6 +200,7 @@ protected function getMainTable()
      * Return temporary index table name
      *
      * @return string
+     * @deprecated
      */
     protected function getMainTmpTable()
     {
@@ -198,6 +209,19 @@ protected function getMainTmpTable()
             : $this->getMainTable();
     }
 
+    /**
+     * Return index table name
+     *
+     * @param int $storeId
+     * @return string
+     */
+    protected function getIndexTable($storeId)
+    {
+        return $this->useTempTable
+            ? $this->tableMaintainer->getMainReplicaTable($storeId)
+            : $this->tableMaintainer->getMainTable($storeId);
+    }
+
     /**
      * Return category path by id
      *
@@ -319,7 +343,7 @@ protected function getNonAnchorCategoriesSelect(Store $store)
     }
 
     /**
-     * Add filtering by child products to select.
+     * Add filtering by child products to select
      *
      * It's used for correct handling of composite products.
      * This method makes assumption that select already joins `catalog_product_entity` as `cpe`.
@@ -422,7 +446,7 @@ protected function reindexNonAnchorCategories(Store $store)
             $this->connection->query(
                 $this->connection->insertFromSelect(
                     $select,
-                    $this->getMainTmpTable(),
+                    $this->getIndexTable($store->getId()),
                     ['category_id', 'product_id', 'position', 'is_parent', 'store_id', 'visibility'],
                     \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
                 )
@@ -573,7 +597,7 @@ protected function getTemporaryTreeIndexTableName()
         if (empty($this->tempTreeIndexTableName)) {
             $this->tempTreeIndexTableName = $this->connection->getTableName('temp_catalog_category_tree_index')
                 . '_'
-                . substr(md5(time() . rand(0, 999999999)), 0, 8);
+                . substr(md5(time() . random_int(0, 999999999)), 0, 8);
         }
 
         return $this->tempTreeIndexTableName;
@@ -612,6 +636,12 @@ protected function makeTempCategoryTreeIndex()
             ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_PRIMARY]
         );
 
+        $temporaryTable->addIndex(
+            'child_id',
+            ['child_id'],
+            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
+        );
+
         // Drop the temporary table in case it already exists on this (persistent?) connection.
         $this->connection->dropTemporaryTable($temporaryName);
         $this->connection->createTemporaryTable($temporaryTable);
@@ -629,25 +659,30 @@ protected function makeTempCategoryTreeIndex()
      */
     protected function fillTempCategoryTreeIndex($temporaryName)
     {
-        // This finds all children (cc2) that descend from a parent (cc) by path.
-        // For example, cc.path may be '1/2', and cc2.path may be '1/2/3/4/5'.
-        $temporarySelect = $this->connection->select()->from(
-            ['cc' => $this->getTable('catalog_category_entity')],
-            ['parent_id' => 'entity_id']
-        )->joinInner(
-            ['cc2' => $this->getTable('catalog_category_entity')],
-            'cc2.path LIKE ' . $this->connection->getConcatSql(
-                [$this->connection->quoteIdentifier('cc.path'), $this->connection->quote('/%')]
-            ),
-            ['child_id' => 'entity_id']
+        $selects = $this->prepareSelectsByRange(
+            $this->connection->select()
+                ->from(
+                    ['c' => $this->getTable('catalog_category_entity')],
+                    ['entity_id', 'path']
+                ),
+            'entity_id'
         );
 
-        $this->connection->query(
-            $temporarySelect->insertFromSelect(
-                $temporaryName,
-                ['parent_id', 'child_id']
-            )
-        );
+        foreach ($selects as $select) {
+            $values = [];
+
+            foreach ($this->connection->fetchAll($select) as $category) {
+                foreach (explode('/', $category['path']) as $parentId) {
+                    if ($parentId !== $category['entity_id']) {
+                        $values[] = [$parentId, $category['entity_id']];
+                    }
+                }
+            }
+
+            if (count($values) > 0) {
+                $this->connection->insertArray($temporaryName, ['parent_id', 'child_id'], $values);
+            }
+        }
     }
 
     /**
@@ -678,7 +713,7 @@ protected function reindexAnchorCategories(Store $store)
             $this->connection->query(
                 $this->connection->insertFromSelect(
                     $select,
-                    $this->getMainTmpTable(),
+                    $this->getIndexTable($store->getId()),
                     ['category_id', 'product_id', 'position', 'is_parent', 'store_id', 'visibility'],
                     \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
                 )
@@ -804,7 +839,7 @@ protected function reindexRootCategory(Store $store)
                 $this->connection->query(
                     $this->connection->insertFromSelect(
                         $select,
-                        $this->getMainTmpTable(),
+                        $this->getIndexTable($store->getId()),
                         ['category_id', 'product_id', 'position', 'is_parent', 'store_id', 'visibility'],
                         \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
                     )
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 cde186a7e44af..09dbed350c5e4 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
@@ -88,18 +88,35 @@ public function __construct(
     }
 
     /**
-     *
-     * Clear the table we'll be writing de-normalized data into
-     * to prevent archived data getting in the way of actual data.
-     *
      * @return void
      */
-    private function clearCurrentTable()
+    private function createTables()
     {
-        $this->connection->delete(
-            $this->activeTableSwitcher
-                ->getAdditionalTableName($this->getMainTable())
-        );
+        foreach ($this->storeManager->getStores() as $store) {
+            $this->tableMaintainer->createTablesForStore($store->getId());
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function clearReplicaTables()
+    {
+        foreach ($this->storeManager->getStores() as $store) {
+            $this->connection->truncateTable($this->tableMaintainer->getMainReplicaTable($store->getId()));
+        }
+    }
+
+    /**
+     * @return void
+     */
+    private function switchTables()
+    {
+        $tablesToSwitch = [];
+        foreach ($this->storeManager->getStores() as $store) {
+            $tablesToSwitch[] = $this->tableMaintainer->getMainTable($store->getId());
+        }
+        $this->activeTableSwitcher->switchTable($this->connection, $tablesToSwitch);
     }
 
     /**
@@ -109,22 +126,26 @@ private function clearCurrentTable()
      */
     public function execute()
     {
-        $this->clearCurrentTable();
+        $this->createTables();
+        $this->clearReplicaTables();
         $this->reindex();
-        $this->activeTableSwitcher->switchTable($this->connection, [$this->getMainTable()]);
+        $this->switchTables();
         return $this;
     }
 
     /**
-     * Publish data from tmp to index
+     * Publish data from tmp to replica table
      *
+     * @param \Magento\Store\Model\Store $store
      * @return void
      */
-    protected function publishData()
+    private function publishData($store)
     {
-        $select = $this->connection->select()->from($this->getMainTmpTable());
-        $columns = array_keys($this->connection->describeTable($this->getMainTable()));
-        $tableName = $this->activeTableSwitcher->getAdditionalTableName($this->getMainTable());
+        $select = $this->connection->select()->from($this->tableMaintainer->getMainTmpTable($store->getId()));
+        $columns = array_keys(
+            $this->connection->describeTable($this->tableMaintainer->getMainReplicaTable($store->getId()))
+        );
+        $tableName = $this->tableMaintainer->getMainReplicaTable($store->getId());
 
         $this->connection->query(
             $this->connection->insertFromSelect(
@@ -136,23 +157,13 @@ protected function publishData()
         );
     }
 
-    /**
-     * Clear all index data
-     *
-     * @return void
-     */
-    protected function clearTmpData()
-    {
-        $this->connection->delete($this->getMainTmpTable());
-    }
-
     /**
      * {@inheritdoc}
      */
     protected function reindexRootCategory(\Magento\Store\Model\Store $store)
     {
         if ($this->isIndexRootCategoryNeeded()) {
-            $this->reindexCategoriesBySelect($this->getAllProducts($store), 'cp.entity_id IN (?)');
+            $this->reindexCategoriesBySelect($this->getAllProducts($store), 'cp.entity_id IN (?)', $store);
         }
     }
 
@@ -164,7 +175,7 @@ protected function reindexRootCategory(\Magento\Store\Model\Store $store)
      */
     protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
     {
-        $this->reindexCategoriesBySelect($this->getAnchorCategoriesSelect($store), 'ccp.product_id IN (?)');
+        $this->reindexCategoriesBySelect($this->getAnchorCategoriesSelect($store), 'ccp.product_id IN (?)', $store);
     }
 
     /**
@@ -175,7 +186,7 @@ protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
      */
     protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
     {
-        $this->reindexCategoriesBySelect($this->getNonAnchorCategoriesSelect($store), 'ccp.product_id IN (?)');
+        $this->reindexCategoriesBySelect($this->getNonAnchorCategoriesSelect($store), 'ccp.product_id IN (?)', $store);
     }
 
     /**
@@ -183,12 +194,17 @@ protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
      *
      * @param \Magento\Framework\DB\Select $basicSelect
      * @param string $whereCondition
+     * @param \Magento\Store\Model\Store $store
      * @return void
      */
-    private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSelect, $whereCondition)
+    private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSelect, $whereCondition, $store)
     {
+        $this->tableMaintainer->createMainTmpTable($store->getId());
+
         $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-        $columns = array_keys($this->connection->describeTable($this->getMainTmpTable()));
+        $columns = array_keys(
+            $this->connection->describeTable($this->tableMaintainer->getMainTmpTable($store->getId()))
+        );
         $this->batchSizeManagement->ensureBatchSize($this->connection, $this->batchRowsCount);
         $batches = $this->batchProvider->getBatches(
             $this->connection,
@@ -197,7 +213,7 @@ private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSe
             $this->batchRowsCount
         );
         foreach ($batches as $batch) {
-            $this->clearTmpData();
+            $this->connection->delete($this->tableMaintainer->getMainTmpTable($store->getId()));
             $resultSelect = clone $basicSelect;
             $select = $this->connection->select();
             $select->distinct(true);
@@ -207,12 +223,12 @@ private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSe
             $this->connection->query(
                 $this->connection->insertFromSelect(
                     $resultSelect,
-                    $this->getMainTmpTable(),
+                    $this->tableMaintainer->getMainTmpTable($store->getId()),
                     $columns,
                     \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
                 )
             );
-            $this->publishData();
+            $this->publishData($store);
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
index 248ec970d2250..3bd4910767587 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
@@ -36,17 +36,16 @@ public function execute(array $entityIds = [], $useTempTable = false)
     /**
      * Return array of all category root IDs + tree root ID
      *
-     * @return int[]
+     * @param \Magento\Store\Model\Store $store
+     * @return int
      */
-    protected function getRootCategoryIds()
+    private function getRootCategoryId($store)
     {
-        $rootIds = [\Magento\Catalog\Model\Category::TREE_ROOT_ID];
-        foreach ($this->storeManager->getStores() as $store) {
-            if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
-                $rootIds[] = $store->getRootCategoryId();
-            }
+        $rootId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
+        if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
+            $rootId = $store->getRootCategoryId();
         }
-        return $rootIds;
+        return $rootId;
     }
 
     /**
@@ -54,10 +53,15 @@ protected function getRootCategoryIds()
      *
      * @return void
      */
-    protected function removeEntries()
+    private function removeEntries()
     {
-        $removalCategoryIds = array_diff($this->limitationByCategories, $this->getRootCategoryIds());
-        $this->connection->delete($this->getMainTable(), ['category_id IN (?)' => $removalCategoryIds]);
+        foreach ($this->storeManager->getStores() as $store) {
+            $removalCategoryIds = array_diff($this->limitationByCategories, [$this->getRootCategoryId($store)]);
+            $this->connection->delete(
+                $this->getIndexTable($store->getId()),
+                ['category_id IN (?)' => $removalCategoryIds]
+            );
+        }
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
index 2ee46b3a6096b..9f4e19bf95a8d 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Catalog\Model\Indexer\Category\Product;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 class StoreGroup
 {
@@ -22,12 +23,21 @@ class StoreGroup
      */
     protected $indexerRegistry;
 
+    /**
+     * @var TableMaintainer
+     */
+    protected $tableMaintainer;
+
     /**
      * @param IndexerRegistry $indexerRegistry
+     * @param TableMaintainer $tableMaintainer
      */
-    public function __construct(IndexerRegistry $indexerRegistry)
-    {
+    public function __construct(
+        IndexerRegistry $indexerRegistry,
+        TableMaintainer $tableMaintainer
+    ) {
         $this->indexerRegistry = $indexerRegistry;
+        $this->tableMaintainer = $tableMaintainer;
     }
 
     /**
@@ -73,4 +83,22 @@ protected function validate(AbstractModel $group)
         return ($group->dataHasChangedFor('website_id') || $group->dataHasChangedFor('root_category_id'))
                && !$group->isObjectNew();
     }
+
+    /**
+     * Delete catalog_category_product indexer tables for deleted store group
+     *
+     * @param AbstractDb $subject
+     * @param AbstractDb $objectResource
+     * @param AbstractModel $storeGroup
+     *
+     * @return AbstractDb
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDelete(AbstractDb $subject, AbstractDb $objectResource, AbstractModel $storeGroup)
+    {
+        foreach ($storeGroup->getStores() as $store) {
+            $this->tableMaintainer->dropTablesForStore($store->getId());
+        }
+        return $objectResource;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
index f49b685ba6f7f..114d2a94f5b35 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
 
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\AbstractModel;
+
 class StoreView extends StoreGroup
 {
     /**
@@ -17,4 +20,38 @@ protected function validate(\Magento\Framework\Model\AbstractModel $store)
     {
         return $store->isObjectNew() || $store->dataHasChangedFor('group_id');
     }
+
+    /**
+     * Invalidate catalog_category_product indexer
+     *
+     * @param AbstractDb $subject
+     * @param AbstractDb $objectResource
+     * @param AbstractModel $store
+     *
+     * @return AbstractDb
+     */
+    public function afterSave(AbstractDb $subject, AbstractDb $objectResource, AbstractModel $store = null)
+    {
+        if ($store->isObjectNew()) {
+            $this->tableMaintainer->createTablesForStore($store->getId());
+        }
+
+        return parent::afterSave($subject, $objectResource);
+    }
+
+    /**
+     * Delete catalog_category_product indexer table for deleted store
+     *
+     * @param AbstractDb $subject
+     * @param AbstractDb $objectResource
+     * @param AbstractModel $store
+     *
+     * @return AbstractDb
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDelete(AbstractDb $subject, AbstractDb $objectResource, AbstractModel $store)
+    {
+        $this->tableMaintainer->dropTablesForStore($store->getId());
+        return $objectResource;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php
new file mode 100644
index 0000000000000..936e6163cbcc5
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+use Magento\Framework\Search\Request\Dimension;
+
+/**
+ * Class that replace catalog_category_product_index table name on the table name segmented per store
+ */
+class TableResolver
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var IndexScopeResolver
+     */
+    private $tableResolver;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param IndexScopeResolver $tableResolver
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        IndexScopeResolver $tableResolver
+    ) {
+        $this->storeManager = $storeManager;
+        $this->tableResolver = $tableResolver;
+    }
+
+    /**
+     * Replacing catalog_category_product_index table name on the table name segmented per store
+     *
+     * @param ResourceConnection $subject
+     * @param string $result
+     * @param string|string[] $modelEntity
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     *
+     * @return string
+     */
+    public function afterGetTableName(
+        \Magento\Framework\App\ResourceConnection $subject,
+        string $result,
+        $modelEntity
+    ) {
+        if (!is_array($modelEntity) && $modelEntity === AbstractAction::MAIN_INDEX_TABLE) {
+            $catalogCategoryProductDimension = new Dimension(
+                \Magento\Store\Model\Store::ENTITY,
+                $this->storeManager->getStore()->getId()
+            );
+
+            $tableName = $this->tableResolver->resolve(
+                AbstractAction::MAIN_INDEX_TABLE,
+                [
+                    $catalogCategoryProductDimension
+                ]
+            );
+            return $tableName;
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/Website.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/Website.php
new file mode 100644
index 0000000000000..387a8085310e4
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/Website.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+
+class Website
+{
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * @param TableMaintainer $tableMaintainer
+     */
+    public function __construct(
+        TableMaintainer $tableMaintainer
+    ) {
+        $this->tableMaintainer = $tableMaintainer;
+    }
+
+    /**
+     * Delete catalog_category_product indexer tables for deleted website
+     *
+     * @param AbstractDb $subject
+     * @param AbstractDb $objectResource
+     * @param AbstractModel $website
+     *
+     * @return AbstractDb
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDelete(AbstractDb $subject, AbstractDb $objectResource, AbstractModel $website)
+    {
+        foreach ($website->getStoreIds() as $storeId) {
+            $this->tableMaintainer->dropTablesForStore($storeId);
+        }
+        return $objectResource;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php
new file mode 100644
index 0000000000000..d2f8925d09a7b
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+namespace Magento\Catalog\Model\Indexer\Category\Product;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
+
+class TableMaintainer
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * Catalog tmp category index table name
+     */
+    private $tmpTableSuffix = '_tmp';
+
+    /**
+     * Catalog tmp category index table name
+     */
+    private $additionalTableSuffix = '_replica';
+
+    /**
+     * @var string[]
+     */
+    private $mainTmpTable;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param TableResolver $tableResolver
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        TableResolver $tableResolver
+    ) {
+        $this->resource = $resource;
+        $this->tableResolver = $tableResolver;
+    }
+
+    /**
+     * Get connection
+     *
+     * @return AdapterInterface
+     */
+    private function getConnection()
+    {
+        if (!isset($this->connection)) {
+            $this->connection = $this->resource->getConnection();
+        }
+        return $this->connection;
+    }
+
+    /**
+     * Return validated table name
+     *
+     * @param string|string[] $table
+     * @return string
+     */
+    private function getTable($table)
+    {
+        return $this->resource->getTableName($table);
+    }
+
+    /**
+     * Create table based on main table
+     *
+     * @param string $mainTableName
+     * @param string $newTableName
+     *
+     * @return void
+     */
+    private function createTable($mainTableName, $newTableName)
+    {
+        if (!$this->getConnection()->isTableExists($newTableName)) {
+            $this->getConnection()->createTable(
+                $this->getConnection()->createTableByDdl($mainTableName, $newTableName)
+            );
+        }
+    }
+
+    /**
+     * Drop table
+     *
+     * @param string $tableName
+     *
+     * @return void
+     */
+    private function dropTable($tableName)
+    {
+        if ($this->getConnection()->isTableExists($tableName)) {
+            $this->getConnection()->dropTable($tableName);
+        }
+    }
+
+    /**
+     * Return main index table name
+     *
+     * @param $storeId
+     *
+     * @return string
+     */
+    public function getMainTable(int $storeId)
+    {
+        $catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $storeId);
+
+        return $this->tableResolver->resolve(AbstractAction::MAIN_INDEX_TABLE, [$catalogCategoryProductDimension]);
+    }
+
+    /**
+     * Create main and replica index tables for store
+     *
+     * @param $storeId
+     *
+     * @return void
+     */
+    public function createTablesForStore(int $storeId)
+    {
+        $mainTableName = $this->getMainTable($storeId);
+        //Create index table for store based on on main replica table
+        //Using main replica table is necessary for backward capability and TableResolver plugin work
+        $this->createTable(
+            $this->getTable(AbstractAction::MAIN_INDEX_TABLE . $this->additionalTableSuffix),
+            $mainTableName
+        );
+
+        $mainReplicaTableName = $this->getMainTable($storeId) . $this->additionalTableSuffix;
+        //Create replica table for store based on main replica table
+        $this->createTable(
+            $this->getTable(AbstractAction::MAIN_INDEX_TABLE . $this->additionalTableSuffix),
+            $mainReplicaTableName
+        );
+    }
+
+    /**
+     * Drop main and replica index tables for store
+     *
+     * @param $storeId
+     *
+     * @return void
+     */
+    public function dropTablesForStore(int $storeId)
+    {
+        $mainTableName = $this->getMainTable($storeId);
+        $this->dropTable($mainTableName);
+
+        $mainReplicaTableName = $this->getMainTable($storeId) . $this->additionalTableSuffix;
+        $this->dropTable($mainReplicaTableName);
+    }
+
+    /**
+     * Return replica index table name
+     *
+     * @param $storeId
+     *
+     * @return string
+     */
+    public function getMainReplicaTable(int $storeId)
+    {
+        return $this->getMainTable($storeId) . $this->additionalTableSuffix;
+    }
+
+    /**
+     * Create temporary index table for store
+     *
+     * @param $storeId
+     *
+     * @return void
+     */
+    public function createMainTmpTable(int $storeId)
+    {
+        if (!isset($this->mainTmpTable[$storeId])) {
+            $originTableName = $this->getMainTable($storeId);
+            $temporaryTableName = $this->getMainTable($storeId) . $this->tmpTableSuffix;
+            $this->getConnection()->createTemporaryTableLike($temporaryTableName, $originTableName, true);
+            $this->mainTmpTable[$storeId] = $temporaryTableName;
+        }
+    }
+
+    /**
+     * Return temporary index table name
+     *
+     * @param $storeId
+     *
+     * @return string
+     */
+    public function getMainTmpTable(int $storeId)
+    {
+        return $this->mainTmpTable[$storeId];
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
index b67660a24ef88..182f04de4ab0e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
@@ -6,12 +6,17 @@
 namespace Magento\Catalog\Model\Indexer\Product\Category\Action;
 
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Config;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
 use Magento\Framework\Indexer\CacheContext;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Reindex products categories.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
@@ -29,32 +34,31 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
     private $cacheContext;
 
     /**
-     * @var \Magento\Framework\Event\ManagerInterface|null
+     * @var EventManagerInterface|null
      */
     private $eventManager;
 
     /**
-     * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Catalog\Model\Config $config
-     * @param \Magento\Framework\DB\Query\Generator|null $queryGenerator
-     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
+     * @param ResourceConnection $resource
+     * @param StoreManagerInterface $storeManager
+     * @param Config $config
+     * @param QueryGenerator|null $queryGenerator
+     * @param MetadataPool|null $metadataPool
      * @param CacheContext|null $cacheContext
-     * @param \Magento\Framework\Event\ManagerInterface|null $eventManager
+     * @param EventManagerInterface|null $eventManager
      */
     public function __construct(
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Catalog\Model\Config $config,
-        \Magento\Framework\DB\Query\Generator $queryGenerator = null,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
+        ResourceConnection $resource,
+        StoreManagerInterface $storeManager,
+        Config $config,
+        QueryGenerator $queryGenerator = null,
+        MetadataPool $metadataPool = null,
         CacheContext $cacheContext = null,
-        \Magento\Framework\Event\ManagerInterface $eventManager = null
+        EventManagerInterface $eventManager = null
     ) {
         parent::__construct($resource, $storeManager, $config, $queryGenerator, $metadataPool);
         $this->cacheContext = $cacheContext ?: ObjectManager::getInstance()->get(CacheContext::class);
-        $this->eventManager = $eventManager ?:
-            ObjectManager::getInstance()->get(\Magento\Framework\Event\ManagerInterface::class);
+        $this->eventManager = $eventManager ?: ObjectManager::getInstance()->get(EventManagerInterface::class);
     }
 
     /**
@@ -152,10 +156,12 @@ private function registerCategories(array $categoryIds)
      */
     protected function removeEntries()
     {
-        $this->connection->delete(
-            $this->getMainTable(),
-            ['product_id IN (?)' => $this->limitationByProducts]
-        );
+        foreach ($this->storeManager->getStores() as $store) {
+            $this->connection->delete(
+                $this->getIndexTable($store->getId()),
+                ['product_id IN (?)' => $this->limitationByProducts]
+            );
+        };
     }
 
     /**
@@ -167,7 +173,6 @@ protected function removeEntries()
     protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
         $select = parent::getNonAnchorCategoriesSelect($store);
-
         return $select->where('ccp.product_id IN (?) OR relation.child_id IN (?)', $this->limitationByProducts);
     }
 
@@ -206,19 +211,24 @@ protected function isRangingNeeded()
     }
 
     /**
-     * Returns a list of category ids which are assigned to product ids in the index.
+     * Returns a list of category ids which are assigned to product ids in the index
      *
-     * @param array $productIds
      * @return \Magento\Framework\Indexer\CacheContext
      */
     private function getCategoryIdsFromIndex(array $productIds)
     {
-        $categoryIds = $this->connection->fetchCol(
-            $this->connection->select()
-                ->from($this->getMainTable(), ['category_id'])
-                ->where('product_id IN (?)', $productIds)
-                ->distinct()
-        );
+        $categoryIds = [];
+        foreach ($this->storeManager->getStores() as $store) {
+            $categoryIds = array_merge(
+                $categoryIds,
+                $this->connection->fetchCol(
+                    $this->connection->select()
+                        ->from($this->getIndexTable($store->getId()), ['category_id'])
+                        ->where('product_id IN (?)', $productIds)
+                        ->distinct()
+                )
+            );
+        };
         $parentCategories = $categoryIds;
         foreach ($categoryIds as $categoryId) {
             $parentIds = explode('/', $this->getPathFromCategoryId($categoryId));
diff --git a/app/code/Magento/Catalog/Model/ProductCategoryList.php b/app/code/Magento/Catalog/Model/ProductCategoryList.php
index ae875453be938..5bbae772d5c2b 100644
--- a/app/code/Magento/Catalog/Model/ProductCategoryList.php
+++ b/app/code/Magento/Catalog/Model/ProductCategoryList.php
@@ -5,9 +5,11 @@
  */
 namespace Magento\Catalog\Model;
 
-use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Sql\UnionExpression;
+use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 /**
  * Provides info about product categories.
@@ -29,16 +31,32 @@ class ProductCategoryList
      */
     private $category;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
     /**
      * @param ResourceModel\Product $productResource
      * @param ResourceModel\Category $category
+     * @param StoreManagerInterface $storeManager
+     * @param TableMaintainer|null $tableMaintainer
      */
     public function __construct(
         ResourceModel\Product $productResource,
-        ResourceModel\Category $category
+        ResourceModel\Category $category,
+        StoreManagerInterface $storeManager = null,
+        TableMaintainer $tableMaintainer = null
     ) {
         $this->productResource = $productResource;
         $this->category = $category;
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -50,14 +68,15 @@ public function __construct(
     public function getCategoryIds($productId)
     {
         if (!isset($this->categoryIdList[$productId])) {
+            $unionTables[] = $this->getCategorySelect($productId, $this->category->getCategoryProductTable());
+            foreach ($this->storeManager->getStores() as $store) {
+                $unionTables[] = $this->getCategorySelect(
+                    $productId,
+                    $this->tableMaintainer->getMainTable($store->getId())
+                );
+            }
             $unionSelect = new UnionExpression(
-                [
-                    $this->getCategorySelect($productId, $this->category->getCategoryProductTable()),
-                    $this->getCategorySelect(
-                        $productId,
-                        $this->productResource->getTable(AbstractAction::MAIN_INDEX_TABLE)
-                    )
-                ],
+                $unionTables,
                 Select::SQL_UNION_ALL
             );
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
index 81e9473e053b6..d71ec23881982 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
 use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 /**
  * Product entity resource model
@@ -83,6 +84,11 @@ class Product extends AbstractResource
      */
     private $productCategoryLink;
 
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -94,6 +100,7 @@ class Product extends AbstractResource
      * @param \Magento\Eav\Model\Entity\TypeFactory $typeFactory
      * @param \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes
      * @param array $data
+     * @param TableMaintainer|null $tableMaintainer
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -107,7 +114,8 @@ public function __construct(
         \Magento\Eav\Model\Entity\Attribute\SetFactory $setFactory,
         \Magento\Eav\Model\Entity\TypeFactory $typeFactory,
         \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes,
-        $data = []
+        $data = [],
+        TableMaintainer $tableMaintainer = null
     ) {
         $this->_categoryCollectionFactory = $categoryCollectionFactory;
         $this->_catalogCategory = $catalogCategory;
@@ -122,6 +130,7 @@ public function __construct(
             $data
         );
         $this->connectionName  = 'catalog';
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
     }
 
     /**
@@ -366,22 +375,42 @@ public function getAvailableInCategories($object)
         // fetching all parent IDs, including those are higher on the tree
         $entityId = (int)$object->getEntityId();
         if (!isset($this->availableCategoryIdsCache[$entityId])) {
-            $this->availableCategoryIdsCache[$entityId] = $this->getConnection()->fetchCol(
-                $this->getConnection()->select()->distinct()->from(
-                    $this->getTable('catalog_category_product_index'),
-                    ['category_id']
-                )->where(
-                    'product_id = ? AND is_parent = 1',
-                    $entityId
-                )->where(
-                    'visibility != ?',
-                    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE
-                )
+            foreach ($this->_storeManager->getStores() as $store) {
+                $unionTables[] = $this->getAvailableInCategoriesSelect(
+                    $entityId,
+                    $this->tableMaintainer->getMainTable($store->getId())
+                );
+            }
+            $unionSelect = new \Magento\Framework\DB\Sql\UnionExpression(
+                $unionTables,
+                \Magento\Framework\DB\Select::SQL_UNION_ALL
             );
+            $this->availableCategoryIdsCache[$entityId] = array_unique($this->getConnection()->fetchCol($unionSelect));
         }
         return $this->availableCategoryIdsCache[$entityId];
     }
 
+    /**
+     * Returns DB select for available categories.
+     *
+     * @param int $entityId
+     * @param string $tableName
+     * @return \Magento\Framework\DB\Select
+     */
+    private function getAvailableInCategoriesSelect($entityId, $tableName)
+    {
+        return $this->getConnection()->select()->distinct()->from(
+            $tableName,
+            ['category_id']
+        )->where(
+            'product_id = ? AND is_parent = 1',
+            $entityId
+        )->where(
+            'visibility != ?',
+            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE
+        );
+    }
+
     /**
      * Get default attribute source model
      *
@@ -402,7 +431,7 @@ public function getDefaultAttributeSourceModel()
     public function canBeShowInCategory($product, $categoryId)
     {
         $select = $this->getConnection()->select()->from(
-            $this->getTable('catalog_category_product_index'),
+            $this->tableMaintainer->getMainTable($product->getStoreId()),
             'product_id'
         )->where(
             'product_id = ?',
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 0729f2bd1f8f5..0ce67a96a99cc 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -16,6 +16,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Model\Store;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 /**
  * Product collection
@@ -270,6 +271,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      */
     private $backend;
 
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
     /**
      * Collection constructor
      *
@@ -295,6 +301,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
      * @param ProductLimitationFactory|null $productLimitationFactory
      * @param MetadataPool|null $metadataPool
+     * @param TableMaintainer|null $tableMaintainer
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -320,7 +327,8 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         ProductLimitationFactory $productLimitationFactory = null,
-        MetadataPool $metadataPool = null
+        MetadataPool $metadataPool = null,
+        TableMaintainer $tableMaintainer = null
     ) {
         $this->moduleManager = $moduleManager;
         $this->_catalogProductFlatState = $catalogProductFlatState;
@@ -350,6 +358,7 @@ public function __construct(
             $storeManager,
             $connection
         );
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
     }
 
     /**
@@ -1193,7 +1202,7 @@ public function getProductCountSelect()
             )->distinct(
                 false
             )->join(
-                ['count_table' => $this->getTable('catalog_category_product_index')],
+                ['count_table' => $this->tableMaintainer->getMainTable($this->getStoreId())],
                 'count_table.product_id = e.entity_id',
                 [
                     'count_table.category_id',
@@ -1967,7 +1976,7 @@ protected function _applyProductLimitations()
             $this->getSelect()->setPart(\Magento\Framework\DB\Select::FROM, $fromPart);
         } else {
             $this->getSelect()->join(
-                ['cat_index' => $this->getTable('catalog_category_product_index')],
+                ['cat_index' => $this->tableMaintainer->getMainTable($this->getStoreId())],
                 $joinCond,
                 ['cat_index_position' => 'position']
             );
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Url.php b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
index 682f5c1f45e31..be95f088a2477 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Url.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
@@ -14,6 +14,7 @@
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 /**
  * Class Url
@@ -101,6 +102,11 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $metadataPool;
 
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
     /**
      * Url constructor.
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
@@ -110,6 +116,7 @@ class Url extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Catalog\Model\Category $catalogCategory
      * @param \Psr\Log\LoggerInterface $logger
      * @param null $connectionName
+     * @param TableMaintainer|null $tableMaintainer
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -118,7 +125,8 @@ public function __construct(
         Product $productResource,
         \Magento\Catalog\Model\Category $catalogCategory,
         \Psr\Log\LoggerInterface $logger,
-        $connectionName = null
+        $connectionName = null,
+        TableMaintainer $tableMaintainer = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_eavConfig = $eavConfig;
@@ -126,6 +134,7 @@ public function __construct(
         $this->_catalogCategory = $catalogCategory;
         $this->_logger = $logger;
         parent::__construct($context, $connectionName);
+        $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
     }
 
     /**
@@ -655,43 +664,52 @@ public function getRewriteByProductStore(array $products)
         }
         $connection = $this->getConnection();
 
-        $select = $connection->select()->from(
-            ['i' => $this->getTable('catalog_category_product_index')],
-            ['product_id', 'store_id', 'visibility']
-        )->joinLeft(
-            ['u' => $this->getMainTable()],
-            'i.product_id = u.entity_id AND i.store_id = u.store_id'
-            . ' AND u.entity_type = "' . ProductUrlRewriteGenerator::ENTITY_TYPE . '"',
-            ['request_path']
-        )->joinLeft(
-            ['r' => $this->getTable('catalog_url_rewrite_product_category')],
-            'u.url_rewrite_id = r.url_rewrite_id AND r.category_id is NULL',
-            []
-        );
-
-        $bind = [];
+        $storesProducts = [];
         foreach ($products as $productId => $storeId) {
-            $catId = $this->_storeManager->getStore($storeId)->getRootCategoryId();
-            $productBind = 'product_id' . $productId;
-            $storeBind = 'store_id' . $storeId;
-            $catBind = 'category_id' . $catId;
-            $cond = '(' . implode(
-                ' AND ',
-                ['i.product_id = :' . $productBind, 'i.store_id = :' . $storeBind, 'i.category_id = :' . $catBind]
-            ) . ')';
-            $bind[$productBind] = $productId;
-            $bind[$storeBind] = $storeId;
-            $bind[$catBind] = $catId;
-            $select->orWhere($cond);
+            $storesProducts[$storeId][] = $productId;
         }
 
-        $rowSet = $connection->fetchAll($select, $bind);
-        foreach ($rowSet as $row) {
-            $result[$row['product_id']] = [
-                'store_id' => $row['store_id'],
-                'visibility' => $row['visibility'],
-                'url_rewrite' => $row['request_path'],
-            ];
+        foreach ($storesProducts as $storeId => $productIds) {
+            $select = $connection->select()->from(
+                ['i' => $this->tableMaintainer->getMainTable($storeId)],
+                ['product_id', 'store_id', 'visibility']
+            )->joinLeft(
+                ['u' => $this->getMainTable()],
+                'i.product_id = u.entity_id AND i.store_id = u.store_id'
+                . ' AND u.entity_type = "' . ProductUrlRewriteGenerator::ENTITY_TYPE . '"',
+                ['request_path']
+            )->joinLeft(
+                ['r' => $this->getTable('catalog_url_rewrite_product_category')],
+                'u.url_rewrite_id = r.url_rewrite_id AND r.category_id is NULL',
+                []
+            );
+
+            $bind = [];
+            foreach ($productIds as $productId) {
+                $catId = $this->_storeManager->getStore($storeId)->getRootCategoryId();
+                $productBind = 'product_id' . $productId;
+                $storeBind = 'store_id' . $storeId;
+                $catBind = 'category_id' . $catId;
+                $bindArray = [
+                    'i.product_id = :' . $productBind,
+                    'i.store_id = :' . $storeBind,
+                    'i.category_id = :' . $catBind
+                ];
+                $cond = '(' . implode(' AND ', $bindArray) . ')';
+                $bind[$productBind] = $productId;
+                $bind[$storeBind] = $storeId;
+                $bind[$catBind] = $catId;
+                $select->orWhere($cond);
+            }
+
+            $rowSet = $connection->fetchAll($select, $bind);
+            foreach ($rowSet as $row) {
+                $result[$row['product_id']] = [
+                    'store_id' => $row['store_id'],
+                    'visibility' => $row['visibility'],
+                    'url_rewrite' => $row['request_path'],
+                ];
+            }
         }
 
         return $result;
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/EnableSegmentation.php b/app/code/Magento/Catalog/Setup/Patch/Data/EnableSegmentation.php
new file mode 100644
index 0000000000000..d7b683a439ff1
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/EnableSegmentation.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Class EnableSegmentation.
+ *
+ * @package Magento\Catalog\Setup\Patch
+ */
+class EnableSegmentation implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * EnableSegmentation constructor.
+     *
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->startSetup();
+        $setup = $this->moduleDataSetup;
+
+        $catalogCategoryProductIndexColumns = array_keys(
+            $setup->getConnection()->describeTable($setup->getTable('catalog_category_product_index'))
+        );
+        $storeSelect = $setup->getConnection()->select()->from($setup->getTable('store'))->where('store_id > 0');
+        foreach ($setup->getConnection()->fetchAll($storeSelect) as $store) {
+            $catalogCategoryProductIndexSelect = $setup->getConnection()->select()
+                ->from(
+                    $setup->getTable('catalog_category_product_index')
+                )->where(
+                    'store_id = ?',
+                    $store['store_id']
+                );
+            $indexTable = $setup->getTable('catalog_category_product_index') .
+                '_' .
+                \Magento\Store\Model\Store::ENTITY .
+                $store['store_id'];
+            $setup->getConnection()->query(
+                $setup->getConnection()->insertFromSelect(
+                    $catalogCategoryProductIndexSelect,
+                    $indexTable,
+                    $catalogCategoryProductIndexColumns,
+                    \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+                )
+            );
+        }
+        $setup->getConnection()->delete($setup->getTable('catalog_category_product_index'));
+        $setup->getConnection()->delete($setup->getTable('catalog_category_product_index_replica'));
+        $setup->getConnection()->delete($setup->getTable('catalog_category_product_index_tmp'));
+
+        $this->moduleDataSetup->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Schema/EnableSegmentation.php b/app/code/Magento/Catalog/Setup/Patch/Schema/EnableSegmentation.php
new file mode 100644
index 0000000000000..8ae84f9f8e321
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Schema/EnableSegmentation.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Catalog\Setup\Patch\Schema;
+
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
+
+/**
+ * Class EnableSegmentation.
+ *
+ * @package Magento\Catalog\Setup\Patch\Schema
+ */
+class EnableSegmentation implements SchemaPatchInterface
+{
+    /**
+     * @var SchemaSetupInterface
+     */
+    private $schemaSetup;
+
+    /**
+     * EnableSegmentation constructor.
+     *
+     * @param SchemaSetupInterface $schemaSetup
+     */
+    public function __construct(
+        SchemaSetupInterface $schemaSetup
+    ) {
+        $this->schemaSetup = $schemaSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->schemaSetup->startSetup();
+        $setup = $this->schemaSetup;
+
+        $storeSelect = $setup->getConnection()->select()->from($setup->getTable('store'))->where('store_id > 0');
+        foreach ($setup->getConnection()->fetchAll($storeSelect) as $store) {
+            $indexTable = $setup->getTable('catalog_category_product_index') .
+                '_' .
+                \Magento\Store\Model\Store::ENTITY .
+                $store['store_id'];
+            if (!$setup->getConnection()->isTableExists($indexTable)) {
+                $setup->getConnection()->createTable(
+                    $setup->getConnection()->createTableByDdl(
+                        $setup->getTable('catalog_category_product_index'),
+                        $indexTable
+                    )
+                );
+            }
+            if (!$setup->getConnection()->isTableExists($indexTable . '_replica')) {
+                $setup->getConnection()->createTable(
+                    $setup->getConnection()->createTableByDdl(
+                        $setup->getTable('catalog_category_product_index'),
+                        $indexTable . '_replica'
+                    )
+                );
+            }
+        }
+
+        $this->schemaSetup->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php
index 6e3cd6ed30b52..4da831f5257d0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php
@@ -33,6 +33,11 @@ class StoreViewTest extends \PHPUnit\Framework\TestCase
      */
     protected $indexerRegistryMock;
 
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $tableMaintainer;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -51,15 +56,30 @@ protected function setUp()
         );
         $this->subject = $this->createMock(Group::class);
         $this->indexerRegistryMock = $this->createPartialMock(IndexerRegistry::class, ['get']);
-        $this->storeMock = $this->createPartialMock(Store::class, ['isObjectNew', 'dataHasChangedFor', '__wakeup']);
+        $this->storeMock = $this->createPartialMock(
+            Store::class,
+            [
+                'isObjectNew',
+                'getId',
+                'dataHasChangedFor',
+                '__wakeup'
+            ]
+        );
+        $this->tableMaintainer = $this->createPartialMock(
+            \Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer::class,
+            [
+                'createTablesForStore'
+            ]
+        );
 
-        $this->model = new StoreView($this->indexerRegistryMock);
+        $this->model = new StoreView($this->indexerRegistryMock, $this->tableMaintainer);
     }
 
     public function testAroundSaveNewObject()
     {
         $this->mockIndexerMethods();
-        $this->storeMock->expects($this->once())->method('isObjectNew')->willReturn(true);
+        $this->storeMock->expects($this->atLeastOnce())->method('isObjectNew')->willReturn(true);
+        $this->storeMock->expects($this->atLeastOnce())->method('getId')->willReturn(1);
         $this->model->beforeSave($this->subject, $this->storeMock);
         $this->assertSame($this->subject, $this->model->afterSave($this->subject, $this->subject, $this->storeMock));
     }
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
index aec6549f400fc..683a96133ad30 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
@@ -182,6 +182,11 @@ private function customizeAddAttributeModal(array $meta)
                                                 . '.create_new_attribute_modal',
                                             'actionName' => 'toggleModal',
                                         ],
+                                        [
+                                            'targetName' => 'product_form.product_form.add_attribute_modal'
+                                                . '.create_new_attribute_modal.product_attribute_add_form',
+                                            'actionName' => 'destroyInserted'
+                                        ],
                                         [
                                             'targetName'
                                             => 'product_form.product_form.add_attribute_modal'
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index 10251d35dffcd..ca8390a6c8f8a 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -220,4 +220,7 @@
             <argument name="filter" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\AddSearchKeyConditionToCollection</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ResourceConnection">
+        <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml
index 3989a62a56cc4..659ba2b731366 100644
--- a/app/code/Magento/Catalog/etc/frontend/di.xml
+++ b/app/code/Magento/Catalog/etc/frontend/di.xml
@@ -100,4 +100,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ResourceConnection">
+        <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/webapi_rest/di.xml b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
index 1d2b013f2035d..a0d3e850b3c64 100644
--- a/app/code/Magento/Catalog/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
@@ -8,7 +8,6 @@
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Catalog\Model\Product\Option\Type\Date" type="Magento\Catalog\Model\Webapi\Product\Option\Type\Date" />
-
     <type name="Magento\Catalog\Helper\Product\ConfigurationPool">
         <arguments>
             <argument name="instancesByType" xsi:type="array">
@@ -16,4 +15,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ResourceConnection">
+        <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/webapi_soap/di.xml b/app/code/Magento/Catalog/etc/webapi_soap/di.xml
index 98a8ef4de8408..a0d3e850b3c64 100644
--- a/app/code/Magento/Catalog/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Catalog/etc/webapi_soap/di.xml
@@ -15,4 +15,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ResourceConnection">
+        <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/view/adminhtml/requirejs-config.js b/app/code/Magento/Catalog/view/adminhtml/requirejs-config.js
index 5ffc587f65bec..9053c700d1a3b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/requirejs-config.js
+++ b/app/code/Magento/Catalog/view/adminhtml/requirejs-config.js
@@ -6,12 +6,13 @@
 var config = {
     map: {
         '*': {
-            categoryForm:       'Magento_Catalog/catalog/category/form',
-            newCategoryDialog:  'Magento_Catalog/js/new-category-dialog',
-            categoryTree:       'Magento_Catalog/js/category-tree',
-            productGallery:     'Magento_Catalog/js/product-gallery',
-            baseImage:          'Magento_Catalog/catalog/base-image-uploader',
-            productAttributes:  'Magento_Catalog/catalog/product-attributes'
+            categoryForm:         'Magento_Catalog/catalog/category/form',
+            newCategoryDialog:    'Magento_Catalog/js/new-category-dialog',
+            categoryTree:         'Magento_Catalog/js/category-tree',
+            productGallery:       'Magento_Catalog/js/product-gallery',
+            baseImage:            'Magento_Catalog/catalog/base-image-uploader',
+            productAttributes:    'Magento_Catalog/catalog/product-attributes',
+            categoryCheckboxTree: 'Magento_Catalog/js/category-checkbox-tree'
         }
     },
     deps: [
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
index 740d389735974..00a1580923a7b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
@@ -5,187 +5,33 @@
  */
 
 // @codingStandardsIgnoreFile
-
-?>
-
-<?php $_divId = 'tree-div_' . time() ?>
-<div id="<?= /* @escapeNotVerified */ $_divId ?>" class="tree"></div>
-<script id="ie-deferred-loader" defer="defer" src="//:"></script>
-<script>
-    require([
-        'jquery',
-        "prototype",
-        "extjs/ext-tree-checkbox",
-        "mage/adminhtml/form"
-    ], function(jQuery){
-
-//<![CDATA[
-
-// TODO: cleanup this script. It was copypasted from catalog/category/tree
-
-var tree;
-
 /**
- * Fix ext compatibility with prototype 1.6
+ * @var $block \Magento\Catalog\Block\Adminhtml\Category\Tree
  */
-Ext.lib.Event.getTarget = function(e) {
-    var ee = e.browserEvent || e;
-    return ee.target ? Event.element(ee) : null;
-};
-
-Ext.tree.TreePanel.Enhanced = function(el, config)
-{
-    Ext.tree.TreePanel.Enhanced.superclass.constructor.call(this, el, config);
-};
-
-Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
-
-    loadTree : function(config, firstLoad)
-    {
-        var parameters = config['parameters'];
-        var data = config['data'];
-
-        if ((typeof parameters['root_visible']) != 'undefined') {
-            this.rootVisible = parameters['root_visible']*1;
-        }
-
-        var root = new Ext.tree.TreeNode(parameters);
-
-        this.nodeHash = {};
-        this.setRootNode(root);
-
-        if (firstLoad) {
-            this.addListener('click', this.categoryClick.createDelegate(this));
-        }
-
-        this.loader.buildCategoryTree(root, data);
-        this.el.dom.innerHTML = '';
-        // render the tree
-        this.render();
-    },
-
-    categoryClick : function(node, e)
-    {
-        node.getUI().check(!node.getUI().checked());
-    }
-});
-
-jQuery(function()
-{
-    var categoryLoader = new Ext.tree.TreeLoader({
-       dataUrl: '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl() ?>'
-    });
-
-    categoryLoader.createNode = function(config) {
-        config.uiProvider = Ext.tree.CheckboxNodeUI;
-        var node;
-        var _node = Object.clone(config);
-        if (config.children && !config.children.length) {
-            delete(config.children);
-            node = new Ext.tree.AsyncTreeNode(config);
-        } else {
-            node = new Ext.tree.TreeNode(config);
-        }
-
-        return node;
-    };
-
-    categoryLoader.buildCategoryTree = function(parent, config)
-    {
-        if (!config) return null;
+?>
 
-        if (parent && config && config.length){
-            for (var i = 0; i < config.length; i++) {
-                config[i].uiProvider = Ext.tree.CheckboxNodeUI;
-                var node;
-                var _node = Object.clone(config[i]);
-                if (_node.children && !_node.children.length) {
-                    delete(_node.children);
-                    node = new Ext.tree.AsyncTreeNode(_node);
-                } else {
-                    node = new Ext.tree.TreeNode(config[i]);
-                }
-                parent.appendChild(node);
-                node.loader = node.getOwnerTree().loader;
-                if (_node.children) {
-                    this.buildCategoryTree(node, _node.children);
-                }
-            }
-        }
-    };
+<?php $divId = $block->escapeHtml('tree-div_' . time()) ?>
+<div id="<?= /* @noEscape */ $divId ?>" class="tree"></div>
+<script id="ie-deferred-loader" defer="defer" src="//:"></script>
 
-    categoryLoader.buildHash = function(node)
+<script type="text/x-magento-init">
     {
-        var hash = {};
-
-        hash = this.toArray(node.attributes);
-
-        if (node.childNodes.length>0 || (node.loaded==false && node.loading==false)) {
-            hash['children'] = new Array;
-
-            for (var i = 0, len = node.childNodes.length; i < len; i++) {
-                if (!hash['children']) {
-                    hash['children'] = new Array;
-                }
-                hash['children'].push(this.buildHash(node.childNodes[i]));
+        "*": {
+            "categoryCheckboxTree": {
+                "dataUrl":       "<?= $block->escapeUrl($block->getLoadTreeUrl()) ?>",
+                "divId":         "<?= /* @noEscape */ $divId ?>",
+                "rootVisible":   <?= /* @noEscape */ $block->getRoot()->getIsVisible() ? 'true' : 'false' ?>,
+                "useAjax":       <?= $block->escapeHtml($block->getUseAjax()) ?>,
+                "currentNodeId": <?= (int)$block->getCategoryId() ?>,
+                "jsFormObject":  "<?= /* @noEscape */ $block->getJsFormObject() ?>",
+                "name":          "<?= $block->escapeHtml($block->getRoot()->getName()) ?>",
+                "checked":       "<?= $block->escapeHtml($block->getRoot()->getChecked()) ?>",
+                "allowdDrop":    <?= /* @noEscape */ $block->getRoot()->getIsVisible() ? 'true' : 'false' ?>,
+                "rootId":        <?= (int)$block->getRoot()->getId() ?>,
+                "expanded":      <?= (int)$block->getIsWasExpanded() ?>,
+                "categoryId":    <?= (int)$block->getCategoryId() ?>,
+                "treeJson":      <?= /* @noEscape */ $block->getTreeJson() ?>
             }
         }
-
-        return hash;
-    };
-
-    categoryLoader.toArray = function(attributes) {
-        var data = {};
-        for (var key in attributes) {
-            var value = attributes[key];
-            data[key] = value;
-        }
-
-        return data;
-    };
-
-    categoryLoader.on("beforeload", function(treeLoader, node) {
-        treeLoader.baseParams.id = node.attributes.id;
-    });
-
-    categoryLoader.on("load", function(treeLoader, node, config) {
-        varienWindowOnload();
-    });
-
-    tree = new Ext.tree.TreePanel.Enhanced('<?= /* @escapeNotVerified */ $_divId ?>', {
-        animate:          false,
-        loader:           categoryLoader,
-        enableDD:         false,
-        containerScroll:  true,
-        selModel:         new Ext.tree.CheckNodeMultiSelectionModel(),
-        rootVisible:      '<?= /* @escapeNotVerified */ $block->getRoot()->getIsVisible() ?>',
-        useAjax:          <?= /* @escapeNotVerified */ $block->getUseAjax() ?>,
-        currentNodeId:    <?= (int) $block->getCategoryId() ?>,
-        addNodeTo:        false,
-        rootUIProvider:   Ext.tree.CheckboxNodeUI
-    });
-
-    tree.on('check', function(node, checked) {
-        <?= /* @escapeNotVerified */ $block->getJsFormObject() ?>.updateElement.value = this.getChecked().join(', ');
-        varienElementMethods.setHasChanges(node.getUI().checkbox);
-    }, tree);
-
-    // set the root node
-    var parameters = {
-        text:        '<?= /* @escapeNotVerified */ htmlentities($block->getRoot()->getName()) ?>',
-        draggable:   false,
-        checked:'<?= /* @escapeNotVerified */ $block->getRoot()->getChecked() ?>',
-        uiProvider: Ext.tree.CheckboxNodeUI,
-        allowDrop:   <?php if ($block->getRoot()->getIsVisible()): ?>true<?php else : ?>false<?php endif; ?>,
-        id:          <?= (int) $block->getRoot()->getId() ?>,
-        expanded:    <?= (int) $block->getIsWasExpanded() ?>,
-        category_id: <?= (int) $block->getCategoryId() ?>
-    };
-
-    tree.loadTree({parameters:parameters, data:<?= /* @escapeNotVerified */ $block->getTreeJson() ?>},true);
-
-});
-//]]>
-
-});
+    }
 </script>
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml
index 44e13da69fc3b..6c5d37a92ea4a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_attribute_add_form.xml
@@ -152,7 +152,6 @@
                         <item name="isTemplate" xsi:type="boolean">true</item>
                         <item name="is_collection" xsi:type="boolean">true</item>
                         <item name="componentType" xsi:type="string">container</item>
-                        <item name="positionProvider" xsi:type="string">attribute_options.position</item>
                     </item>
                 </argument>
                 <field name="is_default" component="Magento_Catalog/js/form/element/checkbox" sortOrder="0" formElement="checkbox">
@@ -189,12 +188,8 @@
                         </item>
                     </argument>
                     <settings>
-                        <additionalClasses>
-                            <class name="_hidden">true</class>
-                        </additionalClasses>
                         <dataType>text</dataType>
                         <visible>false</visible>
-                        <dataScope>position</dataScope>
                     </settings>
                 </field>
             </container>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js
new file mode 100644
index 0000000000000..bc44128663cd0
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js
@@ -0,0 +1,271 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* global Ext, varienWindowOnload, varienElementMethods */
+
+define([
+    'jquery',
+    'prototype',
+    'extjs/ext-tree-checkbox',
+    'mage/adminhtml/form'
+], function (jQuery) {
+    'use strict';
+
+    return function (config) {
+        var tree,
+            options = {
+                dataUrl: config.dataUrl,
+                divId: config.divId,
+                rootVisible: config.rootVisible,
+                useAjax: config.useAjax,
+                currentNodeId: config.currentNodeId,
+                jsFormObject: window[config.jsFormObject],
+                name: config.name,
+                checked: config.checked,
+                allowDrop: config.allowDrop,
+                rootId: config.rootId,
+                expanded: config.expanded,
+                categoryId: config.categoryId,
+                treeJson: config.treeJson
+            },
+            data = {},
+            parameters = {},
+            root = {},
+            len = 0,
+            key = '';
+
+        /**
+         * Fix ext compatibility with prototype 1.6
+         */
+        Ext.lib.Event.getTarget = function (e) {
+            var ee = e.browserEvent || e;
+
+            return ee.target ? Event.element(ee) : null;
+        };
+
+        /**
+         * @param {Object} el
+         * @param {Object} nodeConfig
+         */
+        Ext.tree.TreePanel.Enhanced = function (el, nodeConfig) {
+            Ext.tree.TreePanel.Enhanced.superclass.constructor.call(this, el, nodeConfig);
+        };
+
+        Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
+            /**
+             * @param {Object} treeConfig
+             * @param {Boolean} firstLoad
+             */
+            loadTree: function (treeConfig, firstLoad) {
+                parameters = treeConfig.parameters,
+                    data = treeConfig.data,
+                    root = new Ext.tree.TreeNode(parameters);
+
+                if (typeof parameters.rootVisible !== 'undefined') {
+                    this.rootVisible = parameters.rootVisible * 1;
+                }
+
+                this.nodeHash = {};
+                this.setRootNode(root);
+
+                if (firstLoad) {
+                    this.addListener('click', this.categoryClick.createDelegate(this));
+                }
+
+                this.loader.buildCategoryTree(root, data);
+                this.el.dom.innerHTML = '';
+                // render the tree
+                this.render();
+            },
+
+            /**
+             * @param {Object} node
+             */
+            categoryClick: function (node) {
+                node.getUI().check(!node.getUI().checked());
+            }
+        });
+
+        jQuery(function () {
+            var categoryLoader = new Ext.tree.TreeLoader({
+                dataUrl: config.dataUrl
+            });
+
+            /**
+             * @param {Object} response
+             * @param {Object} parent
+             * @param {Function} callback
+             */
+            categoryLoader.processResponse = function (response, parent, callback) {
+                config = JSON.parse(response.responseText);
+
+                this.buildCategoryTree(parent, config);
+
+                if (typeof callback === 'function') {
+                    callback(this, parent);
+                }
+            };
+
+            /**
+             * @param {Object} nodeConfig
+             * @returns {Object}
+             */
+            categoryLoader.createNode = function (nodeConfig) {
+                var node;
+
+                nodeConfig.uiProvider = Ext.tree.CheckboxNodeUI;
+
+                if (nodeConfig.children && !nodeConfig.children.length) {
+                    delete nodeConfig.children;
+                    node = new Ext.tree.AsyncTreeNode(nodeConfig);
+                } else {
+                    node = new Ext.tree.TreeNode(nodeConfig);
+                }
+
+                return node;
+            };
+
+            /**
+             * @param {Object} parent
+             * @param {Object} nodeConfig
+             * @param {Integer} i
+             */
+            categoryLoader.processCategoryTree = function (parent, nodeConfig, i) {
+                var node,
+                    _node = {};
+
+                nodeConfig[i].uiProvider = Ext.tree.CheckboxNodeUI;
+
+                _node = Object.clone(nodeConfig[i]);
+
+                if (_node.children && !_node.children.length) {
+                    delete _node.children;
+                    node = new Ext.tree.AsyncTreeNode(_node);
+                } else {
+                    node = new Ext.tree.TreeNode(nodeConfig[i]);
+                }
+                parent.appendChild(node);
+                node.loader = node.getOwnerTree().loader;
+
+                if (_node.children) {
+                    categoryLoader.buildCategoryTree(node, _node.children);
+                }
+            };
+
+            /**
+             * @param {Object} parent
+             * @param {Object} nodeConfig
+             * @returns {void}
+             */
+            categoryLoader.buildCategoryTree = function (parent, nodeConfig) {
+                var j = 0;
+
+                if (!nodeConfig) {
+                    return null;
+                }
+
+                if (parent && nodeConfig && nodeConfig.length) {
+                    for (j = 0; j < nodeConfig.length; j++) {
+                        categoryLoader.processCategoryTree(parent, nodeConfig, j);
+                    }
+                }
+            };
+
+            /**
+             *
+             * @param {Object} hash
+             * @param {Object} node
+             * @returns {Object}
+             */
+            categoryLoader.buildHashChildren = function (hash, node) {
+                var j = 0;
+
+                if (node.childNodes.length > 0 || node.loaded === false && node.loading === false) {
+                    hash.children = [];
+
+                    for (j = 0, len = node.childNodes.length; j < len; j++) {
+                        hash.children = hash.children ? hash.children : [];
+                        hash.children.push(this.buildHash(node.childNodes[j]));
+                    }
+                }
+
+                return hash;
+            };
+
+            /**
+             * @param {Object} node
+             * @returns {Object}
+             */
+            categoryLoader.buildHash = function (node) {
+                var hash = {};
+
+                hash = this.toArray(node.attributes);
+
+                return categoryLoader.buildHashChildren(hash, node);
+            };
+
+            /**
+             * @param {Object} attributes
+             * @returns {Object}
+             */
+            categoryLoader.toArray = function (attributes) {
+                data = {};
+
+                for (key in attributes) {
+
+                    if (attributes[key]) {
+                        data[key] = attributes[key];
+                    }
+                }
+
+                return data;
+            };
+
+            categoryLoader.on('beforeload', function (treeLoader, node) {
+                treeLoader.baseParams.id = node.attributes.id;
+            });
+
+            categoryLoader.on('load', function () {
+                varienWindowOnload();
+            });
+
+            tree = new Ext.tree.TreePanel.Enhanced(options.divId, {
+                animate: false,
+                loader: categoryLoader,
+                enableDD: false,
+                containerScroll: true,
+                selModel: new Ext.tree.CheckNodeMultiSelectionModel(),
+                rootVisible: options.rootVisible,
+                useAjax: options.useAjax,
+                currentNodeId: options.currentNodeId,
+                addNodeTo: false,
+                rootUIProvider: Ext.tree.CheckboxNodeUI
+            });
+
+            tree.on('check', function (node) {
+                options.jsFormObject.updateElement.value = this.getChecked().join(', ');
+                varienElementMethods.setHasChanges(node.getUI().checkbox);
+            }, tree);
+
+            // set the root node
+            //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+            parameters = {
+                text: options.name,
+                draggable: false,
+                checked: options.checked,
+                uiProvider: Ext.tree.CheckboxNodeUI,
+                allowDrop: options.allowDrop,
+                id: options.rootId,
+                expanded: options.expanded,
+                category_id: options.categoryId
+            };
+            //jscs:enable requireCamelCaseOrUpperCaseIdentifiers
+
+            tree.loadTree({
+                parameters: parameters, data: options.treeJson
+            }, true);
+        });
+    };
+});
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
index 51ffeaea0fc0c..2f6703cc92eac 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
@@ -54,9 +54,16 @@ define([
             if (!_.isEmpty(this.suffixName) || _.isNumber(this.suffixName)) {
                 suffixName = '.' + this.suffixName;
             }
-            this.dataScope = 'data.' + this.prefixName + '.' + this.elementName + suffixName;
 
-            this.links.value = this.provider + ':' + this.dataScope;
+            this.exportDataLink = 'data.' + this.prefixName + '.' + this.elementName + suffixName;
+            this.exports.value = this.provider + ':' + this.exportDataLink;
+        },
+
+        /** @inheritdoc */
+        destroy: function () {
+            this._super();
+
+            this.source.remove(this.exportDataLink);
         },
 
         /**
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html b/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html
index d4cfb02611416..9a52dcefa3042 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html
+++ b/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html
@@ -7,7 +7,7 @@
 <button class="action-delete"
         attr="{'data-action': 'remove_row'}"
         data-bind="
-            click: function(){ $data.processingDeleteRecord($parents); },
+            click: function(){ $parent.processingDeleteRecord($record().index, $record.recordId); },
             attr: {
                 title: $parent.deleteButtonLabel
             }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
index a5d193afd2af4..528b2b5c59f23 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
@@ -11,7 +11,7 @@ $viewModel = $block->getData('viewModel');
     "breadcrumbs": {
         "categoryUrlSuffix": "<?= $block->escapeHtml($viewModel->getCategoryUrlSuffix()); ?>",
         "useCategoryPathInUrl": <?= (int)$viewModel->isCategoryUsedInProductUrl(); ?>,
-        "product": "<?= $block->escapeHtml($viewModel->getProductName()); ?>"
+        "product": "<?= $block->escapeHtml($block->escapeJsQuote($viewModel->getProductName(), '"')); ?>"
     }
 }'>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
index 6a2dd1f27d4a9..f1d4b32031e49 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
@@ -10,7 +10,7 @@
 ?>
 <?php $_total = $block->getItems()->getSize() ?>
 <?php if ($_total): ?>
-    <a href="#" class="action print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
+    <a href="#" class="action print hidden-print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
         <span><?= /* @escapeNotVerified */ __('Print This Page') ?></span>
     </a>
         <div class="table-wrapper comparison">
@@ -29,7 +29,7 @@
                         <?php if ($_i++ == 0): ?>
                             <th scope="row" class="cell label remove"><span><?= /* @escapeNotVerified */ __('Remove Product') ?></span></th>
                         <?php endif; ?>
-                        <td class="cell remove product">
+                        <td class="cell remove product hidden-print">
                             <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                             <a href="#" data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataRemove($_item) ?>'
                                class="action delete" title="<?= /* @escapeNotVerified */ __('Remove Product') ?>">
@@ -59,7 +59,7 @@
                             </strong>
                             <?= $block->getReviewsSummaryHtml($_item, 'short') ?>
                             <?= /* @escapeNotVerified */ $block->getProductPrice($_item, '-compare-list-top') ?>
-                            <div class="product-item-actions">
+                            <div class="product-item-actions hidden-print">
                                 <div class="actions-primary">
                                     <?php if ($_item->isSaleable()): ?>
                                         <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>" method="post">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 5a064b33355a4..1bfa30478df8a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -47,21 +47,11 @@
                 "data": <?= /* @escapeNotVerified */ $block->getGalleryImagesJson() ?>,
                 "options": {
                     "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/nav") ?>",
-                    <?php if (($block->getVar("gallery/loop"))): ?>
-                        "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/keyboard"))): ?>
-                        "keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/arrows"))): ?>
-                        "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/allowfullscreen"))): ?>
-                        "allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/caption"))): ?>
-                        "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ?>,
-                    <?php endif; ?>
+                    "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ? 'true' : 'false' ?>,
+                    "keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ? 'true' : 'false' ?>,
+                    "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ? 'true' : 'false' ?>,
+                    "allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ? 'true' : 'false' ?>,
+                    "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ? 'true' : 'false' ?>,
                     "width": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>",
                     "thumbwidth": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_small', 'width') ?>",
                     <?php if ($block->getImageAttribute('product_page_image_small', 'height') || $block->getImageAttribute('product_page_image_small', 'width')): ?>
@@ -76,28 +66,18 @@
                         "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/transition/duration") ?>,
                     <?php endif; ?>
                     "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/transition/effect") ?>",
-                    <?php if (($block->getVar("gallery/navarrows"))): ?>
-                        "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ?>,
-                    <?php endif; ?>
+                    "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ? 'true' : 'false' ?>,
                     "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
                     "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navdir") ?>"
                 },
                 "fullscreen": {
                     "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/nav") ?>",
-                    <?php if ($block->getVar("gallery/fullscreen/loop")): ?>
-                        "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ?>,
-                    <?php endif; ?>
+                    "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ? 'true' : 'false' ?>,
                     "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navdir") ?>",
-                    <?php if ($block->getVar("gallery/transition/navarrows")): ?>
-                        "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ?>,
-                    <?php endif; ?>
+                    "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ? 'true' : 'false' ?>,
                     "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navtype") ?>",
-                    <?php if ($block->getVar("gallery/fullscreen/arrows")): ?>
-                        "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ?>,
-                    <?php endif; ?>
-                    <?php if ($block->getVar("gallery/fullscreen/caption")): ?>
-                        "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ?>,
-                    <?php endif; ?>
+                    "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ? 'true' : 'false' ?>,
+                    "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ? 'true' : 'false' ?>,
                     <?php if ($block->getVar("gallery/fullscreen/transition/duration")): ?>
                         "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/duration") ?>,
                     <?php endif; ?>
diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
new file mode 100644
index 0000000000000..baa456c7821ed
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Category;
+
+use GraphQL\Language\AST\FieldNode;
+
+/**
+ * Used for determining the depth information for a requested category tree in a GraphQL request
+ */
+class DepthCalculator
+{
+    /**
+     * Calculate the total depth of a category tree inside a GraphQL request
+     *
+     * @param FieldNode $fieldNode
+     * @return int
+     */
+    public function calculate(FieldNode $fieldNode) : int
+    {
+        $selections = $fieldNode->selectionSet->selections ?? [];
+        $depth = count($selections) ? 1 : 0;
+        $childrenDepth = [0];
+        foreach ($selections as $node) {
+            $childrenDepth[] = $this->calculate($node);
+        }
+
+        return $depth + max($childrenDepth);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php b/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
new file mode 100644
index 0000000000000..da4ec37c51da4
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/Hydrator.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Category;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CustomAttributesFlattener;
+use Magento\Framework\Reflection\DataObjectProcessor;
+
+/**
+ * Hydrate GraphQL category structure with model data.
+ */
+class Hydrator
+{
+    /**
+     * @var CustomAttributesFlattener
+     */
+    private $flattener;
+
+    /**
+     * @var DataObjectProcessor
+     */
+    private $dataObjectProcessor;
+
+    /**
+     * @param CustomAttributesFlattener $flattener
+     * @param DataObjectProcessor $dataObjectProcessor
+     */
+    public function __construct(
+        CustomAttributesFlattener $flattener,
+        DataObjectProcessor $dataObjectProcessor
+    ) {
+        $this->flattener = $flattener;
+        $this->dataObjectProcessor = $dataObjectProcessor;
+    }
+
+    /**
+     * Hydrate and flatten category object to flat array
+     *
+     * @param CategoryInterface $category
+     * @return array
+     */
+    public function hydrateCategory(CategoryInterface $category) : array
+    {
+        $categoryData = $this->dataObjectProcessor->buildOutputDataArray($category, CategoryInterface::class);
+        $categoryData['id'] = $category->getId();
+        $categoryData['product_count'] = $category->getProductCount();
+        $categoryData['children'] = [];
+        $categoryData['available_sort_by'] = $category->getAvailableSortBy();
+        return $this->flattener->flatten($categoryData);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php
new file mode 100644
index 0000000000000..eb57873850b80
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Category;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Catalog\Model\ResourceModel\Category;
+
+/**
+ * Determine level data for GraphQL Category request
+ */
+class LevelCalculator
+{
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param Category $resourceCategory
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        Category $resourceCategory
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->resourceCategory = $resourceCategory;
+    }
+
+    /**
+     * Calculate level data for root category ID specified in GraphQL request
+     *
+     * @param int $rootCategoryId
+     * @return int
+     */
+    public function calculate(int $rootCategoryId) : int
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $select = $connection->select()
+            ->from($connection->getTableName('catalog_category_entity'), 'level')
+            ->where($this->resourceCategory->getLinkField() . " = ?", $rootCategoryId);
+        return (int) $connection->fetchOne($select);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php b/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php
index 0b1e76313b46d..0ca72d9ff9519 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php
@@ -30,7 +30,15 @@ class CategoryAttributeReader implements ReaderInterface
         'is_active',
         'children',
         'level',
-        'default_sort_by'
+        'default_sort_by',
+        'all_children',
+        'page_layout',
+        'custom_design',
+        'custom_design_from',
+        'custom_design_to',
+        'custom_layout_update',
+        'custom_use_parent_settings',
+        'custom_apply_to_products',
     ];
 
     /**
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category.php
index 52ecdccecdc3f..a17de7374534b 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category.php
@@ -110,7 +110,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                         CategoryInterface::class
                     );
                     $categories[$item->getId()] = $this->customAttributesFlattener
-                        ->flaternize($categories[$item->getId()]);
+                        ->flatten($categories[$item->getId()]);
                     $categories[$item->getId()]['product_count'] = $item->getProductCount();
                 }
             }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
index c78237b7bcd45..f631e5ff61d2e 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
@@ -55,11 +55,11 @@ public function __construct(
      */
     private function assertFiltersAreValidAndGetCategoryRootIds(array $args) : int
     {
-        if (!isset($args['filter']['root_category_id'])) {
-            throw new GraphQlInputException(__('"root_category_id" filter should be specified'));
+        if (!isset($args['id'])) {
+            throw new GraphQlInputException(__('"id for category should be specified'));
         }
 
-        return (int) $args['filter']['root_category_id'];
+        return (int) $args['id'];
     }
 
     /**
@@ -74,9 +74,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
             $rootCategoryId = $this->assertFiltersAreValidAndGetCategoryRootIds($args);
             $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
-            return [
-                'category_tree' => reset($categoriesTree)
-            ];
+            if (!empty($categoriesTree)) {
+                return current($categoriesTree);
+            } else {
+                return null;
+            }
         });
     }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index 6d3bb35d654e2..3c01579410638 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -8,14 +8,15 @@
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
 
 use GraphQL\Language\AST\FieldNode;
+use Magento\CatalogGraphQl\Model\Category\DepthCalculator;
+use Magento\CatalogGraphQl\Model\Category\Hydrator;
+use Magento\CatalogGraphQl\Model\Category\LevelCalculator;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Catalog\Model\ResourceModel\Category;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\CatalogGraphQl\Model\AttributesJoiner;
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Reflection\DataObjectProcessor;
 
 /**
  * Category tree data provider
@@ -38,47 +39,47 @@ class CategoryTree
     private $attributesJoiner;
 
     /**
-     * @var ResourceConnection
+     * @var DepthCalculator
      */
-    private $resourceConnection;
+    private $depthCalculator;
 
     /**
-     * @var Category
+     * @var LevelCalculator
      */
-    private $resourceCategory;
+    private $levelCalculator;
 
     /**
-     * @var CustomAttributesFlattener
+     * @var MetadataPool
      */
-    private $customAttributesFlattener;
+    private $metadata;
 
     /**
-     * @var DataObjectProcessor
+     * @var Hydrator
      */
-    private $dataObjectProcessor;
+    private $hydrator;
 
     /**
      * @param CollectionFactory $collectionFactory
      * @param AttributesJoiner $attributesJoiner
-     * @param ResourceConnection $resourceConnection
-     * @param Category $resourceCategory
-     * @param CustomAttributesFlattener $customAttributesFlattener
-     * @param DataObjectProcessor $dataObjectProcessor
+     * @param DepthCalculator $depthCalculator
+     * @param LevelCalculator $levelCalculator
+     * @param MetadataPool $metadata
+     * @param Hydrator $hydrator
      */
     public function __construct(
         CollectionFactory $collectionFactory,
         AttributesJoiner $attributesJoiner,
-        ResourceConnection $resourceConnection,
-        Category $resourceCategory,
-        CustomAttributesFlattener $customAttributesFlattener,
-        DataObjectProcessor $dataObjectProcessor
+        DepthCalculator $depthCalculator,
+        LevelCalculator $levelCalculator,
+        MetadataPool $metadata,
+        Hydrator $hydrator
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->attributesJoiner = $attributesJoiner;
-        $this->resourceConnection = $resourceConnection;
-        $this->resourceCategory = $resourceCategory;
-        $this->customAttributesFlattener = $customAttributesFlattener;
-        $this->dataObjectProcessor = $dataObjectProcessor;
+        $this->depthCalculator = $depthCalculator;
+        $this->levelCalculator = $levelCalculator;
+        $this->metadata = $metadata;
+        $this->hydrator = $hydrator;
     }
 
     /**
@@ -91,13 +92,17 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
         $categoryQuery = $resolveInfo->fieldASTs[0];
         $collection = $this->collectionFactory->create();
         $this->joinAttributesRecursively($collection, $categoryQuery);
-        $depth = $this->calculateDepth($categoryQuery);
-        $level = $this->getLevelByRootCategoryId($rootCategoryId);
+        $depth = $this->depthCalculator->calculate($categoryQuery);
+        $level = $this->levelCalculator->calculate($rootCategoryId);
         //Search for desired part of category tree
+        $collection->addPathFilter(sprintf('.*/%s/[/0-9]*$', $rootCategoryId));
         $collection->addFieldToFilter('level', ['gt' => $level]);
         $collection->addFieldToFilter('level', ['lteq' => $level + $depth - self::DEPTH_OFFSET]);
         $collection->setOrder('level');
-        $collection->getSelect()->orWhere($this->resourceCategory->getLinkField() . ' = ?', $rootCategoryId);
+        $collection->getSelect()->orWhere(
+            $this->metadata->getMetadata(CategoryInterface::class)->getLinkField() . ' = ?',
+            $rootCategoryId
+        );
         return $this->processTree($collection->getIterator());
     }
 
@@ -113,7 +118,7 @@ private function processTree(\Iterator $iterator) : array
             $category = $iterator->current();
             $iterator->next();
             $nextCategory = $iterator->current();
-            $tree[$category->getId()] = $this->hydrateCategory($category);
+            $tree[$category->getId()] = $this->hydrator->hydrateCategory($category);
             if ($nextCategory && (int) $nextCategory->getLevel() !== (int) $category->getLevel()) {
                 $tree[$category->getId()]['children'] = $this->processTree($iterator);
             }
@@ -122,36 +127,6 @@ private function processTree(\Iterator $iterator) : array
         return $tree;
     }
 
-    /**
-     * Hydrate and flatten category object to flat array
-     *
-     * @param CategoryInterface $category
-     * @return array
-     */
-    private function hydrateCategory(CategoryInterface $category) : array
-    {
-        $categoryData = $this->dataObjectProcessor->buildOutputDataArray($category, CategoryInterface::class);
-        $categoryData['id'] = $category->getId();
-        $categoryData['product_count'] = $category->getProductCount();
-        $categoryData['all_children'] = $category->getAllChildren();
-        $categoryData['children'] = [];
-        $categoryData['available_sort_by'] = $category->getAvailableSortBy();
-        return $this->customAttributesFlattener->flaternize($categoryData);
-    }
-
-    /**
-     * @param int $rootCategoryId
-     * @return int
-     */
-    private function getLevelByRootCategoryId(int $rootCategoryId) : int
-    {
-        $connection = $this->resourceConnection->getConnection();
-        $select = $connection->select()
-            ->from($connection->getTableName('catalog_category_entity'), 'level')
-            ->where($this->resourceCategory->getLinkField() . " = ?", $rootCategoryId);
-        return (int) $connection->fetchOne($select);
-    }
-
     /**
      * @param Collection $collection
      * @param FieldNode $fieldNode
@@ -171,20 +146,4 @@ private function joinAttributesRecursively(Collection $collection, FieldNode $fi
             $this->joinAttributesRecursively($collection, $node);
         }
     }
-
-    /**
-     * @param FieldNode $fieldNode
-     * @return int
-     */
-    private function calculateDepth(FieldNode $fieldNode) : int
-    {
-        $selections = $fieldNode->selectionSet->selections ?? [];
-        $depth = count($selections) ? 1 : 0;
-        $childrenDepth = [0];
-        foreach ($selections as $node) {
-            $childrenDepth[] = $this->calculateDepth($node);
-        }
-
-        return $depth + max($childrenDepth);
-    }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CustomAttributesFlattener.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CustomAttributesFlattener.php
index e5dfe760372ff..3f7af2610db1f 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CustomAttributesFlattener.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CustomAttributesFlattener.php
@@ -13,12 +13,12 @@
 class CustomAttributesFlattener
 {
     /**
-     * Graphql is waiting for flat array
+     * Flatten custom attributes within its enclosing array to normalize key-value pairs.
      *
      * @param array $categoryData
      * @return array
      */
-    public function flaternize(array $categoryData) : array
+    public function flatten(array $categoryData) : array
     {
         if (!isset($categoryData['custom_attributes'])) {
             return $categoryData;
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/FilterArgument/ProductEntityAttributesForAst.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/FilterArgument/ProductEntityAttributesForAst.php
index 99b892e868d2c..96bef3ffc09c4 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/FilterArgument/ProductEntityAttributesForAst.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/FilterArgument/ProductEntityAttributesForAst.php
@@ -33,7 +33,7 @@ class ProductEntityAttributesForAst implements FieldEntityAttributesInterface
      */
     public function __construct(
         ConfigInterface $config,
-        array $additionalAttributes = ['min_price', 'max_price']
+        array $additionalAttributes = ['min_price', 'max_price', 'category_ids']
     ) {
         $this->config = $config;
         $this->additionalAttributes = $additionalAttributes;
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index f223b1c9eec07..ca1ff78654319 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -10,9 +10,9 @@ type Query {
         sort: ProductSortInput @doc(description: "Specifies which attribute to sort on, and whether to return the results in ascending or descending order.")
      ): Products
      @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products") @doc(description: "The products query searches for products that match the criteria specified in the search and filter attributes")
-    categories (
-        filter: CategoryFilterInput @doc(description: "Filter for categories")
-    ): Categories
+    category (
+        id: Int @doc(description: "Id of the category")
+    ): CategoryTree
     @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree")
 }
 
@@ -263,9 +263,6 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
     new_from_date: String @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
     new_to_date: String @doc(description: "The end date for new product listings") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\NewFromTo")
     tier_price: Float @doc(description: "The price when tier pricing is in effect and the items purchased threshold has been reached")
-    custom_layout_update: String @doc(description: "XML code that is applied as a layout update to the product page")
-    custom_layout: String @doc(description: "The name of a custom layout")
-    category_ids: [Int] @doc(description: "An array of category IDs the product belongs to")
     options_container: String @doc(description: "If the product has multiple options, determines where they appear on the product page")
     image_label: String @doc(description: "The label assigned to a product image")
     small_image_label: String @doc(description: "The label assigned to a product's small image")
@@ -300,11 +297,7 @@ type CustomizableAreaValue @doc(description: "CustomizableAreaValue defines the
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option")
 }
 
-type Categories @doc(description: "Categories aggregates the category tree of a product") {
-    category_tree: CategoryTree @doc(description: "Tree of categories")
-}
-
-type CategoryTree implements CategoryInterface @doc(description: "Category Tree") {
+type CategoryTree implements CategoryInterface @doc(description: "Category Tree implementation") {
     children: [CategoryTree] @doc(description: "Child categories tree") @resolve(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree")
 }
 
@@ -376,7 +369,6 @@ interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model
     path_in_store: String @doc(description: "Category path in store")
     url_key: String @doc(description: "The url key assigned to the category")
     url_path: String @doc(description: "The url path assigned to the category")
-    is_active: Boolean @doc(description: "Indicates whether the category is enabled")
     position: Int @doc(description: "The position of the category relative to other categories at the same level in tree")
     level: Int @doc(description: "Indicates the depth of the category within the tree")
     created_at: String @doc(description: "Timestamp indicating when the category was created")
@@ -412,10 +404,6 @@ type Products @doc(description: "The Products object is the top-level object ret
     filters: [LayerFilter] @doc(description: "Layered navigation filters array")
 }
 
-input CategoryFilterInput @doc(description: "Identifies which category attributes to search for and return.") {
-    root_category_id: Int @doc(description: "Id of the root category in the category tree to use as the starting point of your search.")
-}
-
 input ProductFilterInput @doc(description: "ProductFilterInput defines the filters to be used in the search. A filter contains at least one attribute, a comparison operator, and the value that is being searched for.") {
     name: FilterTypeInput @doc(description: "The product name. Customers use this name to identify the product.")
     sku: FilterTypeInput @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer")
diff --git a/app/code/Magento/CatalogInventory/i18n/en_US.csv b/app/code/Magento/CatalogInventory/i18n/en_US.csv
index 93406163cbe1b..19b73f847b46d 100644
--- a/app/code/Magento/CatalogInventory/i18n/en_US.csv
+++ b/app/code/Magento/CatalogInventory/i18n/en_US.csv
@@ -55,11 +55,7 @@ Inventory,Inventory
 "Only X left Threshold","Only X left Threshold"
 "Display Products Availability in Stock on Storefront","Display Products Availability in Stock on Storefront"
 "Product Stock Options","Product Stock Options"
-"
-                    Please note that these settings apply to individual items in the cart, not to the entire cart.
-                ","
-                    Please note that these settings apply to individual items in the cart, not to the entire cart.
-                "
+"Please note that these settings apply to individual items in the cart, not to the entire cart.","Please note that these settings apply to individual items in the cart, not to the entire cart."
 "Manage Stock","Manage Stock"
 Backorders,Backorders
 "Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
index 333ee845798ec..306d3b9a347b4 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Widget/Chooser/Sku.php
@@ -207,7 +207,7 @@ protected function _prepareColumns()
     public function getGridUrl()
     {
         return $this->getUrl(
-            'catalog_rule/*/chooser',
+            '*/*/chooser',
             ['_current' => true, 'current_grid_id' => $this->getId(), 'collapse' => null]
         );
     }
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index f2dd8968a903d..1f62200fc6b1b 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -12,6 +12,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 
 /**
  * @api
@@ -136,6 +137,11 @@ class IndexBuilder
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var TableSwapper
+     */
+    private $tableSwapper;
+
     /**
      * @var ProductLoader
      */
@@ -160,6 +166,7 @@ class IndexBuilder
      * @param RuleProductPricesPersistor|null $pricesPersistor
      * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
      * @param ProductLoader|null $productLoader
+     * @param TableSwapper|null $tableSwapper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -180,7 +187,8 @@ public function __construct(
         ReindexRuleProductPrice $reindexRuleProductPrice = null,
         RuleProductPricesPersistor $pricesPersistor = null,
         \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null,
-        ProductLoader $productLoader = null
+        ProductLoader $productLoader = null,
+        TableSwapper $tableSwapper = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -218,6 +226,8 @@ public function __construct(
         $this->productLoader = $productLoader ?? ObjectManager::getInstance()->get(
             ProductLoader::class
         );
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
@@ -296,13 +306,6 @@ public function reindexFull()
      */
     protected function doReindexFull()
     {
-        $this->connection->truncateTable(
-            $this->getTable($this->activeTableSwitcher->getAdditionalTableName('catalogrule_product'))
-        );
-        $this->connection->truncateTable(
-            $this->getTable($this->activeTableSwitcher->getAdditionalTableName('catalogrule_product_price'))
-        );
-
         foreach ($this->getAllRules() as $rule) {
             $this->reindexRuleProduct->execute($rule, $this->batchCount, true);
         }
@@ -310,8 +313,7 @@ protected function doReindexFull()
         $this->reindexRuleProductPrice->execute($this->batchCount, null, true);
         $this->reindexRuleGroupWebsite->execute(true);
 
-        $this->activeTableSwitcher->switchTable(
-            $this->connection,
+        $this->tableSwapper->swapIndexTables(
             [
                 $this->getTable('catalogrule_product'),
                 $this->getTable('catalogrule_product_price'),
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapper.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapper.php
new file mode 100644
index 0000000000000..f99f8c50a7f9a
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapper.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\Indexer;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * @inheritDoc
+ */
+class IndexerTableSwapper implements IndexerTableSwapperInterface
+{
+    /**
+     * Keys are original tables' names, values - created temporary tables.
+     *
+     * @var string[]
+     */
+    private $temporaryTables = [];
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ResourceConnection $resource
+     */
+    public function __construct(ResourceConnection $resource)
+    {
+        $this->resourceConnection = $resource;
+    }
+
+    /**
+     * Create temporary table based on given table to use instead of original.
+     *
+     * @param string $originalTableName
+     *
+     * @return string Created table name.
+     */
+    private function createTemporaryTable(string $originalTableName): string
+    {
+        $temporaryTableName = $this->resourceConnection->getTableName(
+            $originalTableName . '__temp' . $this->generateRandomSuffix()
+        );
+
+        $this->resourceConnection->getConnection()->query(
+            sprintf(
+                'create table %s like %s',
+                $temporaryTableName,
+                $this->resourceConnection->getTableName($originalTableName)
+            )
+        );
+
+        return $temporaryTableName;
+    }
+
+    /**
+     * Random suffix for temporary tables not to conflict with each other.
+     *
+     * @return string
+     */
+    private function generateRandomSuffix(): string
+    {
+        return bin2hex(random_bytes(4));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getWorkingTableName(string $originalTable): string
+    {
+        $originalTable = $this->resourceConnection->getTableName($originalTable);
+        if (!array_key_exists($originalTable, $this->temporaryTables)) {
+            $this->temporaryTables[$originalTable] = $this->createTemporaryTable($originalTable);
+        }
+
+        return $this->temporaryTables[$originalTable];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function swapIndexTables(array $originalTablesNames)
+    {
+        $toRename = [];
+        /** @var string[] $toDrop */
+        $toDrop = [];
+        /** @var string[] $temporaryTablesRenamed */
+        $temporaryTablesRenamed = [];
+        //Renaming temporary tables to original tables' names, dropping old
+        //tables.
+        foreach ($originalTablesNames as $tableName) {
+            $tableName = $this->resourceConnection->getTableName($tableName);
+            $temporaryOriginalName = $this->resourceConnection->getTableName(
+                $tableName . $this->generateRandomSuffix()
+            );
+            $temporaryTableName = $this->getWorkingTableName($tableName);
+            $toRename[] = [
+                'oldName' => $tableName,
+                'newName' => $temporaryOriginalName,
+            ];
+            $toRename[] = [
+                'oldName' => $temporaryTableName,
+                'newName' => $tableName,
+            ];
+            $toDrop[] = $temporaryOriginalName;
+            $temporaryTablesRenamed[] = $tableName;
+        }
+
+        //Swapping tables.
+        $this->resourceConnection->getConnection()->renameTablesBatch($toRename);
+        //Cleaning up.
+        foreach ($temporaryTablesRenamed as $tableName) {
+            unset($this->temporaryTables[$tableName]);
+        }
+        //Removing old ones.
+        foreach ($toDrop as $tableName) {
+            $this->resourceConnection->getConnection()->dropTable($tableName);
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapperInterface.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapperInterface.php
new file mode 100644
index 0000000000000..2f37e680949ae
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexerTableSwapperInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\Indexer;
+
+/**
+ * Manage additional tables used while building new index to preserve
+ * index tables until the process finishes.
+ */
+interface IndexerTableSwapperInterface
+{
+    /**
+     * Get working table name used to build index.
+     *
+     * @param string $originalTable
+     *
+     * @return string
+     */
+    public function getWorkingTableName(string $originalTable): string;
+
+    /**
+     * Swap working tables with actual tables to save new indexes.
+     *
+     * @param string[] $originalTablesNames
+     *
+     * @return void
+     */
+    public function swapIndexTables(array $originalTablesNames);
+}
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleGroupWebsite.php b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleGroupWebsite.php
index cc5d07b18e0fa..752e6fb6ca75d 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleGroupWebsite.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleGroupWebsite.php
@@ -6,6 +6,10 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+
 /**
  * Reindex information about rule relations with customer groups and websites.
  */
@@ -27,23 +31,32 @@ class ReindexRuleGroupWebsite
     private $catalogRuleGroupWebsiteColumnsList = ['rule_id', 'customer_group_id', 'website_id'];
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+     * @var ActiveTableSwitcher
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var TableSwapper
+     */
+    private $tableSwapper;
+
     /**
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+     * @param ActiveTableSwitcher $activeTableSwitcher
+     * @param TableSwapper|null $tableSwapper
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
         \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+        ActiveTableSwitcher $activeTableSwitcher,
+        TableSwapper $tableSwapper = null
     ) {
         $this->dateTime = $dateTime;
         $this->resource = $resource;
         $this->activeTableSwitcher = $activeTableSwitcher;
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
@@ -61,10 +74,10 @@ public function execute($useAdditionalTable = false)
         $ruleProductTable = $this->resource->getTableName('catalogrule_product');
         if ($useAdditionalTable) {
             $indexTable = $this->resource->getTableName(
-                $this->activeTableSwitcher->getAdditionalTableName('catalogrule_group_website')
+                $this->tableSwapper->getWorkingTableName('catalogrule_group_website')
             );
             $ruleProductTable = $this->resource->getTableName(
-                $this->activeTableSwitcher->getAdditionalTableName('catalogrule_product')
+                $this->tableSwapper->getWorkingTableName('catalogrule_product')
             );
         }
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php
index 534061d593123..55a234bb8ae27 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php
@@ -6,6 +6,10 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Reindex rule relations with products.
  */
@@ -17,20 +21,29 @@ class ReindexRuleProduct
     private $resource;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+     * @var ActiveTableSwitcher
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var TableSwapper
+     */
+    private $tableSwapper;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+     * @param ActiveTableSwitcher $activeTableSwitcher
+     * @param TableSwapper|null $tableSwapper
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+        ActiveTableSwitcher $activeTableSwitcher,
+        TableSwapper $tableSwapper = null
     ) {
         $this->resource = $resource;
         $this->activeTableSwitcher = $activeTableSwitcher;
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
@@ -65,7 +78,7 @@ public function execute(
         $indexTable = $this->resource->getTableName('catalogrule_product');
         if ($useAdditionalTable) {
             $indexTable = $this->resource->getTableName(
-                $this->activeTableSwitcher->getAdditionalTableName('catalogrule_product')
+                $this->tableSwapper->getWorkingTableName('catalogrule_product')
             );
         }
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
index 853be1888b5b9..0b1264a216257 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
@@ -6,6 +6,10 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Persist product prices to index table.
  */
@@ -22,23 +26,32 @@ class RuleProductPricesPersistor
     private $dateFormat;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+     * @var ActiveTableSwitcher
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var TableSwapper
+     */
+    private $tableSwapper;
+
     /**
      * @param \Magento\Framework\Stdlib\DateTime $dateFormat
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+     * @param ActiveTableSwitcher $activeTableSwitcher
+     * @param TableSwapper|null $tableSwapper
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateFormat,
         \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+        ActiveTableSwitcher $activeTableSwitcher,
+        TableSwapper $tableSwapper = null
     ) {
         $this->dateFormat = $dateFormat;
         $this->resource = $resource;
         $this->activeTableSwitcher = $activeTableSwitcher;
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
@@ -59,7 +72,7 @@ public function execute(array $priceData, $useAdditionalTable = false)
         $indexTable = $this->resource->getTableName('catalogrule_product_price');
         if ($useAdditionalTable) {
             $indexTable = $this->resource->getTableName(
-                $this->activeTableSwitcher->getAdditionalTableName('catalogrule_product_price')
+                $this->tableSwapper->getWorkingTableName('catalogrule_product_price')
             );
         }
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php
index 25d164aeee5c3..6989a33535ad8 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php
@@ -6,6 +6,10 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Build select for rule relation with product.
  */
@@ -32,29 +36,38 @@ class RuleProductsSelectBuilder
     private $metadataPool;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+     * @var ActiveTableSwitcher
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var TableSwapper
+     */
+    private $tableSwapper;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
-     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+     * @param ActiveTableSwitcher $activeTableSwitcher
+     * @param TableSwapper|null $tableSwapper
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher
+        ActiveTableSwitcher $activeTableSwitcher,
+        TableSwapper $tableSwapper = null
     ) {
         $this->eavConfig = $eavConfig;
         $this->storeManager = $storeManager;
         $this->metadataPool = $metadataPool;
         $this->resource = $resource;
         $this->activeTableSwitcher = $activeTableSwitcher;
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
@@ -74,7 +87,7 @@ public function build(
         $indexTable = $this->resource->getTableName('catalogrule_product');
         if ($useAdditionalTable) {
             $indexTable = $this->resource->getTableName(
-                $this->activeTableSwitcher->getAdditionalTableName('catalogrule_product')
+                $this->tableSwapper->getWorkingTableName('catalogrule_product')
             );
         }
 
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexerTableSwapperTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexerTableSwapperTest.php
new file mode 100644
index 0000000000000..654a1180d8717
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexerTableSwapperTest.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
+
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapper;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Ddl\Table;
+use PHPUnit_Framework_MockObject_MockObject;
+
+/**
+ * Test for Magento\CatalogRule\Model\Indexer\IndexerTableSwapper class.
+ */
+class IndexerTableSwapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ResourceConnection|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var AdapterInterface|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapterInterfaceMock;
+
+    /**
+     * @var \Zend_Db_Statement_Interface|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statementInterfaceMock;
+
+    /**
+     * @var Table|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tableMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+
+        $this->adapterInterfaceMock = $this->getMockBuilder(AdapterInterface::class)->getMockForAbstractClass();
+        /** @var \Zend_Db_Statement_Interface $statementInterfaceMock */
+        $this->statementInterfaceMock = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)
+            ->getMockForAbstractClass();
+        /** @var Table $tableMock */
+        $this->tableMock = $this->createMock(Table::class);
+        $this->resourceConnectionMock->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->adapterInterfaceMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetWorkingTableNameWithExistingTemporaryTable(): void
+    {
+        $model = new IndexerTableSwapper($this->resourceConnectionMock);
+        $originalTableName = 'catalogrule_product';
+        $temporaryTableNames = ['catalogrule_product' => 'catalogrule_product__temp9604'];
+        $this->setObjectProperty($model, 'temporaryTables', $temporaryTableNames);
+
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getTableName')
+            ->with($originalTableName)
+            ->willReturn($originalTableName);
+
+        $this->assertEquals(
+            $temporaryTableNames[$originalTableName],
+            $model->getWorkingTableName($originalTableName)
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetWorkingTableNameWithoutExistingTemporaryTable(): void
+    {
+        $model = new IndexerTableSwapper($this->resourceConnectionMock);
+        $originalTableName = 'catalogrule_product';
+        $temporaryTableName = 'catalogrule_product__temp9604';
+        $this->setObjectProperty($model, 'temporaryTables', []);
+
+        $this->resourceConnectionMock->expects($this->at(0))
+            ->method('getTableName')
+            ->with($originalTableName)
+            ->willReturn($originalTableName);
+        $this->resourceConnectionMock->expects($this->at(1))
+            ->method('getTableName')
+            ->with($this->stringStartsWith($originalTableName . '__temp'))
+            ->willReturn($temporaryTableName);
+
+        $this->assertEquals(
+            $temporaryTableName,
+            $model->getWorkingTableName($originalTableName)
+        );
+    }
+
+    /**
+     * Sets object non-public property.
+     *
+     * @param mixed $object
+     * @param string $propertyName
+     * @param mixed $value
+     *
+     * @return void
+     */
+    private function setObjectProperty($object, string $propertyName, $value): void
+    {
+        $reflectionClass = new \ReflectionClass($object);
+        $reflectionProperty = $reflectionClass->getProperty($propertyName);
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($object, $value);
+    }
+
+    /**
+     * @return void
+     */
+    public function testSwapIndexTables(): void
+    {
+        $model = $this->getMockBuilder(IndexerTableSwapper::class)
+            ->setMethods(['getWorkingTableName'])
+            ->setConstructorArgs([$this->resourceConnectionMock])
+            ->getMock();
+        $originalTableName = 'catalogrule_product';
+        $temporaryOriginalTableName = 'catalogrule_product9604';
+        $temporaryTableName = 'catalogrule_product__temp9604';
+        $toRename = [
+            [
+                'oldName' => $originalTableName,
+                'newName' => $temporaryOriginalTableName,
+            ],
+            [
+                'oldName' => $temporaryTableName,
+                'newName' => $originalTableName,
+            ],
+        ];
+
+        $this->resourceConnectionMock->expects($this->at(0))
+            ->method('getTableName')
+            ->with($originalTableName)
+            ->willReturn($originalTableName);
+        $this->resourceConnectionMock->expects($this->at(1))
+            ->method('getTableName')
+            ->with($this->stringStartsWith($originalTableName))
+            ->willReturn($temporaryOriginalTableName);
+        $model->expects($this->once())
+            ->method('getWorkingTableName')
+            ->with($originalTableName)
+            ->willReturn($temporaryTableName);
+        $this->adapterInterfaceMock->expects($this->once())
+            ->method('renameTablesBatch')
+            ->with($toRename)
+            ->willReturn(true);
+        $this->adapterInterfaceMock->expects($this->once())
+            ->method('dropTable')
+            ->with($temporaryOriginalTableName)
+            ->willReturn(true);
+
+        $model->swapIndexTables([$originalTableName]);
+    }
+}
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleGroupWebsiteTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleGroupWebsiteTest.php
index d60a662193e54..f02c2c643f809 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleGroupWebsiteTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleGroupWebsiteTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
+
 class ReindexRuleGroupWebsiteTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -24,10 +27,15 @@ class ReindexRuleGroupWebsiteTest extends \PHPUnit\Framework\TestCase
     private $resourceMock;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
      */
     private $activeTableSwitcherMock;
 
+    /**
+     * @var IndexerTableSwapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tableSwapperMock;
+
     protected function setUp()
     {
         $this->dateTimeMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\DateTime::class)
@@ -37,13 +45,17 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->activeTableSwitcherMock =
-            $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class)
+            $this->getMockBuilder(ActiveTableSwitcher::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->tableSwapperMock = $this->getMockForAbstractClass(
+            IndexerTableSwapperInterface::class
+        );
         $this->model = new \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite(
             $this->dateTimeMock,
             $this->resourceMock,
-            $this->activeTableSwitcherMock
+            $this->activeTableSwitcherMock,
+            $this->tableSwapperMock
         );
     }
 
@@ -55,31 +67,25 @@ public function testExecute()
         $this->resourceMock->expects($this->at(0))->method('getConnection')->willReturn($connectionMock);
         $this->dateTimeMock->expects($this->once())->method('gmtTimestamp')->willReturn($timeStamp);
 
-        $this->activeTableSwitcherMock->expects($this->at(0))
-            ->method('getAdditionalTableName')
-            ->with('catalogrule_group_website')
-            ->willReturn('catalogrule_group_website_replica');
-        $this->activeTableSwitcherMock->expects($this->at(1))
-            ->method('getAdditionalTableName')
-            ->with('catalogrule_product')
-            ->willReturn('catalogrule_product_replica');
+        $this->tableSwapperMock->expects($this->any())
+            ->method('getWorkingTableName')
+            ->willReturnMap(
+                [
+                    ['catalogrule_group_website', 'catalogrule_group_website_replica'],
+                    ['catalogrule_product', 'catalogrule_product_replica'],
+                ]
+            );
 
-        $this->resourceMock->expects($this->at(1))
-            ->method('getTableName')
-            ->with('catalogrule_group_website')
-            ->willReturn('catalogrule_group_website');
-        $this->resourceMock->expects($this->at(2))
-            ->method('getTableName')
-            ->with('catalogrule_product')
-            ->willReturn('catalogrule_product');
-        $this->resourceMock->expects($this->at(3))
-            ->method('getTableName')
-            ->with('catalogrule_group_website_replica')
-            ->willReturn('catalogrule_group_website_replica');
-        $this->resourceMock->expects($this->at(4))
+        $this->resourceMock->expects($this->any())
             ->method('getTableName')
-            ->with('catalogrule_product_replica')
-            ->willReturn('catalogrule_product_replica');
+            ->willReturnMap(
+                [
+                    ['catalogrule_group_website', 'default', 'catalogrule_group_website'],
+                    ['catalogrule_product', 'default', 'catalogrule_product'],
+                    ['catalogrule_group_website_replica', 'default', 'catalogrule_group_website_replica'],
+                    ['catalogrule_product_replica', 'default', 'catalogrule_product_replica'],
+                ]
+            );
 
         $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php
index b829468396bf0..0dbbaee8d2871 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
+
 class ReindexRuleProductTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -19,22 +22,30 @@ class ReindexRuleProductTest extends \PHPUnit\Framework\TestCase
     private $resourceMock;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
      */
     private $activeTableSwitcherMock;
 
+    /**
+     * @var IndexerTableSwapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tableSwapperMock;
+
     protected function setUp()
     {
         $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->activeTableSwitcherMock =
-            $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->activeTableSwitcherMock = $this->getMockBuilder(ActiveTableSwitcher::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+        $this->tableSwapperMock = $this->getMockForAbstractClass(
+            IndexerTableSwapperInterface::class
+        );
         $this->model = new \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct(
             $this->resourceMock,
-            $this->activeTableSwitcherMock
+            $this->activeTableSwitcherMock,
+            $this->tableSwapperMock
         );
     }
 
@@ -71,8 +82,8 @@ public function testExecute()
         $ruleMock->expects($this->exactly(2))->method('getWebsiteIds')->willReturn(1);
         $ruleMock->expects($this->once())->method('getMatchingProductIds')->willReturn($productIds);
 
-        $this->activeTableSwitcherMock->expects($this->once())
-            ->method('getAdditionalTableName')
+        $this->tableSwapperMock->expects($this->once())
+            ->method('getWorkingTableName')
             ->with('catalogrule_product')
             ->willReturn('catalogrule_product_replica');
 
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductPricesPersistorTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductPricesPersistorTest.php
index 3efe26971627e..03163aa2d7c45 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductPricesPersistorTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductPricesPersistorTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
+
 class RuleProductPricesPersistorTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -24,10 +27,15 @@ class RuleProductPricesPersistorTest extends \PHPUnit\Framework\TestCase
     private $resourceMock;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
      */
     private $activeTableSwitcherMock;
 
+    /**
+     * @var IndexerTableSwapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tableSwapperMock;
+
     protected function setUp()
     {
         $this->dateTimeMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime::class)
@@ -36,14 +44,17 @@ protected function setUp()
         $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->activeTableSwitcherMock =
-            $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->activeTableSwitcherMock = $this->getMockBuilder(ActiveTableSwitcher::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+        $this->tableSwapperMock = $this->getMockForAbstractClass(
+            IndexerTableSwapperInterface::class
+        );
         $this->model = new \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor(
             $this->dateTimeMock,
             $this->resourceMock,
-            $this->activeTableSwitcherMock
+            $this->activeTableSwitcherMock,
+            $this->tableSwapperMock
         );
     }
 
@@ -64,8 +75,8 @@ public function testExecute()
         ];
         $tableName = 'catalogrule_product_price_replica';
 
-        $this->activeTableSwitcherMock->expects($this->once())
-            ->method('getAdditionalTableName')
+        $this->tableSwapperMock->expects($this->once())
+            ->method('getWorkingTableName')
             ->with('catalogrule_product_price')
             ->willReturn($tableName);
 
@@ -120,8 +131,8 @@ public function testExecuteWithException()
         ];
         $tableName = 'catalogrule_product_price_replica';
 
-        $this->activeTableSwitcherMock->expects($this->once())
-            ->method('getAdditionalTableName')
+        $this->tableSwapperMock->expects($this->once())
+            ->method('getWorkingTableName')
             ->with('catalogrule_product_price')
             ->willReturn($tableName);
 
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
index 92b4bb353f046..e43fe41dc2127 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
@@ -7,6 +7,8 @@
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
@@ -35,7 +37,7 @@ class RuleProductsSelectBuilderTest extends \PHPUnit\Framework\TestCase
     private $resourceMock;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
      */
     private $activeTableSwitcherMock;
 
@@ -49,6 +51,11 @@ class RuleProductsSelectBuilderTest extends \PHPUnit\Framework\TestCase
      */
     private $metadataPoolMock;
 
+    /**
+     * @var IndexerTableSwapperInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tableSwapperMock;
+
     protected function setUp()
     {
         $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
@@ -56,8 +63,7 @@ protected function setUp()
         $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->activeTableSwitcherMock =
-            $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class)
+        $this->activeTableSwitcherMock = $this->getMockBuilder(ActiveTableSwitcher::class)
                 ->disableOriginalConstructor()
                 ->getMock();
         $this->eavConfigMock = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
@@ -66,13 +72,17 @@ protected function setUp()
         $this->metadataPoolMock = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->tableSwapperMock = $this->getMockForAbstractClass(
+            IndexerTableSwapperInterface::class
+        );
 
         $this->model = new \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder(
             $this->resourceMock,
             $this->eavConfigMock,
             $this->storeManagerMock,
             $this->metadataPoolMock,
-            $this->activeTableSwitcherMock
+            $this->activeTableSwitcherMock,
+            $this->tableSwapperMock
         );
     }
 
@@ -92,8 +102,8 @@ public function testBuild()
         $connectionMock = $this->getMockBuilder(AdapterInterface::class)->disableOriginalConstructor()->getMock();
         $this->resourceMock->expects($this->at(0))->method('getConnection')->willReturn($connectionMock);
 
-        $this->activeTableSwitcherMock->expects($this->once())
-            ->method('getAdditionalTableName')
+        $this->tableSwapperMock->expects($this->once())
+            ->method('getWorkingTableName')
             ->with($ruleTable)
             ->willReturn($rplTable);
 
diff --git a/app/code/Magento/CatalogRule/etc/di.xml b/app/code/Magento/CatalogRule/etc/di.xml
index e29f5541fd77c..40893592c3d0f 100644
--- a/app/code/Magento/CatalogRule/etc/di.xml
+++ b/app/code/Magento/CatalogRule/etc/di.xml
@@ -149,4 +149,5 @@
             <argument name="customConditionProvider" xsi:type="object">CatalogRuleCustomConditionProvider</argument>
         </arguments>
     </type>
+    <preference for="Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface" type="Magento\CatalogRule\Model\Indexer\IndexerTableSwapper" />
 </config>
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
index 6bf735e2141cc..182ecf873d77a 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
@@ -12,7 +12,13 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\Search\Request\Dimension;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class DataProvider
 {
     /**
@@ -32,20 +38,28 @@ class DataProvider
      */
     protected $categoryFactory;
 
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
     /**
      * DataProvider constructor.
      * @param ResourceConnection $resource
      * @param ScopeResolverInterface $scopeResolver
      * @param Resolver $layerResolver
+     * @param TableResolver|null $tableResolver
      */
     public function __construct(
         ResourceConnection $resource,
         ScopeResolverInterface $scopeResolver,
-        Resolver $layerResolver
+        Resolver $layerResolver,
+        TableResolver $tableResolver = null
     ) {
         $this->resource = $resource;
         $this->scopeResolver = $scopeResolver;
         $this->layer = $layerResolver->get();
+        $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
     }
 
     /**
@@ -69,9 +83,18 @@ public function aroundGetDataSet(
             $currentScopeId = $this->scopeResolver->getScope($dimensions['scope']->getValue())->getId();
             $currentCategory = $this->layer->getCurrentCategory();
 
+            $catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $currentScopeId);
+
+            $catalogCategoryProductTableName = $this->tableResolver->resolve(
+                AbstractAction::MAIN_INDEX_TABLE,
+                [
+                    $catalogCategoryProductDimension
+                ]
+            );
+
             $derivedTable = $this->resource->getConnection()->select();
             $derivedTable->from(
-                ['main_table' => $this->resource->getTableName('catalog_category_product_index')],
+                ['main_table' => $catalogCategoryProductTableName],
                 [
                     'value' => 'category_id'
                 ]
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php
index dadce2ed0240c..66e0457e7fadd 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php
@@ -7,6 +7,10 @@
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
 use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 
 /**
  * Strategy which processes exclusions from general rules
@@ -34,19 +38,27 @@ class ExclusionStrategy implements FilterStrategyInterface
      */
     private $validFields = ['price', 'category_ids'];
 
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param AliasResolver $aliasResolver
+     * @param TableResolver|null $tableResolver
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        AliasResolver $aliasResolver
+        AliasResolver $aliasResolver,
+        TableResolver $tableResolver = null
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->storeManager = $storeManager;
         $this->aliasResolver = $aliasResolver;
+        $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
     }
 
     /**
@@ -112,7 +124,18 @@ private function applyCategoryFilter(
         \Magento\Framework\DB\Select $select
     ) {
         $alias = $this->aliasResolver->getAlias($filter);
-        $tableName = $this->resourceConnection->getTableName('catalog_category_product_index');
+
+        $catalogCategoryProductDimension = new Dimension(
+            \Magento\Store\Model\Store::ENTITY,
+            $this->storeManager->getStore()->getId()
+        );
+
+        $tableName = $this->tableResolver->resolve(
+            AbstractAction::MAIN_INDEX_TABLE,
+            [
+                $catalogCategoryProductDimension
+            ]
+        );
         $mainTableAlias = $this->extractTableAliasFromSelect($select);
 
         $select->joinInner(
diff --git a/app/code/Magento/Checkout/Controller/Index/Index.php b/app/code/Magento/Checkout/Controller/Index/Index.php
index 56575fb6c0607..785c1f1473be6 100644
--- a/app/code/Magento/Checkout/Controller/Index/Index.php
+++ b/app/code/Magento/Checkout/Controller/Index/Index.php
@@ -4,6 +4,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Checkout\Controller\Index;
 
 class Index extends \Magento\Checkout\Controller\Onepage
@@ -32,11 +35,35 @@ public function execute()
             return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
 
-        $this->_customerSession->regenerateId();
+        // generate session ID only if connection is unsecure according to issues in session_regenerate_id function.
+        // @see http://php.net/manual/en/function.session-regenerate-id.php
+        if (!$this->isSecureRequest()) {
+            $this->_customerSession->regenerateId();
+        }
         $this->_objectManager->get(\Magento\Checkout\Model\Session::class)->setCartWasUpdated(false);
         $this->getOnepage()->initCheckout();
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getConfig()->getTitle()->set(__('Checkout'));
         return $resultPage;
     }
+
+    /**
+     * Checks if current request uses SSL and referer also is secure.
+     *
+     * @return bool
+     */
+    private function isSecureRequest(): bool
+    {
+        $request = $this->getRequest();
+
+        $referrer = $request->getHeader('referer');
+        $secure = false;
+
+        if ($referrer) {
+            $scheme = parse_url($referrer, PHP_URL_SCHEME);
+            $secure = $scheme === 'https';
+        }
+
+        return $secure && $request->isSecure();
+    }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
index 8d105f25465e4..04723c5894f8f 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
@@ -1,14 +1,23 @@
 <?php
 /**
- * Test for \Magento\Checkout\Controller\Index\Index
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Checkout\Test\Unit\Controller\Index;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManager;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_Builder_InvocationMocker as InvocationMocker;
+use PHPUnit_Framework_MockObject_Matcher_InvokedCount as InvokedCount;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Checkout\Helper\Data;
+use Magento\Quote\Model\Quote;
+use Magento\Framework\View\Result\Page;
+use Magento\Checkout\Controller\Index\Index;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -17,108 +26,111 @@
 class IndexTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
     private $objectManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $objectManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Data|MockObject
      */
-    private $dataMock;
+    private $data;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
-    private $quoteMock;
+    private $quote;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $contextMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    private $sessionMock;
+    private $session;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $onepageMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $layoutMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Http|MockObject
      */
-    private $requestMock;
+    private $request;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $responseMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $redirectMock;
 
     /**
-     * @var \Magento\Checkout\Controller\Index\Index
+     * @var Index
      */
     private $model;
 
     /**
-     * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
+     * @var Page|MockObject
      */
-    protected $resultPageMock;
+    private $resultPage;
 
     /**
      * @var \Magento\Framework\View\Page\Config
      */
-    protected $pageConfigMock;
+    private $pageConfigMock;
 
     /**
      * @var \Magento\Framework\View\Page\Title
      */
-    protected $titleMock;
+    private $titleMock;
 
     /**
      * @var \Magento\Framework\UrlInterface
      */
-    protected $url;
+    private $url;
 
     /**
-     * @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Controller\Result\Redirect|MockObject
      */
-    protected $resultRedirectMock;
+    private $resultRedirectMock;
 
     protected function setUp()
     {
         // mock objects
         $this->objectManager = new ObjectManager($this);
-        $this->objectManagerMock = $this->basicMock(\Magento\Framework\ObjectManagerInterface::class);
-        $this->dataMock = $this->basicMock(\Magento\Checkout\Helper\Data::class);
-        $this->quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+        $this->objectManagerMock = $this->basicMock(ObjectManagerInterface::class);
+        $this->data = $this->basicMock(Data::class);
+        $this->quote = $this->createPartialMock(
+            Quote::class,
             ['getHasError', 'hasItems', 'validateMinimumAmount', 'hasError']
         );
         $this->contextMock = $this->basicMock(\Magento\Framework\App\Action\Context::class);
-        $this->sessionMock = $this->basicMock(\Magento\Customer\Model\Session::class);
+        $this->session = $this->basicMock(Session::class);
         $this->onepageMock = $this->basicMock(\Magento\Checkout\Model\Type\Onepage::class);
         $this->layoutMock = $this->basicMock(\Magento\Framework\View\Layout::class);
-        $this->requestMock = $this->basicMock(\Magento\Framework\App\RequestInterface::class);
+        $this->request = $this->getMockBuilder(Http::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isSecure', 'getHeader'])
+            ->getMock();
         $this->responseMock = $this->basicMock(\Magento\Framework\App\ResponseInterface::class);
         $this->redirectMock = $this->basicMock(\Magento\Framework\App\Response\RedirectInterface::class);
-        $this->resultPageMock = $this->basicMock(\Magento\Framework\View\Result\Page::class);
+        $this->resultPage = $this->basicMock(Page::class);
         $this->pageConfigMock = $this->basicMock(\Magento\Framework\View\Page\Config::class);
         $this->titleMock = $this->basicMock(\Magento\Framework\View\Page\Title::class);
         $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
@@ -130,7 +142,7 @@ protected function setUp()
             ->getMock();
         $resultPageFactoryMock->expects($this->any())
             ->method('create')
-            ->willReturn($this->resultPageMock);
+            ->willReturn($this->resultPage);
 
         $resultRedirectFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\RedirectFactory::class)
             ->disableOriginalConstructor()
@@ -141,21 +153,21 @@ protected function setUp()
             ->willReturn($this->resultRedirectMock);
 
         // stubs
-        $this->basicStub($this->onepageMock, 'getQuote')->willReturn($this->quoteMock);
-        $this->basicStub($this->resultPageMock, 'getLayout')->willReturn($this->layoutMock);
+        $this->basicStub($this->onepageMock, 'getQuote')->willReturn($this->quote);
+        $this->basicStub($this->resultPage, 'getLayout')->willReturn($this->layoutMock);
 
         $this->basicStub($this->layoutMock, 'getBlock')
             ->willReturn($this->basicMock(\Magento\Theme\Block\Html\Header::class));
-        $this->basicStub($this->resultPageMock, 'getConfig')->willReturn($this->pageConfigMock);
+        $this->basicStub($this->resultPage, 'getConfig')->willReturn($this->pageConfigMock);
         $this->basicStub($this->pageConfigMock, 'getTitle')->willReturn($this->titleMock);
         $this->basicStub($this->titleMock, 'set')->willReturn($this->titleMock);
 
         // objectManagerMock
         $objectManagerReturns = [
-            [\Magento\Checkout\Helper\Data::class, $this->dataMock],
+            [Data::class, $this->data],
             [\Magento\Checkout\Model\Type\Onepage::class, $this->onepageMock],
             [\Magento\Checkout\Model\Session::class, $this->basicMock(\Magento\Checkout\Model\Session::class)],
-            [\Magento\Customer\Model\Session::class, $this->basicMock(\Magento\Customer\Model\Session::class)],
+            [Session::class, $this->basicMock(Session::class)],
 
         ];
         $this->objectManagerMock->expects($this->any())
@@ -165,7 +177,7 @@ protected function setUp()
             ->willReturn($this->basicMock(\Magento\Framework\UrlInterface::class));
         // context stubs
         $this->basicStub($this->contextMock, 'getObjectManager')->willReturn($this->objectManagerMock);
-        $this->basicStub($this->contextMock, 'getRequest')->willReturn($this->requestMock);
+        $this->basicStub($this->contextMock, 'getRequest')->willReturn($this->request);
         $this->basicStub($this->contextMock, 'getResponse')->willReturn($this->responseMock);
         $this->basicStub($this->contextMock, 'getMessageManager')
             ->willReturn($this->basicMock(\Magento\Framework\Message\ManagerInterface::class));
@@ -175,33 +187,82 @@ protected function setUp()
 
         // SUT
         $this->model = $this->objectManager->getObject(
-            \Magento\Checkout\Controller\Index\Index::class,
+            Index::class,
             [
                 'context' => $this->contextMock,
-                'customerSession' => $this->sessionMock,
+                'customerSession' => $this->session,
                 'resultPageFactory' => $resultPageFactoryMock,
                 'resultRedirectFactory' => $resultRedirectFactoryMock
             ]
         );
     }
 
-    public function testRegenerateSessionIdOnExecute()
+    /**
+     * Checks a case when session should be or not regenerated during the request.
+     *
+     * @param bool $secure
+     * @param string $referer
+     * @param InvokedCount $expectedCall
+     * @dataProvider sessionRegenerationDataProvider
+     */
+    public function testRegenerateSessionIdOnExecute(bool $secure, string $referer, InvokedCount $expectedCall)
+    {
+        $this->data->method('canOnepageCheckout')
+            ->willReturn(true);
+        $this->quote->method('hasItems')
+            ->willReturn(true);
+        $this->quote->method('getHasError')
+            ->willReturn(false);
+        $this->quote->method('validateMinimumAmount')
+            ->willReturn(true);
+        $this->session->method('isLoggedIn')
+            ->willReturn(true);
+        $this->request->method('isSecure')
+            ->willReturn($secure);
+        $this->request->method('getHeader')
+            ->with('referer')
+            ->willReturn($referer);
+
+        $this->session->expects($expectedCall)
+            ->method('regenerateId');
+        $this->assertSame($this->resultPage, $this->model->execute());
+    }
+
+    /**
+     * Gets list of variations for generating new session.
+     *
+     * @return array
+     */
+    public function sessionRegenerationDataProvider(): array
     {
-        //Stubs to control execution flow
-        $this->basicStub($this->dataMock, 'canOnepageCheckout')->willReturn(true);
-        $this->basicStub($this->quoteMock, 'hasItems')->willReturn(true);
-        $this->basicStub($this->quoteMock, 'getHasError')->willReturn(false);
-        $this->basicStub($this->quoteMock, 'validateMinimumAmount')->willReturn(true);
-        $this->basicStub($this->sessionMock, 'isLoggedIn')->willReturn(true);
-
-        //Expected outcomes
-        $this->sessionMock->expects($this->once())->method('regenerateId');
-        $this->assertSame($this->resultPageMock, $this->model->execute());
+        return [
+            [
+                'secure' => false,
+                'referer' => 'https://test.domain.com/',
+                'expectedCall' => self::once()
+            ],
+            [
+                'secure' => true,
+                'referer' => false,
+                'expectedCall' => self::once()
+            ],
+            [
+                'secure' => true,
+                'referer' => 'http://test.domain.com/',
+                'expectedCall' => self::once()
+            ],
+            // This is the only case in which session regeneration can be skipped
+            [
+                'secure' => true,
+                'referer' => 'https://test.domain.com/',
+                'expectedCall' => self::never()
+            ],
+        ];
     }
 
     public function testOnepageCheckoutNotAvailable()
     {
-        $this->basicStub($this->dataMock, 'canOnepageCheckout')->willReturn(false);
+        $this->basicStub($this->data, 'canOnepageCheckout')->willReturn(false);
         $expectedPath = 'checkout/cart';
 
         $this->resultRedirectMock->expects($this->once())
@@ -214,7 +275,7 @@ public function testOnepageCheckoutNotAvailable()
 
     public function testInvalidQuote()
     {
-        $this->basicStub($this->quoteMock, 'hasError')->willReturn(true);
+        $this->basicStub($this->quote, 'hasError')->willReturn(true);
 
         $expectedPath = 'checkout/cart';
         $this->resultRedirectMock->expects($this->once())
@@ -226,23 +287,22 @@ public function testInvalidQuote()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $mock
+     * @param MockObject $mock
      * @param string $method
      *
-     * @return \PHPUnit\Framework\MockObject_Builder_InvocationMocker
+     * @return InvocationMocker
      */
-    private function basicStub($mock, $method)
+    private function basicStub($mock, $method): InvocationMocker
     {
-        return $mock->expects($this->any())
-                ->method($method)
-                ->withAnyParameters();
+        return $mock->method($method)
+            ->withAnyParameters();
     }
 
     /**
      * @param string $className
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
-    private function basicMock($className)
+    private function basicMock(string $className): MockObject
     {
         return $this->getMockBuilder($className)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
index 3827a174b3396..c707792111c82 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
@@ -66,7 +66,7 @@ define([
          * @param {*} sortOrder
          */
         registerStep: function (code, alias, title, isVisible, navigate, sortOrder) {
-            var hash;
+            var hash, active;
 
             if ($.inArray(code, this.validCodes) !== -1) {
                 throw new DOMException('Step code [' + code + '] already registered in step navigator');
@@ -87,6 +87,12 @@ define([
                 navigate: navigate,
                 sortOrder: sortOrder
             });
+            active = this.getActiveItemIndex();
+            steps.each(function (elem, index) {
+                if (active !== index) {
+                    elem.isVisible(false);
+                }
+            });
             this.stepCodes.push(code);
             hash = window.location.hash.replace('#', '');
 
@@ -111,10 +117,14 @@ define([
         getActiveItemIndex: function () {
             var activeIndex = 0;
 
-            steps().sort(this.sortItems).forEach(function (element, index) {
+            steps().sort(this.sortItems).some(function (element, index) {
                 if (element.isVisible()) {
                     activeIndex = index;
+
+                    return true;
                 }
+
+                return false;
             });
 
             return activeIndex;
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
index 13a2b524e5186..dab40f026645d 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -105,6 +105,13 @@ define([
                 self._showItemButton($(event.target));
             };
 
+            /**
+             * @param {jQuery.Event} event
+             */
+            events['change ' + this.options.item.qty] = function (event) {
+                self._showItemButton($(event.target));
+            };
+
             /**
              * @param {jQuery.Event} event
              */
diff --git a/app/code/Magento/Customer/Model/EmailNotification.php b/app/code/Magento/Customer/Model/EmailNotification.php
index 3e326e087dd5f..4b65dcca0973f 100644
--- a/app/code/Magento/Customer/Model/EmailNotification.php
+++ b/app/code/Magento/Customer/Model/EmailNotification.php
@@ -314,9 +314,9 @@ private function getWebsiteStoreId($customer, $defaultStoreId = null)
      */
     public function passwordReminder(CustomerInterface $customer)
     {
-        $storeId = $this->getWebsiteStoreId($customer);
+        $storeId = $customer->getStoreId();
         if (!$storeId) {
-            $storeId = $this->storeManager->getStore()->getId();
+            $storeId = $this->getWebsiteStoreId($customer);
         }
 
         $customerEmailData = $this->getFullCustomerObject($customer);
diff --git a/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php b/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
index 61e58af78fcdf..318023d8068c5 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
@@ -312,6 +312,7 @@ public function sendNotificationEmailsDataProvider()
     public function testPasswordReminder()
     {
         $customerId = 1;
+        $customerWebsiteId = 1;
         $customerStoreId = 2;
         $customerEmail = 'email@email.com';
         $customerData = ['key' => 'value'];
@@ -319,6 +320,7 @@ public function testPasswordReminder()
         $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
         $senderValues = ['name' => $sender, 'email' => $sender];
+        $storeIds = [1, 2];
 
         $this->senderResolverMock
             ->expects($this->once())
@@ -328,6 +330,9 @@ public function testPasswordReminder()
 
         /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
         $customer = $this->createMock(CustomerInterface::class);
+        $customer->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($customerWebsiteId);
         $customer->expects($this->any())
             ->method('getStoreId')
             ->willReturn($customerStoreId);
@@ -346,10 +351,15 @@ public function testPasswordReminder()
             ->method('getStore')
             ->willReturn($this->storeMock);
 
-        $this->storeManagerMock->expects($this->at(1))
-            ->method('getStore')
-            ->with($customerStoreId)
-            ->willReturn($this->storeMock);
+        $websiteMock = $this->createPartialMock(\Magento\Store\Model\Website::class, ['getStoreIds']);
+        $websiteMock->expects($this->any())
+            ->method('getStoreIds')
+            ->willReturn($storeIds);
+
+        $this->storeManagerMock->expects($this->any())
+            ->method('getWebsite')
+            ->with($customerWebsiteId)
+            ->willReturn($websiteMock);
 
         $this->customerRegistryMock->expects($this->once())
             ->method('retrieveSecureData')
@@ -396,6 +406,99 @@ public function testPasswordReminder()
         $this->model->passwordReminder($customer);
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testPasswordReminderCustomerWithoutStoreId()
+    {
+        $customerId = 1;
+        $customerWebsiteId = 1;
+        $customerStoreId = null;
+        $customerEmail = 'email@email.com';
+        $customerData = ['key' => 'value'];
+        $customerName = 'Customer Name';
+        $templateIdentifier = 'Template Identifier';
+        $sender = 'Sender';
+        $senderValues = ['name' => $sender, 'email' => $sender];
+        $storeIds = [1, 2];
+        $defaultStoreId = reset($storeIds);
+        $this->senderResolverMock
+            ->expects($this->once())
+            ->method('resolve')
+            ->with($sender, $defaultStoreId)
+            ->willReturn($senderValues);
+        /** @var CustomerInterface | \PHPUnit_Framework_MockObject_MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($customerWebsiteId);
+        $customer->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn($customerStoreId);
+        $customer->expects($this->any())
+            ->method('getId')
+            ->willReturn($customerId);
+        $customer->expects($this->any())
+            ->method('getEmail')
+            ->willReturn($customerEmail);
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($defaultStoreId);
+        $this->storeManagerMock->expects($this->at(0))
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->storeManagerMock->expects($this->at(1))
+            ->method('getStore')
+            ->with($defaultStoreId)
+            ->willReturn($this->storeMock);
+        $websiteMock = $this->createPartialMock(\Magento\Store\Model\Website::class, ['getStoreIds']);
+        $websiteMock->expects($this->any())
+            ->method('getStoreIds')
+            ->willReturn($storeIds);
+        $this->storeManagerMock->expects($this->any())
+            ->method('getWebsite')
+            ->with($customerWebsiteId)
+            ->willReturn($websiteMock);
+
+        $this->customerRegistryMock->expects($this->once())
+            ->method('retrieveSecureData')
+            ->with($customerId)
+            ->willReturn($this->customerSecureMock);
+        $this->dataProcessorMock->expects($this->once())
+            ->method('buildOutputDataArray')
+            ->with($customer, CustomerInterface::class)
+            ->willReturn($customerData);
+        $this->customerViewHelperMock->expects($this->any())
+            ->method('getCustomerName')
+            ->with($customer)
+            ->willReturn($customerName);
+        $this->customerSecureMock->expects($this->once())
+            ->method('addData')
+            ->with($customerData)
+            ->willReturnSelf();
+        $this->customerSecureMock->expects($this->once())
+            ->method('setData')
+            ->with('name', $customerName)
+            ->willReturnSelf();
+        $this->scopeConfigMock->expects($this->at(0))
+            ->method('getValue')
+            ->with(EmailNotification::XML_PATH_REMIND_EMAIL_TEMPLATE, ScopeInterface::SCOPE_STORE, $defaultStoreId)
+            ->willReturn($templateIdentifier);
+        $this->scopeConfigMock->expects($this->at(1))
+            ->method('getValue')
+            ->with(EmailNotification::XML_PATH_FORGOT_EMAIL_IDENTITY, ScopeInterface::SCOPE_STORE, $defaultStoreId)
+            ->willReturn($sender);
+        $this->mockDefaultTransportBuilder(
+            $templateIdentifier,
+            $defaultStoreId,
+            $senderValues,
+            $customerEmail,
+            $customerName,
+            ['customer' => $this->customerSecureMock, 'store' => $this->storeMock]
+        );
+        $this->model->passwordReminder($customer);
+    }
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index 016dca2fa526c..ad405190262e4 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -378,19 +378,11 @@ protected function _prepareDataForUpdate(array $rowData)
             $this->_newCustomers[$emailInLowercase][$rowData[self::COLUMN_WEBSITE]] = $entityId;
         }
 
-        $entityRow = [
-            'group_id' => empty($rowData['group_id']) ? self::DEFAULT_GROUP_ID : $rowData['group_id'],
-            'store_id' => empty($rowData[self::COLUMN_STORE]) ? 0 : $this->_storeCodeToId[$rowData[self::COLUMN_STORE]],
-            'created_at' => $createdAt->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
-            'updated_at' => $now->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
-            'entity_id' => $entityId,
-        ];
-
         // password change/set
         if (isset($rowData['password']) && strlen($rowData['password'])) {
             $rowData['password_hash'] = $this->_customerModel->hashPassword($rowData['password']);
         }
-
+        $entityRow = ['entity_id' => $entityId];
         // attribute values
         foreach (array_intersect_key($rowData, $this->_attributes) as $attributeCode => $value) {
             $attributeParameters = $this->_attributes[$attributeCode];
@@ -429,12 +421,21 @@ protected function _prepareDataForUpdate(array $rowData)
 
         if ($newCustomer) {
             // create
+            $entityRow['group_id'] = empty($rowData['group_id']) ? self::DEFAULT_GROUP_ID : $rowData['group_id'];
+            $entityRow['store_id'] = empty($rowData[self::COLUMN_STORE])
+                ? \Magento\Store\Model\Store::DEFAULT_STORE_ID : $this->_storeCodeToId[$rowData[self::COLUMN_STORE]];
+            $entityRow['created_at'] = $createdAt->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
+            $entityRow['updated_at'] = $now->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
             $entityRow['website_id'] = $this->_websiteCodeToId[$rowData[self::COLUMN_WEBSITE]];
             $entityRow['email'] = $emailInLowercase;
             $entityRow['is_active'] = 1;
             $entitiesToCreate[] = $entityRow;
         } else {
             // edit
+            $entityRow['updated_at'] = $now->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
+            if (!empty($rowData[self::COLUMN_STORE])) {
+                $entityRow['store_id'] = $this->_storeCodeToId[$rowData[self::COLUMN_STORE]];
+            }
             $entitiesToUpdate[] = $entityRow;
         }
 
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
index 67a0bbefe7510..3d4c9e89a035f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
@@ -165,7 +165,7 @@ public function getValue(\Magento\Framework\DataObject $object)
                 $options = $opt->getAllOptions();
                 if ($options) {
                     foreach ($options as $option) {
-                        if ($option['value'] == $value) {
+                        if ($option['value'] === $value) {
                             $valueOption = $option['label'];
                         }
                     }
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
index 7e992273a68dc..c11fb64cde7e6 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
@@ -93,6 +93,11 @@ class IndexTest extends \PHPUnit\Framework\TestCase
      */
     protected $storeInterface;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $tableResolver;
+
     /**
      * Setup
      *
@@ -210,6 +215,30 @@ protected function setUp()
             ->willReturn('entity_id');
 
         $objectManager = new ObjectManagerHelper($this);
+
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->setMethods([
+                'getConnection',
+                'getTableName'
+            ])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resource->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($connection);
+        $resource->expects($this->any())->method('getTableName')->willReturnArgument(0);
+
+        $this->tableResolver = $objectManager->getObject(
+            \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver::class,
+            [
+                'resource' => $resource
+            ]
+        );
+
         $this->model = $objectManager->getObject(
             \Magento\Elasticsearch\Model\ResourceModel\Index::class,
             [
@@ -220,6 +249,7 @@ protected function setUp()
                 'categoryRepository' => $this->categoryRepository,
                 'eavConfig' => $this->eavConfig,
                 'connectionName' => 'default',
+                'tableResolver' => $this->tableResolver
             ]
         );
     }
@@ -318,7 +348,7 @@ public function testGetCategoryProductIndexData()
         $select->expects($this->any())
             ->method('from')
             ->with(
-                [null],
+                ['catalog_category_product_index_store1'],
                 ['category_id', 'product_id', 'position', 'store_id']
             )->willReturnSelf();
 
@@ -498,7 +528,7 @@ public function testGetFullCategoryProductIndexData()
 
         $this->assertInternalType(
             'array',
-            $this->model->getFullCategoryProductIndexData([1, [1, ]])
+            $this->model->getFullCategoryProductIndexData(1, [1, ])
         );
     }
 
diff --git a/app/code/Magento/Indexer/Model/Indexer.php b/app/code/Magento/Indexer/Model/Indexer.php
index 58b2e9ed76a78..87a7cce58e1a5 100644
--- a/app/code/Magento/Indexer/Model/Indexer.php
+++ b/app/code/Magento/Indexer/Model/Indexer.php
@@ -398,7 +398,7 @@ protected function getStructureInstance()
      * Regenerate full index
      *
      * @return void
-     * @throws \Exception
+     * @throws \Throwable
      */
     public function reindexAll()
     {
@@ -414,16 +414,11 @@ public function reindexAll()
                 $state->setStatus(StateInterface::STATUS_VALID);
                 $state->save();
                 $this->getView()->resume();
-            } catch (\Exception $exception) {
+            } catch (\Throwable $exception) {
                 $state->setStatus(StateInterface::STATUS_INVALID);
                 $state->save();
                 $this->getView()->resume();
                 throw $exception;
-            } catch (\Error $error) {
-                $state->setStatus(StateInterface::STATUS_INVALID);
-                $state->save();
-                $this->getView()->resume();
-                throw $error;
             }
         }
     }
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index f3565ea324290..5fd23c195f0c4 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -293,7 +293,9 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
             foreach ($methods as $code => $title) {
                 if (isset($groups[$code])) {
                     $labelValues[$code]['label'] = $title;
-                    $labelValues[$code]['value'] = null;
+                    if (!isset($labelValues[$code]['value'])) {
+                        $labelValues[$code]['value'] = null;
+                    }
                 } elseif (isset($groupRelations[$code])) {
                     unset($labelValues[$code]);
                     $labelValues[$groupRelations[$code]]['value'][$code] = ['value' => $code, 'label' => $title];
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index 6e6a6773bd5f2..33200014c7ec1 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -6,12 +6,14 @@
 
 namespace Magento\Payment\Model\Method;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Quote\Api\Data\PaymentMethodInterface;
 use Magento\Sales\Model\Order\Payment;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 
 /**
  * Payment method abstract model
@@ -194,6 +196,11 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      */
     protected $logger;
 
+    /**
+     * @var DirectoryHelper
+     */
+    private $directory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -205,6 +212,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param DirectoryHelper $directory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -217,7 +225,8 @@ public function __construct(
         \Magento\Payment\Model\Method\Logger $logger,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        DirectoryHelper $directory = null
     ) {
         parent::__construct(
             $context,
@@ -231,6 +240,7 @@ public function __construct(
         $this->_paymentData = $paymentData;
         $this->_scopeConfig = $scopeConfig;
         $this->logger = $logger;
+        $this->directory = $directory ?: ObjectManager::getInstance()->get(DirectoryHelper::class);
         $this->initializeData($data);
     }
 
@@ -584,11 +594,14 @@ public function validate()
         } else {
             $billingCountry = $paymentInfo->getQuote()->getBillingAddress()->getCountryId();
         }
+        $billingCountry = $billingCountry ?: $this->directory->getDefaultCountry();
+
         if (!$this->canUseForCountry($billingCountry)) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('You can\'t use the payment type you selected to make payments to the billing country.')
             );
         }
+
         return $this;
     }
 
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
index eb4c35b02696c..f0fce97da512a 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Paypal\Controller\Express\AbstractExpress;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
 
 /**
@@ -118,15 +119,27 @@ public function execute()
             return;
         } catch (ApiProcessableException $e) {
             $this->_processPaypalApiError($e);
+        } catch (LocalizedException $e) {
+            $this->processException($e, $e->getRawMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addExceptionMessage(
-                $e,
-                __('We can\'t place the order.')
-            );
-            $this->_redirect('*/*/review');
+            $this->processException($e, 'We can\'t place the order.');
         }
     }
 
+    /**
+     * Process exception.
+     *
+     * @param \Exception $exception
+     * @param string $message
+     *
+     * @return void
+     */
+    private function processException(\Exception $exception, string $message): void
+    {
+        $this->messageManager->addExceptionMessage($exception, __($message));
+        $this->_redirect('*/*/review');
+    }
+
     /**
      * Process PayPal API's processable errors
      *
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index e9f2c1b8415a8..9c9b4dc3e87a7 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -809,7 +809,9 @@ public function place($token, $shippingMethodCode = null)
             case \Magento\Sales\Model\Order::STATE_PROCESSING:
             case \Magento\Sales\Model\Order::STATE_COMPLETE:
             case \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW:
-                $this->orderSender->send($order);
+                if (!$order->getEmailSent()) {
+                    $this->orderSender->send($order);
+                }
                 $this->_checkoutSession->start();
                 break;
             default:
@@ -897,7 +899,12 @@ protected function _setExportedAddressData($address, $exportedAddress)
     {
         // Exported data is more priority if we came from Express Checkout button
         $isButton = (bool)$this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
-        if (!$isButton) {
+
+        // Since country is required field for billing and shipping address,
+        // we consider the address information to be empty if country is empty.
+        $isEmptyAddress = ($address->getCountryId() === null);
+
+        if (!$isButton && !$isEmptyAddress) {
             return;
         }
 
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 84034adfe9f22..ad90b75cbb0d5 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -14,6 +14,7 @@
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Address\Total as AddressTotal;
 use Magento\Sales\Model\Status;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Quote model
@@ -353,6 +354,11 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      */
     protected $shippingAddressesItems;
 
+    /**
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker
+     */
+    private $orderIncrementIdChecker;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -394,6 +400,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param \Magento\Sales\Model\OrderIncrementIdChecker|null $orderIncrementIdChecker
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -436,7 +443,8 @@ public function __construct(
         \Magento\Quote\Model\ShippingAssignmentFactory $shippingAssignmentFactory,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Sales\Model\OrderIncrementIdChecker $orderIncrementIdChecker = null
     ) {
         $this->quoteValidator = $quoteValidator;
         $this->_catalogProduct = $catalogProduct;
@@ -471,6 +479,8 @@ public function __construct(
         $this->totalsReader = $totalsReader;
         $this->shippingFactory = $shippingFactory;
         $this->shippingAssignmentFactory = $shippingAssignmentFactory;
+        $this->orderIncrementIdChecker = $orderIncrementIdChecker ?: ObjectManager::getInstance()
+            ->get(\Magento\Sales\Model\OrderIncrementIdChecker::class);
         parent::__construct(
             $context,
             $registry,
@@ -2184,7 +2194,7 @@ public function reserveOrderId()
         } else {
             //checking if reserved order id was already used for some order
             //if yes reserving new one if not using old one
-            if ($this->_getResource()->isOrderIncrementIdUsed($this->getReservedOrderId())) {
+            if ($this->orderIncrementIdChecker->isIncrementIdUsed($this->getReservedOrderId())) {
                 $this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
             }
         }
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
index 571f1b4686bc1..946c0e0c5f3b8 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -170,29 +170,6 @@ public function getReservedOrderId($quote)
         ->getNextValue();
     }
 
-    /**
-     * Check if order increment ID is already used.
-     * Method can be used to avoid collisions of order IDs.
-     *
-     * @param int $orderIncrementId
-     * @return bool
-     */
-    public function isOrderIncrementIdUsed($orderIncrementId)
-    {
-        /** @var  \Magento\Framework\DB\Adapter\AdapterInterface $adapter */
-        $adapter = $this->_resources->getConnection('sales');
-        $bind = [':increment_id' => $orderIncrementId];
-        /** @var \Magento\Framework\DB\Select $select */
-        $select = $adapter->select();
-        $select->from($this->getTable('sales_order'), 'entity_id')->where('increment_id = :increment_id');
-        $entity_id = $adapter->fetchOne($select, $bind);
-        if ($entity_id > 0) {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Mark quotes - that depend on catalog price rules - to be recollected on demand
      *
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
index 451382abb4684..a92d360bad35b 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
@@ -145,6 +145,11 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
      */
     private $itemProcessor;
 
+    /**
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderIncrementIdChecker;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -256,6 +261,7 @@ protected function setUp()
             \Magento\Customer\Api\Data\CustomerInterfaceFactory::class,
             ['create']
         );
+        $this->orderIncrementIdChecker = $this->createMock(\Magento\Sales\Model\OrderIncrementIdChecker::class);
         $this->quote = (new ObjectManager($this))
             ->getObject(
                 \Magento\Quote\Model\Quote::class,
@@ -280,9 +286,10 @@ protected function setUp()
                     'extensionAttributesJoinProcessor' => $this->extensionAttributesJoinProcessorMock,
                     'customerDataFactory' => $this->customerDataFactoryMock,
                     'itemProcessor' => $this->itemProcessor,
+                    'orderIncrementIdChecker' => $this->orderIncrementIdChecker,
                     'data' => [
-                        'reserved_order_id' => 1000001
-                    ]
+                        'reserved_order_id' => 1000001,
+                    ],
                 ]
             );
     }
@@ -1222,28 +1229,32 @@ public function testGetAllItems()
     }
 
     /**
-     * Test to verify if existing reserved_order_id in use
+     * Test to verify if existing reserved_order_id in use.
      *
      * @param bool $isReservedOrderIdExist
      * @param int $reservedOrderId
+     * @return void
      * @dataProvider reservedOrderIdDataProvider
      */
-    public function testReserveOrderId($isReservedOrderIdExist, $reservedOrderId)
+    public function testReserveOrderId(bool $isReservedOrderIdExist, int $reservedOrderId): void
     {
-        $this->resourceMock
+        $this->orderIncrementIdChecker
             ->expects($this->once())
-            ->method('isOrderIncrementIdUsed')
+            ->method('isIncrementIdUsed')
             ->with(1000001)->willReturn($isReservedOrderIdExist);
         $this->resourceMock->expects($this->any())->method('getReservedOrderId')->willReturn($reservedOrderId);
         $this->quote->reserveOrderId();
         $this->assertEquals($reservedOrderId, $this->quote->getReservedOrderId());
     }
 
-    public function reservedOrderIdDataProvider()
+    /**
+     * @return array
+     */
+    public function reservedOrderIdDataProvider(): array
     {
         return [
             'id_already_in_use' => [true, 100002],
-            'id_not_in_use' => [false, 1000001]
+            'id_not_in_use' => [false, 1000001],
         ];
     }
 }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
index a121cd55a98b4..7136e8260a880 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
@@ -6,35 +6,17 @@
 
 namespace Magento\Quote\Test\Unit\Model\ResourceModel;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\DB\Adapter\Pdo\Mysql;
-use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Sequence\SequenceInterface;
-use Magento\Framework\Model\ResourceModel\Db\Context;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\SalesSequence\Model\Manager;
 
+/**
+ * Unit test for \Magento\Quote\Model\ResourceModel\Quote.
+ */
 class QuoteTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var ResourceConnection
-     */
-    private $resourceMock;
-
-    /**
-     * @var Mysql
-     */
-    private $adapterMock;
-
-    /**
-     * @var Select
-     */
-    private $selectMock;
-
     /**
      * @var Quote|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -55,98 +37,31 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManager($this);
-        $this->selectMock = $this->getMockBuilder(Select::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->selectMock->expects($this->any())->method('from')->will($this->returnSelf());
-        $this->selectMock->expects($this->any())->method('where');
-
-        $this->adapterMock = $this->getMockBuilder(Mysql::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->adapterMock->expects($this->any())->method('select')->will($this->returnValue($this->selectMock));
-
-        $this->resourceMock = $this->getMockBuilder(ResourceConnection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resourceMock->expects(
-            $this->any()
-        )->method(
-            'getConnection'
-        )->will(
-            $this->returnValue($this->adapterMock)
-        );
-
-        $context = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $context->expects(
-            $this->once()
-        )->method(
-            'getResources'
-        )->will(
-            $this->returnValue($this->resourceMock)
-        );
-
-        $snapshot = $this->getMockBuilder(Snapshot::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $relationComposite = $this->getMockBuilder(RelationComposite::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->quoteMock = $this->getMockBuilder(Quote::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->sequenceManagerMock = $this->getMockBuilder(Manager::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->sequenceMock = $this->getMockBuilder(SequenceInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->quoteMock = $this->createMock(Quote::class);
+        $this->sequenceManagerMock = $this->createMock(Manager::class);
+        $this->sequenceMock = $this->createMock(SequenceInterface::class);
         $this->model = $objectManagerHelper->getObject(
             QuoteResource::class,
             [
-                'context' => $context,
-                'entitySnapshot' => $snapshot,
-                'entityRelationComposite' => $relationComposite,
                 'sequenceManager' => $this->sequenceManagerMock,
-                'connectionName' => null,
             ]
         );
     }
 
     /**
-     * Unit test to verify if isOrderIncrementIdUsed method works with different types increment ids
-     *
-     * @param array $value
-     * @dataProvider isOrderIncrementIdUsedDataProvider
-     */
-    public function testIsOrderIncrementIdUsed($value)
-    {
-        $expectedBind = [':increment_id' => $value];
-        $this->adapterMock->expects($this->once())->method('fetchOne')->with($this->selectMock, $expectedBind);
-        $this->model->isOrderIncrementIdUsed($value);
-    }
-
-    /**
-     * @return array
-     */
-    public function isOrderIncrementIdUsedDataProvider()
-    {
-        return [[100000001], ['10000000001'], ['M10000000001']];
-    }
-
-    /**
-     * /**
-     * @param $entityType
-     * @param $storeId
-     * @param $reservedOrderId
+     * @param string $entityType
+     * @param int $storeId
+     * @param string $reservedOrderId
+     * @return void
      * @dataProvider getReservedOrderIdDataProvider
      */
-    public function testGetReservedOrderId($entityType, $storeId, $reservedOrderId)
+    public function testGetReservedOrderId(string $entityType, int $storeId, string $reservedOrderId): void
     {
         $this->sequenceManagerMock->expects($this->once())
             ->method('getSequence')
@@ -170,7 +85,7 @@ public function getReservedOrderIdDataProvider(): array
         return [
             [\Magento\Sales\Model\Order::ENTITY, 1, '1000000001'],
             [\Magento\Sales\Model\Order::ENTITY, 2, '2000000001'],
-            [\Magento\Sales\Model\Order::ENTITY, 3, '3000000001']
+            [\Magento\Sales\Model\Order::ENTITY, 3, '3000000001'],
         ];
     }
 }
diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
index 999d23328e0ec..3bd7122e65d7f 100644
--- a/app/code/Magento/Quote/etc/db_schema.xml
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -61,7 +61,7 @@
                 identity="false" default="1" comment="Customer Note Notify"/>
         <column xsi:type="smallint" name="customer_is_guest" padding="5" unsigned="true" nullable="true"
                 identity="false" default="0" comment="Customer Is Guest"/>
-        <column xsi:type="varchar" name="remote_ip" nullable="true" length="32" comment="Remote Ip"/>
+        <column xsi:type="varchar" name="remote_ip" nullable="true" length="45" comment="Remote Ip"/>
         <column xsi:type="varchar" name="applied_rule_ids" nullable="true" length="255" comment="Applied Rule Ids"/>
         <column xsi:type="varchar" name="reserved_order_id" nullable="true" length="64" comment="Reserved Order Id"/>
         <column xsi:type="varchar" name="password_hash" nullable="true" length="255" comment="Password Hash"/>
diff --git a/app/code/Magento/Review/Block/Product/ReviewRenderer.php b/app/code/Magento/Review/Block/Product/ReviewRenderer.php
index 8aa10d2437cbb..3cd15aba30420 100644
--- a/app/code/Magento/Review/Block/Product/ReviewRenderer.php
+++ b/app/code/Magento/Review/Block/Product/ReviewRenderer.php
@@ -18,8 +18,8 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
      * @var array
      */
     protected $_availableTemplates = [
-        self::FULL_VIEW => 'helper/summary.phtml',
-        self::SHORT_VIEW => 'helper/summary_short.phtml',
+        self::FULL_VIEW => 'Magento_Review::helper/summary.phtml',
+        self::SHORT_VIEW => 'Magento_Review::helper/summary_short.phtml',
     ];
 
     /**
diff --git a/app/code/Magento/Review/view/frontend/templates/redirect.phtml b/app/code/Magento/Review/view/frontend/templates/redirect.phtml
index fc74cadacb319..2fdb5e90a9c18 100644
--- a/app/code/Magento/Review/view/frontend/templates/redirect.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/redirect.phtml
@@ -8,9 +8,6 @@
 
 ?>
 <?php
-/*    if(isset($GET['limit'])) {
-        $limit = $GET['limit']
-    }*/
     header("Location:{$block->getProduct()->getProductUrl()}#info-product_reviews");
     exit;
 ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/view.phtml b/app/code/Magento/Review/view/frontend/templates/view.phtml
index 564a6e1a7c537..205ce5c20572a 100644
--- a/app/code/Magento/Review/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/view.phtml
@@ -49,7 +49,7 @@
     <div class="actions">
         <div class="secondary">
             <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
-                <span><?= $block->escapeHtml(__('Back to Product Reviews')) ?></a></span>
+                <span><?= $block->escapeHtml(__('Back to Product Reviews')) ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php
index 96f71133cb832..e37ee263b8301 100644
--- a/app/code/Magento/Rss/Model/Rss.php
+++ b/app/code/Magento/Rss/Model/Rss.php
@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Rss\Model;
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Rss\DataProviderInterface;
 use Magento\Framework\Serialize\SerializerInterface;
-use Zend\Feed\Writer\FeedFactory;
+use Magento\Framework\App\FeedFactoryInterface;
 
 /**
  * Provides functionality to work with RSS feeds
@@ -28,6 +31,11 @@ class Rss
      */
     protected $cache;
 
+    /**
+     * @var \Magento\Framework\App\FeedFactoryInterface
+     */
+    private $feedFactory;
+
     /**
      * @var SerializerInterface
      */
@@ -38,13 +46,16 @@ class Rss
      *
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param SerializerInterface|null $serializer
+     * @param FeedFactoryInterface|null $feedFactory
      */
     public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        FeedFactoryInterface $feedFactory = null
     ) {
         $this->cache = $cache;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
+        $this->feedFactory = $feedFactory ?: ObjectManager::getInstance()->get(FeedFactoryInterface::class);
     }
 
     /**
@@ -90,10 +101,12 @@ public function setDataProvider(DataProviderInterface $dataProvider)
 
     /**
      * @return string
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
     public function createRssXml()
     {
-        $feed = FeedFactory::factory($this->getFeeds());
-        return $feed->export('rss');
+        $feed = $this->feedFactory->create($this->getFeeds(), FeedFactoryInterface::FORMAT_RSS);
+        return $feed->getFormattedContent();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php
index 58fd541bab8cb..a601f8fb2d1d7 100644
--- a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php
@@ -104,14 +104,22 @@ public function testExecuteWithException()
         $dataProvider = $this->createMock(\Magento\Framework\App\Rss\DataProviderInterface::class);
         $dataProvider->expects($this->once())->method('isAllowed')->will($this->returnValue(true));
 
-        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider']);
+        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider', 'createRssXml']);
         $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf());
 
+        $exceptionMock = new \Magento\Framework\Exception\RuntimeException(
+            new \Magento\Framework\Phrase('Any message')
+        );
+
+        $rssModel->expects($this->once())->method('createRssXml')->will(
+            $this->throwException($exceptionMock)
+        );
+
         $this->response->expects($this->once())->method('setHeader')->will($this->returnSelf());
         $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));
         $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\Magento\Framework\Exception\RuntimeException::class);
         $this->controller->execute();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php
index e8f7a85382f27..30415155d5f6e 100644
--- a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php
@@ -53,6 +53,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
 
         $objectManagerHelper = new ObjectManagerHelper($this);
+
         $this->controller = $objectManagerHelper->getObject(
             \Magento\Rss\Controller\Feed\Index::class,
             [
@@ -91,14 +92,22 @@ public function testExecuteWithException()
         $dataProvider = $this->createMock(\Magento\Framework\App\Rss\DataProviderInterface::class);
         $dataProvider->expects($this->once())->method('isAllowed')->will($this->returnValue(true));
 
-        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider']);
+        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider', 'createRssXml']);
         $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf());
 
+        $exceptionMock = new \Magento\Framework\Exception\RuntimeException(
+            new \Magento\Framework\Phrase('Any message')
+        );
+
+        $rssModel->expects($this->once())->method('createRssXml')->will(
+            $this->throwException($exceptionMock)
+        );
+
         $this->response->expects($this->once())->method('setHeader')->will($this->returnSelf());
         $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));
         $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\Magento\Framework\Exception\RuntimeException::class);
         $this->controller->execute();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
index 34f9940556a93..f2888e4296b40 100644
--- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
@@ -19,7 +19,7 @@ class RssTest extends \PHPUnit\Framework\TestCase
     /**
      * @var array
      */
-    protected $feedData = [
+    private $feedData = [
         'title' => 'Feed Title',
         'link' => 'http://magento.com/rss/link',
         'description' => 'Feed Description',
@@ -33,6 +33,27 @@ class RssTest extends \PHPUnit\Framework\TestCase
         ],
     ];
 
+    /**
+     * @var string
+     */
+    private $feedXml = '<?xml version="1.0" encoding="UTF-8"?>
+<rss xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0">
+  <channel>
+    <title><![CDATA[Feed Title]]></title>
+    <link>http://magento.com/rss/link</link>
+    <description><![CDATA[Feed Description]]></description>
+    <pubDate>Sat, 22 Apr 2017 13:21:12 +0200</pubDate>
+    <generator>Zend\Feed</generator>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <item>
+      <title><![CDATA[Feed 1 Title]]></title>
+      <link>http://magento.com/rss/link/id/1</link>
+      <description><![CDATA[Feed 1 Description]]></description>
+      <pubDate>Sat, 22 Apr 2017 13:21:12 +0200</pubDate>
+    </item>
+  </channel>
+</rss>';
+
     /**
      * @var ObjectManagerHelper
      */
@@ -43,6 +64,16 @@ class RssTest extends \PHPUnit\Framework\TestCase
      */
     private $cacheMock;
 
+    /**
+     * @var \Magento\Framework\App\FeedFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $feedFactoryMock;
+
+    /**
+     * @var \Magento\Framework\App\FeedInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $feedMock;
+
     /**
      * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -52,11 +83,15 @@ protected function setUp()
     {
         $this->cacheMock = $this->createMock(\Magento\Framework\App\CacheInterface::class);
         $this->serializerMock = $this->createMock(SerializerInterface::class);
+        $this->feedFactoryMock = $this->createMock(\Magento\Framework\App\FeedFactoryInterface::class);
+        $this->feedMock = $this->createMock(\Magento\Framework\App\FeedInterface::class);
+
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->rss = $this->objectManagerHelper->getObject(
             \Magento\Rss\Model\Rss::class,
             [
                 'cache' => $this->cacheMock,
+                'feedFactory' => $this->feedFactoryMock,
                 'serializer' => $this->serializerMock
             ]
         );
@@ -116,14 +151,16 @@ public function testCreateRssXml()
         $dataProvider->expects($this->any())->method('getCacheLifetime')->will($this->returnValue(100));
         $dataProvider->expects($this->any())->method('getRssData')->will($this->returnValue($this->feedData));
 
+        $this->feedMock->expects($this->once())
+            ->method('getFormattedContent')
+            ->willReturn($this->feedXml);
+
+        $this->feedFactoryMock->expects($this->once())
+            ->method('create')
+            ->with($this->feedData, \Magento\Framework\App\FeedFactoryInterface::FORMAT_RSS)
+            ->will($this->returnValue($this->feedMock));
+
         $this->rss->setDataProvider($dataProvider);
-        $result = $this->rss->createRssXml();
-        $this->assertContains('<?xml version="1.0" encoding="UTF-8"?>', $result);
-        $this->assertContains('<title>Feed Title</title>', $result);
-        $this->assertContains('<title>Feed 1 Title</title>', $result);
-        $this->assertContains('<link>http://magento.com/rss/link</link>', $result);
-        $this->assertContains('<link>http://magento.com/rss/link/id/1</link>', $result);
-        $this->assertContains('<description>Feed Description</description>', $result);
-        $this->assertContains('<description><![CDATA[Feed 1 Description]]></description>', $result);
+        $this->assertNotNull($this->rss->createRssXml());
     }
 }
diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
index 01e715f06a27f..e3bec2d9959b1 100644
--- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
+++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
@@ -24,7 +24,6 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
 {
     /**
      * Defines which operators will be available for this condition
-     *
      * @var string
      */
     protected $_inputType = null;
@@ -84,17 +83,13 @@ public function __construct(Context $context, array $data = [])
 
         $options = $this->getAttributeOptions();
         if ($options) {
-            foreach (array_keys($options) as $attr) {
-                $this->setAttribute($attr);
-                break;
-            }
+            reset($options);
+            $this->setAttribute(key($options));
         }
         $options = $this->getOperatorOptions();
         if ($options) {
-            foreach (array_keys($options) as $operator) {
-                $this->setOperator($operator);
-                break;
-            }
+            reset($options);
+            $this->setOperator(key($options));
         }
     }
 
@@ -160,14 +155,13 @@ public function getForm()
      */
     public function asArray(array $arrAttributes = [])
     {
-        $out = [
+        return [
             'type' => $this->getType(),
             'attribute' => $this->getAttribute(),
             'operator' => $this->getOperator(),
             'value' => $this->getValue(),
             'is_value_processed' => $this->getIsValueParsed(),
         ];
-        return $out;
     }
 
     /**
@@ -205,7 +199,7 @@ public function getMappedSqlField()
      */
     public function asXml()
     {
-        $xml = "<type>" .
+        return "<type>" .
             $this->getType() .
             "</type>" .
             "<attribute>" .
@@ -217,7 +211,6 @@ public function asXml()
             "<value>" .
             $this->getValue() .
             "</value>";
-        return $xml;
     }
 
     /**
@@ -244,8 +237,7 @@ public function loadXml($xml)
         if (is_string($xml)) {
             $xml = simplexml_load_string($xml);
         }
-        $arr = (array)$xml;
-        $this->loadArray($arr);
+        $this->loadArray((array)$xml);
         return $this;
     }
 
@@ -304,10 +296,7 @@ public function loadOperatorOptions()
      */
     public function getInputType()
     {
-        if (null === $this->_inputType) {
-            return 'string';
-        }
-        return $this->_inputType;
+        return null === $this->_inputType ? 'string' : $this->_inputType;
     }
 
     /**
@@ -348,12 +337,11 @@ public function loadValueOptions()
      */
     public function getValueSelectOptions()
     {
-        $valueOption = $opt = [];
+        $opt = [];
         if ($this->hasValueOption()) {
-            $valueOption = (array)$this->getValueOption();
-        }
-        foreach ($valueOption as $key => $value) {
-            $opt[] = ['value' => $key, 'label' => $value];
+            foreach ((array)$this->getValueOption() as $key => $value) {
+                $opt[] = ['value' => $key, 'label' => $value];
+            }
         }
         return $opt;
     }
@@ -470,13 +458,12 @@ public function getNewChildName()
      */
     public function asHtml()
     {
-        $html = $this->getTypeElementHtml() .
+        return $this->getTypeElementHtml() .
             $this->getAttributeElementHtml() .
             $this->getOperatorElementHtml() .
             $this->getValueElementHtml() .
             $this->getRemoveLinkHtml() .
             $this->getChooserContainerHtml();
-        return $html;
     }
 
     /**
@@ -484,8 +471,7 @@ public function asHtml()
      */
     public function asHtmlRecursive()
     {
-        $html = $this->asHtml();
-        return $html;
+        return $this->asHtml();
     }
 
     /**
@@ -520,9 +506,10 @@ public function getTypeElementHtml()
     public function getAttributeElement()
     {
         if (null === $this->getAttribute()) {
-            foreach (array_keys($this->getAttributeOption()) as $option) {
-                $this->setAttribute($option);
-                break;
+            $options = $this->getAttributeOption();
+            if ($options) {
+                reset($options);
+                $this->setAttribute(key($options));
             }
         }
         return $this->getForm()->addField(
@@ -558,10 +545,8 @@ public function getOperatorElement()
     {
         $options = $this->getOperatorSelectOptions();
         if ($this->getOperator() === null) {
-            foreach ($options as $option) {
-                $this->setOperator($option['value']);
-                break;
-            }
+            $option = reset($options);
+            $this->setOperator($option['value']);
         }
 
         $elementId = sprintf('%s__%s__operator', $this->getPrefix(), $this->getId());
@@ -654,8 +639,7 @@ public function getValueElementHtml()
     public function getAddLinkHtml()
     {
         $src = $this->_assetRepo->getUrl('images/rule_component_add.gif');
-        $html = '<img src="' . $src . '" class="rule-param-add v-middle" alt="" title="' . __('Add') . '"/>';
-        return $html;
+        return '<img src="' . $src . '" class="rule-param-add v-middle" alt="" title="' . __('Add') . '"/>';
     }
 
     /**
@@ -676,11 +660,7 @@ public function getRemoveLinkHtml()
     public function getChooserContainerHtml()
     {
         $url = $this->getValueElementChooserUrl();
-        $html = '';
-        if ($url) {
-            $html = '<div class="rule-chooser" url="' . $url . '"></div>';
-        }
-        return $html;
+        return $url ? '<div class="rule-chooser" url="' . $url . '"></div>' : '';
     }
 
     /**
@@ -690,8 +670,7 @@ public function getChooserContainerHtml()
      */
     public function asString($format = '')
     {
-        $str = $this->getAttributeName() . ' ' . $this->getOperatorName() . ' ' . $this->getValueName();
-        return $str;
+        return $this->getAttributeName() . ' ' . $this->getOperatorName() . ' ' . $this->getValueName();
     }
 
     /**
@@ -700,8 +679,7 @@ public function asString($format = '')
      */
     public function asStringRecursive($level = 0)
     {
-        $str = str_pad('', $level * 3, ' ', STR_PAD_LEFT) . $this->asString();
-        return $str;
+        return str_pad('', $level * 3, ' ', STR_PAD_LEFT) . $this->asString();
     }
 
     /**
@@ -740,12 +718,10 @@ public function validateAttribute($validatedValue)
             case '==':
             case '!=':
                 if (is_array($value)) {
-                    if (is_array($validatedValue)) {
-                        $result = array_intersect($value, $validatedValue);
-                        $result = !empty($result);
-                    } else {
+                    if (!is_array($validatedValue)) {
                         return false;
                     }
+                    $result = !empty(array_intersect($value, $validatedValue));
                 } else {
                     if (is_array($validatedValue)) {
                         $result = count($validatedValue) == 1 && array_shift($validatedValue) == $value;
@@ -759,18 +735,16 @@ public function validateAttribute($validatedValue)
             case '>':
                 if (!is_scalar($validatedValue)) {
                     return false;
-                } else {
-                    $result = $validatedValue <= $value;
                 }
+                $result = $validatedValue <= $value;
                 break;
 
             case '>=':
             case '<':
                 if (!is_scalar($validatedValue)) {
                     return false;
-                } else {
-                    $result = $validatedValue >= $value;
                 }
+                $result = $validatedValue >= $value;
                 break;
 
             case '{}':
@@ -783,12 +757,11 @@ public function validateAttribute($validatedValue)
                         }
                     }
                 } elseif (is_array($value)) {
-                    if (is_array($validatedValue)) {
-                        $result = array_intersect($value, $validatedValue);
-                        $result = !empty($result);
-                    } else {
+                    if (!is_array($validatedValue)) {
                         return false;
                     }
+                    $result = array_intersect($value, $validatedValue);
+                    $result = !empty($result);
                 } else {
                     if (is_array($validatedValue)) {
                         $result = in_array($value, $validatedValue);
@@ -833,13 +806,13 @@ protected function _compareValues($validatedValue, $value, $strict = true)
     {
         if ($strict && is_numeric($validatedValue) && is_numeric($value)) {
             return $validatedValue == $value;
-        } else {
-            $validatePattern = preg_quote($validatedValue, '~');
-            if ($strict) {
-                $validatePattern = '^' . $validatePattern . '$';
-            }
-            return (bool)preg_match('~' . $validatePattern . '~iu', $value);
         }
+
+        $validatePattern = preg_quote($validatedValue, '~');
+        if ($strict) {
+            $validatePattern = '^' . $validatePattern . '$';
+        }
+        return (bool)preg_match('~' . $validatePattern . '~iu', $value);
     }
 
     /**
diff --git a/app/code/Magento/Rule/view/adminhtml/web/rules.js b/app/code/Magento/Rule/view/adminhtml/web/rules.js
index 5c4be367b9cb3..b094b9818364a 100644
--- a/app/code/Magento/Rule/view/adminhtml/web/rules.js
+++ b/app/code/Magento/Rule/view/adminhtml/web/rules.js
@@ -137,7 +137,7 @@ define([
                 },
                 onSuccess: function (transport) {
                     if (this._processSuccess(transport)) {
-                        $(chooser).update(transport.responseText);
+                        jQuery(chooser).html(transport.responseText);
                         this.showChooserLoaded(chooser, transport);
                         jQuery(chooser).trigger('contentUpdated');
                     }
diff --git a/app/code/Magento/Sales/Model/Order/ItemRepository.php b/app/code/Magento/Sales/Model/Order/ItemRepository.php
index f1bbb7d39469b..7916eb9db2b80 100644
--- a/app/code/Magento/Sales/Model/Order/ItemRepository.php
+++ b/app/code/Magento/Sales/Model/Order/ItemRepository.php
@@ -117,6 +117,7 @@ public function get($id)
             }
 
             $this->addProductOption($orderItem);
+            $this->addParentItem($orderItem);
             $this->registry[$id] = $orderItem;
         }
         return $this->registry[$id];
@@ -216,6 +217,20 @@ protected function addProductOption(OrderItemInterface $orderItem)
         return $this;
     }
 
+    /**
+     * Set parent item.
+     *
+     * @param OrderItemInterface $orderItem
+     * @throws InputException
+     * @throws NoSuchEntityException
+     */
+    private function addParentItem(OrderItemInterface $orderItem)
+    {
+        if ($parentId = $orderItem->getParentItemId()) {
+            $orderItem->setParentItem($this->get($parentId));
+        }
+    }
+
     /**
      * Set product options data
      *
diff --git a/app/code/Magento/Sales/Model/OrderIncrementIdChecker.php b/app/code/Magento/Sales/Model/OrderIncrementIdChecker.php
new file mode 100644
index 0000000000000..0af61835a9c9b
--- /dev/null
+++ b/app/code/Magento/Sales/Model/OrderIncrementIdChecker.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model;
+
+/**
+ * This class uses for checking if reserved order id was already used for some order.
+ */
+class OrderIncrementIdChecker
+{
+    /**
+     * @var ResourceModel\Order
+     */
+    private $resourceModel;
+
+    /**
+     * @param ResourceModel\Order $resourceModel
+     */
+    public function __construct(ResourceModel\Order $resourceModel)
+    {
+        $this->resourceModel = $resourceModel;
+    }
+
+    /**
+     * Check if order increment ID is already used.
+     *
+     * Method can be used to avoid collisions of order IDs.
+     *
+     * @param string|int $orderIncrementId
+     * @return bool
+     */
+    public function isIncrementIdUsed($orderIncrementId): bool
+    {
+        /** @var  \Magento\Framework\DB\Adapter\AdapterInterface $adapter */
+        $adapter = $this->resourceModel->getConnection();
+        $bind = [':increment_id' => $orderIncrementId];
+        /** @var \Magento\Framework\DB\Select $select */
+        $select = $adapter->select();
+        $select->from($this->resourceModel->getMainTable(), $this->resourceModel->getIdFieldName())
+            ->where('increment_id = :increment_id');
+        $entity_id = $adapter->fetchOne($select, $bind);
+        if ($entity_id > 0) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderIncrementIdCheckerTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderIncrementIdCheckerTest.php
new file mode 100644
index 0000000000000..e53cb7bfdf8c6
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderIncrementIdCheckerTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model;
+
+/**
+ * Unit test for \Magento\Sales\Model\OrderIncrementIdChecker.
+ */
+class OrderIncrementIdCheckerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceMock;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\Pdo\Mysql|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapterMock;
+
+    /**
+     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $this->selectMock->expects($this->any())->method('from')->will($this->returnSelf());
+        $this->selectMock->expects($this->any())->method('where');
+
+        $this->adapterMock = $this->createMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class);
+        $this->adapterMock->expects($this->any())->method('select')->will($this->returnValue($this->selectMock));
+
+        $this->resourceMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order::class);
+        $this->resourceMock->expects($this->any())->method('getConnection')->willReturn($this->adapterMock);
+
+        $this->model = $objectManagerHelper->getObject(
+            \Magento\Sales\Model\OrderIncrementIdChecker::class,
+            [
+                'resourceModel' => $this->resourceMock,
+            ]
+        );
+    }
+
+    /**
+     * Unit test to verify if isOrderIncrementIdUsed method works with different types increment ids.
+     *
+     * @param string|int $value
+     * @return void
+     * @dataProvider isOrderIncrementIdUsedDataProvider
+     */
+    public function testIsIncrementIdUsed($value): void
+    {
+        $expectedBind = [':increment_id' => $value];
+        $this->adapterMock->expects($this->once())->method('fetchOne')->with($this->selectMock, $expectedBind);
+        $this->model->isIncrementIdUsed($value);
+    }
+
+    /**
+     * @return array
+     */
+    public function isOrderIncrementIdUsedDataProvider(): array
+    {
+        return [[100000001], ['10000000001'], ['M10000000001']];
+    }
+}
diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml
index 8c91a8b5fbc13..4b716e761094c 100644
--- a/app/code/Magento/Sales/etc/db_schema.xml
+++ b/app/code/Magento/Sales/etc/db_schema.xml
@@ -216,7 +216,7 @@
         <column xsi:type="varchar" name="relation_parent_id" nullable="true" length="32" comment="Relation Parent Id"/>
         <column xsi:type="varchar" name="relation_parent_real_id" nullable="true" length="32"
                 comment="Relation Parent Real Id"/>
-        <column xsi:type="varchar" name="remote_ip" nullable="true" length="32" comment="Remote Ip"/>
+        <column xsi:type="varchar" name="remote_ip" nullable="true" length="45" comment="Remote Ip"/>
         <column xsi:type="varchar" name="shipping_method" nullable="true" length="120"/>
         <column xsi:type="varchar" name="store_currency_code" nullable="true" length="3" comment="Store Currency Code"/>
         <column xsi:type="varchar" name="store_name" nullable="true" length="32" comment="Store Name"/>
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
new file mode 100644
index 0000000000000..f413a7d047d62
--- /dev/null
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Controller\Adminhtml\Promo\Widget;
+
+/**
+ * Class for generation of JSON for building tree catalog.
+ *
+ * Examples of use:
+ * \Magento\Catalog\Block\Adminhtml\Category\Tree::getLoadTreeUrl
+ * \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser::getLoadTreeUrl
+ */
+class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget\CategoriesJson
+{
+    /**
+     * Authorization level of a basic admin session.
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_SalesRule::quote';
+}
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
index 1d86ec2b01b35..c89677f0e9097 100644
--- a/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
+++ b/app/code/Magento/SalesRule/Model/Coupon/Codegenerator.php
@@ -38,7 +38,7 @@ public function generateCode()
         $length = $this->getActualLength();
         $code = '';
         for ($i = 0, $indexMax = strlen($alphabet) - 1; $i < $length; ++$i) {
-            $code .= substr($alphabet, mt_rand(0, $indexMax), 1);
+            $code .= substr($alphabet, random_int(0, $indexMax), 1);
         }
 
         return $code;
@@ -54,7 +54,7 @@ protected function getActualLength()
         $lengthMin = $this->getLengthMin() ? $this->getLengthMin() : static::DEFAULT_LENGTH_MIN;
         $lengthMax = $this->getLengthMax() ? $this->getLengthMax() : static::DEFAULT_LENGTH_MAX;
 
-        return $this->getLength() ? $this->getLength() : mt_rand($lengthMin, $lengthMax);
+        return $this->getLength() ? $this->getLength() : random_int($lengthMin, $lengthMax);
     }
 
     /**
diff --git a/app/code/Magento/SalesRule/Model/DeltaPriceRound.php b/app/code/Magento/SalesRule/Model/DeltaPriceRound.php
new file mode 100644
index 0000000000000..b080a93ee4c9f
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/DeltaPriceRound.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model;
+
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+
+/**
+ * Round price and save rounding operation delta.
+ */
+class DeltaPriceRound
+{
+    /**
+     * @var PriceCurrencyInterface
+     */
+    private $priceCurrency;
+
+    /**
+     * @var float[]
+     */
+    private $roundingDeltas;
+
+    /**
+     * @param PriceCurrencyInterface $priceCurrency
+     */
+    public function __construct(PriceCurrencyInterface $priceCurrency)
+    {
+        $this->priceCurrency = $priceCurrency;
+    }
+
+    /**
+     * Round price based on previous rounding operation delta.
+     *
+     * @param float $price
+     * @param string $type
+     * @return float
+     */
+    public function round(float $price, string $type): float
+    {
+        if ($price) {
+            // initialize the delta to a small number to avoid non-deterministic behavior with rounding of 0.5
+            $delta = isset($this->roundingDeltas[$type]) ? $this->roundingDeltas[$type] : 0.000001;
+            $price += $delta;
+            $roundPrice = $this->priceCurrency->round($price);
+            $this->roundingDeltas[$type] = $price - $roundPrice;
+            $price = $roundPrice;
+        }
+
+        return $price;
+    }
+
+    /**
+     * Reset all deltas.
+     *
+     * @return void
+     */
+    public function resetAll(): void
+    {
+        $this->roundingDeltas = [];
+    }
+
+    /**
+     * Reset deltas by type.
+     *
+     * @param string $type
+     * @return void
+     */
+    public function reset(string $type): void
+    {
+        if (isset($this->roundingDeltas[$type])) {
+            unset($this->roundingDeltas[$type]);
+        }
+    }
+}
diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
index f4469213bd96e..59efdf5eb3f6d 100644
--- a/app/code/Magento/SalesRule/Model/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Rule.php
@@ -521,7 +521,7 @@ public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
                         $coupon->setCode(
                             $couponCode . self::getCouponCodeGenerator()->getDelimiter() . sprintf(
                                 '%04u',
-                                rand(0, 9999)
+                                random_int(0, 9999)
                             )
                         );
                         continue;
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
index caa938322617d..3cd776fe99f5d 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
@@ -5,6 +5,14 @@
  */
 namespace Magento\SalesRule\Model\Rule\Action\Discount;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\SalesRule\Model\DeltaPriceRound;
+use Magento\SalesRule\Model\Validator;
+
+/**
+ * Calculates discount for cart item if fixed discount applied on whole cart.
+ */
 class CartFixed extends AbstractDiscount
 {
     /**
@@ -14,6 +22,33 @@ class CartFixed extends AbstractDiscount
      */
     protected $_cartFixedRuleUsedForAddress = [];
 
+    /**
+     * @var DeltaPriceRound
+     */
+    private $deltaPriceRound;
+
+    /**
+     * @var string
+     */
+    private static $discountType = 'CartFixed';
+
+    /**
+     * @param Validator $validator
+     * @param DataFactory $discountDataFactory
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param DeltaPriceRound $deltaPriceRound
+     */
+    public function __construct(
+        Validator $validator,
+        DataFactory $discountDataFactory,
+        PriceCurrencyInterface $priceCurrency,
+        DeltaPriceRound $deltaPriceRound
+    ) {
+        $this->deltaPriceRound = $deltaPriceRound;
+
+        parent::__construct($validator, $discountDataFactory, $priceCurrency);
+    }
+
     /**
      * @param \Magento\SalesRule\Model\Rule $rule
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
@@ -51,14 +86,22 @@ public function calculate($rule, $item, $qty)
             $cartRules[$rule->getId()] = $rule->getDiscountAmount();
         }
 
-        if ($cartRules[$rule->getId()] > 0) {
+        $availableDiscountAmount = (float)$cartRules[$rule->getId()];
+        $discountType = self::$discountType . $rule->getId();
+
+        if ($availableDiscountAmount > 0) {
             $store = $quote->getStore();
             if ($ruleTotals['items_count'] <= 1) {
-                $quoteAmount = $this->priceCurrency->convert($cartRules[$rule->getId()], $store);
-                $baseDiscountAmount = min($baseItemPrice * $qty, $cartRules[$rule->getId()]);
+                $quoteAmount = $this->priceCurrency->convert($availableDiscountAmount, $store);
+                $baseDiscountAmount = min($baseItemPrice * $qty, $availableDiscountAmount);
+                $this->deltaPriceRound->reset($discountType);
             } else {
-                $discountRate = $baseItemPrice * $qty / $ruleTotals['base_items_price'];
-                $maximumItemDiscount = $rule->getDiscountAmount() * $discountRate;
+                $ratio = $baseItemPrice * $qty / $ruleTotals['base_items_price'];
+                $maximumItemDiscount = $this->deltaPriceRound->round(
+                    $rule->getDiscountAmount() * $ratio,
+                    $discountType
+                );
+
                 $quoteAmount = $this->priceCurrency->convert($maximumItemDiscount, $store);
 
                 $baseDiscountAmount = min($baseItemPrice * $qty, $maximumItemDiscount);
@@ -67,7 +110,11 @@ public function calculate($rule, $item, $qty)
 
             $baseDiscountAmount = $this->priceCurrency->round($baseDiscountAmount);
 
-            $cartRules[$rule->getId()] -= $baseDiscountAmount;
+            $availableDiscountAmount -= $baseDiscountAmount;
+            $cartRules[$rule->getId()] = $availableDiscountAmount;
+            if ($availableDiscountAmount <= 0) {
+                $this->deltaPriceRound->reset($discountType);
+            }
 
             $discountData->setAmount($this->priceCurrency->round(min($itemPrice * $qty, $quoteAmount)));
             $discountData->setBaseAmount($baseDiscountAmount);
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/DeltaPriceRoundTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/DeltaPriceRoundTest.php
new file mode 100644
index 0000000000000..d67dab5baf63b
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/DeltaPriceRoundTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Test\Unit\Model;
+
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\SalesRule\Model\DeltaPriceRound;
+
+/**
+ * Tests for Magento\SalesRule\Model\DeltaPriceRound.
+ */
+class DeltaPriceRoundTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $priceCurrency;
+
+    /**
+     * @var DeltaPriceRound
+     */
+    private $model;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->priceCurrency = $this->getMockForAbstractClass(PriceCurrencyInterface::class);
+        $this->priceCurrency->method('round')
+            ->willReturnCallback(
+                function ($amount) {
+                    return round($amount, 2);
+                }
+            );
+
+        $this->model = new DeltaPriceRound($this->priceCurrency);
+    }
+
+    /**
+     * Tests rounded price based on previous rounding operation delta.
+     *
+     * @param array $prices
+     * @param array $roundedPrices
+     * @return void
+     * @dataProvider roundDataProvider
+     */
+    public function testRound(array $prices, array $roundedPrices): void
+    {
+        foreach ($prices as $key => $price) {
+            $roundedPrice = $this->model->round($price, 'test');
+            $this->assertEquals($roundedPrices[$key], $roundedPrice);
+        }
+
+        $this->model->reset('test');
+    }
+
+    /**
+     * @return array
+     */
+    public function roundDataProvider(): array
+    {
+        return [
+            [
+                'prices' => [1.004, 1.004],
+                'rounded prices' => [1.00, 1.01],
+            ],
+            [
+                'prices' => [1.005, 1.005],
+                'rounded prices' => [1.01, 1.0],
+            ],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    public function testReset(): void
+    {
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test'));
+        $this->model->reset('test');
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test'));
+    }
+
+    /**
+     * @return void
+     */
+    public function testResetAll(): void
+    {
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test1'));
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test2'));
+
+        $this->model->resetAll();
+
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test1'));
+        $this->assertEquals(1.44, $this->model->round(1.444, 'test2'));
+    }
+}
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php
index 2f1bee9fc686a..13f26124c464d 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php
@@ -5,48 +5,56 @@
  */
 namespace Magento\SalesRule\Test\Unit\Model\Rule\Action\Discount;
 
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Tests for Magento\SalesRule\Model\Rule\Action\Discount\CartFixed.
+ */
 class CartFixedTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\SalesRule\Model\Rule|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Rule|MockObject
      */
     protected $rule;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote\Item\AbstractItem|MockObject
      */
     protected $item;
 
     /**
-     * @var \Magento\SalesRule\Model\Validator|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Validator|MockObject
      */
     protected $validator;
 
     /**
-     * @var \Magento\SalesRule\Model\Rule\Action\Discount\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Rule\Action\Discount\Data|MockObject
      */
     protected $data;
 
     /**
-     * @var \Magento\Quote\Model\Quote|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote|MockObject
      */
     protected $quote;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote\Address|MockObject
      */
     protected $address;
 
     /**
-     * @var CartFixed
+     * @var \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed
      */
     protected $model;
 
     /**
-     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|MockObject
      */
     protected $priceCurrency;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->rule = $this->getMockBuilder(\Magento\Framework\DataObject::class)
@@ -66,18 +74,23 @@ protected function setUp()
         $this->item->expects($this->any())->method('getAddress')->will($this->returnValue($this->address));
 
         $this->validator = $this->createMock(\Magento\SalesRule\Model\Validator::class);
+        /** @var \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory|MockObject $dataFactory */
         $dataFactory = $this->createPartialMock(
             \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory::class,
             ['create']
         );
         $dataFactory->expects($this->any())->method('create')->will($this->returnValue($this->data));
-        $this->priceCurrency = $this->getMockBuilder(
-            \Magento\Framework\Pricing\PriceCurrencyInterface::class
-        )->getMock();
+        $this->priceCurrency = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)
+            ->getMock();
+        $deltaPriceRound = $this->getMockBuilder(\Magento\SalesRule\Model\DeltaPriceRound::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = new \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed(
             $this->validator,
             $dataFactory,
-            $this->priceCurrency
+            $this->priceCurrency,
+            $deltaPriceRound
         );
     }
 
diff --git a/app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml b/app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml
index 4152c06fa3ddc..2fdf5f3cd0ea9 100644
--- a/app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml
+++ b/app/code/Magento/Swatches/view/adminhtml/ui_component/product_attribute_add_form.xml
@@ -87,7 +87,6 @@
                 <additionalClasses>
                     <class name="admin__field-wide">true</class>
                 </additionalClasses>
-                <dataScope>text_swatch</dataScope>
                 <componentType>dynamicRows</componentType>
             </settings>
             <container name="record" component="Magento_Ui/js/dynamic-rows/record">
@@ -96,8 +95,6 @@
                         <item name="isTemplate" xsi:type="boolean">true</item>
                         <item name="is_collection" xsi:type="boolean">true</item>
                         <item name="componentType" xsi:type="string">container</item>
-                        <item name="positionProvider" xsi:type="string">text_swatch.position</item>
-                        <item name="dataScope" xsi:type="string"/>
                     </item>
                 </argument>
                 <field name="defaulttext" component="Magento_Catalog/js/form/element/checkbox" sortOrder="0" formElement="checkbox">
@@ -183,15 +180,11 @@
                         </item>
                     </argument>
                     <settings>
-                        <additionalClasses>
-                            <class name="_hidden">true</class>
-                        </additionalClasses>
                         <dataType>text</dataType>
                         <visible>false</visible>
-                        <dataScope>position</dataScope>
                     </settings>
                 </field>
-                <actionDelete name="action_delete" component="Magento_Catalog/js/form/element/action-delete" template="Magento_Catalog/form/element/action-delete">
+                <actionDelete name="action_delete">
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="fit" xsi:type="boolean">true</item>
@@ -227,7 +220,6 @@
                     <class name="swatch-visual-options-container">true</class>
                     <class name="admin__field-wide">true</class>
                 </additionalClasses>
-                <dataScope>visual_swatch</dataScope>
                 <componentType>dynamicRows</componentType>
             </settings>
             <container name="record" component="Magento_Ui/js/dynamic-rows/record">
@@ -236,8 +228,6 @@
                         <item name="isTemplate" xsi:type="boolean">true</item>
                         <item name="is_collection" xsi:type="boolean">true</item>
                         <item name="componentType" xsi:type="string">container</item>
-                        <item name="positionProvider" xsi:type="string">text_swatch.position</item>
-                        <item name="dataScope" xsi:type="string"/>
                     </item>
                 </argument>
                 <field name="defaultvisual" component="Magento_Catalog/js/form/element/checkbox" sortOrder="0" formElement="checkbox">
@@ -276,7 +266,6 @@
                             <class name="swatches-visual-col">true</class>
                         </additionalClasses>
                         <label translate="true">Swatch</label>
-                        <dataScope>swatchvisual</dataScope>
                     </settings>
                 </field>
                 <field name="optionvisual_default_store_view" component="Magento_Catalog/js/form/element/input" template="Magento_Catalog/form/element/input" formElement="input">
@@ -290,7 +279,6 @@
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Default Store View</label>
-                        <dataScope>optionvisual_default_store_view</dataScope>
                     </settings>
                 </field>
                 <field name="optionvisual_admin" component="Magento_Catalog/js/form/element/input" template="Magento_Catalog/form/element/input" formElement="input">
@@ -304,7 +292,6 @@
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Admin</label>
-                        <dataScope>optionvisual_admin</dataScope>
                     </settings>
                 </field>
                 <field name="position" component="Magento_Catalog/js/form/element/input" formElement="input">
@@ -315,15 +302,10 @@
                         </item>
                     </argument>
                     <settings>
-                        <additionalClasses>
-                            <class name="_hidden">true</class>
-                        </additionalClasses>
-                        <dataType>text</dataType>
-                        <visible>false</visible>
-                        <dataScope>position</dataScope>
+                         <visible>false</visible>
                     </settings>
                 </field>
-                <actionDelete name="action_delete" component="Magento_Catalog/js/form/element/action-delete" template="Magento_Catalog/form/element/action-delete">
+                <actionDelete name="action_delete">
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="fit" xsi:type="boolean">true</item>
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js b/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js
index e63c9a2138a36..2fbce5aefbdeb 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js
+++ b/app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js
@@ -305,18 +305,30 @@ define([
          */
         initialize: function () {
             this._super()
-                .initOldCode();
+                .initOldCode()
+                .on('value', this.onChangeColor.bind(this));
 
             return this;
         },
 
+        /**
+         * Handler function that execute when color changes.
+         *
+         * @param {String} data - color
+         */
+        onChangeColor: function (data) {
+            if (!data) {
+                jQuery('.' + this.elementName).parent().removeClass('unavailable');
+            }
+        },
+
         /**
          * Initialize wrapped former implementation.
          *
          * @returns {Object} Chainable.
          */
         initOldCode: function () {
-            jQuery.async('.' + this.elementName, function (elem) {
+            jQuery.async('.' + this.elementName, this.name, function (elem) {
                 oldCode(this.value(), elem.parentElement, this.uploadUrl, this.elementName);
             }.bind(this));
 
@@ -336,9 +348,15 @@ define([
             this.elementName = this.prefixElementName + recordId;
 
             this.inputName = prefixName + '[' + this.elementName + ']';
-            this.dataScope = 'data.' + this.prefixName + '.' + this.elementName;
+            this.exportDataLink = 'data.' + this.prefixName + '.' + this.elementName;
+            this.exports.value = this.provider + ':' + this.exportDataLink;
+        },
+
+        /** @inheritdoc */
+        destroy: function () {
+            this._super();
 
-            this.links.value = this.provider + ':' + this.dataScope;
+            this.source.remove(this.exportDataLink);
         },
 
         /**
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/template/swatch-visual.html b/app/code/Magento/Swatches/view/adminhtml/web/template/swatch-visual.html
index 271cea918b7be..8296e944a8ed3 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/template/swatch-visual.html
+++ b/app/code/Magento/Swatches/view/adminhtml/web/template/swatch-visual.html
@@ -11,7 +11,7 @@
     },
     value: value
 "/>
-<div data-bind="attr: {class: 'swatch_window ' + elementName}"></div>
+<div attr="class: 'swatch_window ' + elementName" ko-style="backgroundColor: $data.value"></div>
 <div class="swatch_sub-menu_container">
     <div class="swatch_row position-relative">
         <div class="swatch_row_name colorpicker_handler">
diff --git a/app/code/Magento/Tax/i18n/en_US.csv b/app/code/Magento/Tax/i18n/en_US.csv
index 2314f27b92928..e6d89deb7696c 100644
--- a/app/code/Magento/Tax/i18n/en_US.csv
+++ b/app/code/Magento/Tax/i18n/en_US.csv
@@ -176,4 +176,5 @@ Rate,Rate
 "Order Total Incl. Tax","Order Total Incl. Tax"
 "Order Total","Order Total"
 "Your credit card will be charged for","Your credit card will be charged for"
-"An error occurred while loading tax rates.","An error occurred while loading tax rates."
\ No newline at end of file
+"An error occurred while loading tax rates.","An error occurred while loading tax rates."
+"You will be charged for","You will be charged for"
diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml
index 41afddb8fa4e1..8f60ba15d8a1a 100644
--- a/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml
@@ -70,7 +70,7 @@
                                                             <item name="config" xsi:type="array">
                                                                 <item name="exclTaxLabel" xsi:type="string" translate="true">Order Total Excl. Tax</item>
                                                                 <item name="inclTaxLabel" xsi:type="string" translate="true">Order Total Incl. Tax</item>
-                                                                <item name="basicCurrencyMessage" xsi:type="string" translate="true">Your credit card will be charged for</item>
+                                                                <item name="basicCurrencyMessage" xsi:type="string" translate="true">You will be charged for</item>
                                                                 <item name="title" xsi:type="string" translate="true">Order Total</item>
                                                             </item>
                                                         </item>
diff --git a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
index fd5e9628fecdb..474861a523878 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
@@ -480,7 +480,9 @@ define([
          * @param {String} directive
          */
         makeDirectiveUrl: function (directive) {
-            return this.config['directives_url'].replace(/directive.*/, 'directive/___directive/' + directive);
+            return this.config['directives_url']
+                .replace(/directive/, 'directive/___directive/' + directive)
+                .replace(/\/$/, '');
         },
 
         /**
@@ -537,12 +539,18 @@ define([
          * @return {*}
          */
         decodeDirectives: function (content) {
-            // escape special chars in directives url to use it in regular expression
-            var url = this.makeDirectiveUrl('%directive%').replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'),
-                reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9%,_-]+)\/?'));
-
-            return content.gsub(reg, function (match) { //eslint-disable-line no-extra-bind
-                return Base64.mageDecode(decodeURIComponent(match[1])).replace(/"/g, '&quot;');
+            var directiveUrl = this.makeDirectiveUrl('%directive%').split('?')[0], // remove query string from directive
+                // escape special chars in directives url to use in regular expression
+                regexEscapedDirectiveUrl = directiveUrl.replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'),
+                regexDirectiveUrl = regexEscapedDirectiveUrl
+                    .replace(
+                        '%directive%',
+                        '([a-zA-Z0-9,_-]+(?:%2[A-Z]|)+\/?)(?:(?!").)*'
+                    ) + '/?(\\\\?[^"]*)?', // allow optional query string
+                reg = new RegExp(regexDirectiveUrl);
+
+            return content.gsub(reg, function (match) {
+                return Base64.mageDecode(decodeURIComponent(match[1]).replace(/\/$/, '')).replace(/"/g, '&quot;');
             });
         },
 
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php
index 691c6bfdd420c..aee81f65775bc 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php
@@ -64,7 +64,10 @@ public function getComponentName()
     public function prepare()
     {
         // dynamically set max file size based on php ini config if not present in XML
-        $maxFileSize = $this->getConfiguration()['maxFileSize'] ?? $this->fileSize->getMaxFileSize();
+        $maxFileSize = min(array_filter([
+            $this->getConfiguration()['maxFileSize'] ?? 0,
+            $this->fileSize->getMaxFileSize()
+        ]));
 
         $data = array_replace_recursive(
             $this->getData(),
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/Media/ImageTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/Media/ImageTest.php
new file mode 100644
index 0000000000000..ebe4d10475cc9
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/Media/ImageTest.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Test\Unit\Component\Form\Element\DataType\Media;
+
+use Magento\Ui\Component\Form\Element\DataType\Media\Image;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Framework\File\Size;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class ImageTest extends \Magento\Ui\Test\Unit\Component\Form\Element\DataType\MediaTest
+{
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $store;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var Size|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileSize;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Image
+     */
+    private $image;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->context->expects($this->atLeastOnce())->method('getProcessor')->willReturn($this->processor);
+
+        $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
+
+        $this->store = $this->getMockBuilder(StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->store->expects($this->any())->method('getId')->willReturn(0);
+
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($this->store);
+
+        $this->fileSize = $this->getMockBuilder(Size::class)->getMock();
+
+        $this->objectManager = new ObjectManager($this);
+
+        $this->image = $this->objectManager->getObject(Image::class, [
+            'context' => $this->context,
+            'storeManager' => $this->storeManager,
+            'fileSize' => $this->fileSize
+        ]);
+
+        $this->image->setData([
+            'config' => [
+                'initialMediaGalleryOpenSubpath' => 'open/sesame',
+            ],
+        ]);
+    }
+
+    /**
+     * @dataProvider prepareDataProvider
+     */
+    public function testPrepare()
+    {
+        $this->assertExpectedPreparedConfiguration(...func_get_args());
+    }
+
+    /**
+     * Data provider for testPrepare
+     * @return array
+     */
+    public function prepareDataProvider(): array
+    {
+        return [
+            [['maxFileSize' => 10], 10, ['maxFileSize' => 10]],
+            [['maxFileSize' => null], 10, ['maxFileSize' => 10]],
+            [['maxFileSize' => 10], 5, ['maxFileSize' => 5]],
+            [['maxFileSize' => 10], 20, ['maxFileSize' => 10]],
+            [['maxFileSize' => 0], 10, ['maxFileSize' => 10]],
+        ];
+    }
+
+    /**
+     * @param array $initialConfig
+     * @param int $maxFileSizeSupported
+     * @param array $expectedPreparedConfig
+     */
+    private function assertExpectedPreparedConfiguration(
+        array $initialConfig,
+        int $maxFileSizeSupported,
+        array $expectedPreparedConfig
+    ) {
+        $this->image->setData(array_merge_recursive(['config' => $initialConfig], $this->image->getData()));
+
+        $this->fileSize->expects($this->any())->method('getMaxFileSize')->willReturn($maxFileSizeSupported);
+
+        $this->image->prepare();
+
+        $actualRelevantPreparedConfig = array_intersect_key($this->image->getConfiguration(), $initialConfig);
+
+        $this->assertEquals(
+            $expectedPreparedConfig,
+            $actualRelevantPreparedConfig
+        );
+    }
+}
diff --git a/app/code/Magento/Ui/etc/di.xml b/app/code/Magento/Ui/etc/di.xml
index 8cf0e1e12e781..c029e18addf73 100644
--- a/app/code/Magento/Ui/etc/di.xml
+++ b/app/code/Magento/Ui/etc/di.xml
@@ -252,6 +252,7 @@
     <type name="Magento\Framework\Data\Argument\Interpreter\Composite">
         <arguments>
             <argument name="interpreters" xsi:type="array">
+                <item name="const" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Constant</item>
                 <item name="object" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="configurableObject" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="array" xsi:type="object">arrayArgumentInterpreterProxy</item>
diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd
index 6847f226dd609..b839593a38f47 100644
--- a/app/code/Magento/Ui/etc/ui_configuration.xsd
+++ b/app/code/Magento/Ui/etc/ui_configuration.xsd
@@ -209,6 +209,30 @@
         </xs:choice>
     </xs:group>
 
+    <xs:group name="formElementsConfig">
+        <xs:choice>
+            <xs:element name="hidden" type="formElementHidden" maxOccurs="unbounded"/>
+            <xs:element name="file" type="formElementFile" maxOccurs="unbounded"/>
+            <xs:element name="input" type="formElementInput" maxOccurs="unbounded"/>
+            <xs:element name="date" type="formElementDate" maxOccurs="unbounded"/>
+            <xs:element name="boolean" type="formElementBoolean" maxOccurs="unbounded"/>
+            <xs:element name="checkbox" type="formElementCheckbox" maxOccurs="unbounded"/>
+            <xs:element name="checkboxset" type="formElementCheckboxset" maxOccurs="unbounded"/>
+            <xs:element name="email" type="formElementEmail" maxOccurs="unbounded"/>
+            <xs:element name="colorPicker" type="formElementColorPicker" maxOccurs="unbounded"/>
+            <xs:element name="select" type="formElementSelect" maxOccurs="unbounded"/>
+            <xs:element name="multiselect" type="formElementMultiselect" maxOccurs="unbounded"/>
+            <xs:element name="text" type="formElementText" maxOccurs="unbounded"/>
+            <xs:element name="textarea" type="formElementTextarea" maxOccurs="unbounded"/>
+            <xs:element name="price" type="formElementPrice" maxOccurs="unbounded"/>
+            <xs:element name="radioset" type="formElementRadioset" maxOccurs="unbounded"/>
+            <xs:element name="wysiwyg" type="formElementWysiwyg" maxOccurs="unbounded"/>
+            <xs:element name="fileUploader" type="formElementFileUploader" maxOccurs="unbounded"/>
+            <xs:element name="imageUploader" type="formElementImageUploader" maxOccurs="unbounded"/>
+            <xs:element name="button" type="formElementButton" maxOccurs="unbounded"/>
+        </xs:choice>
+    </xs:group>
+
     <xs:complexType name="componentListingConfigured">
         <xs:complexContent>
             <xs:extension base="componentListing">
@@ -287,7 +311,7 @@
                         </xs:annotation>
                         <xs:complexType>
                             <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:group ref="formElements"/>
+                                <xs:group ref="formElementsConfig"/>
                             </xs:choice>
                         </xs:complexType>
                     </xs:element>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
index 7cc33cf4351df..21ca445a4177b 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentBoolean">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice maxOccurs="unbounded" minOccurs="0">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentBooleanSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementBoolean">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice maxOccurs="unbounded" minOccurs="0">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentBooleanSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
index f4b4dd403509f..3c9866e6845e7 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
@@ -23,6 +23,19 @@
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
 
+    <xs:complexType name="formElementButton">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentButtonSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
     <xs:group name="componentButtonSettings">
         <xs:choice>
             <xs:group ref="uiElementSettings"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
index 13bc629606470..4dfb074498e5b 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentCheckbox">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentCheckboxSetting"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementCheckbox">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentCheckboxSetting">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element name="description" type="translatableString">
                 <xs:annotation>
                     <xs:documentation>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
index b0dea52cb4bd9..8fa509fa594d6 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentCheckboxset">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice maxOccurs="unbounded" minOccurs="0">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentCheckboxsetSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementCheckboxset">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice maxOccurs="unbounded" minOccurs="0">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentCheckboxsetSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element ref="multiple"/>
             <xs:element name="options" type="optionsType"/>
         </xs:choice>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd
index 509ef2aad2dee..dea1f7ce059e9 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/colorPicker.xsd
@@ -22,6 +22,19 @@
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
 
+    <xs:complexType name="formElementColorPicker">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentColorPickerSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
     <xs:group name="componentColorPickerSettings">
         <xs:choice>
             <xs:group ref="abstractSettings"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
index b24ba626a9ea1..a2a8fbbe103c1 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentDate">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentDateSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementDate">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentDateSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element name="options" type="dateOptionsType">
                 <xs:annotation>
                     <xs:documentation>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
index cd1147b560034..648eaf9db5b18 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentEmail">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentEmailSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementEmail">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentEmailSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
index eac284ddc92d8..1536f752a0aaf 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentFile">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentFileSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementFile">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentFileSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
index 3181a7ab673cd..664a2d0e8d904 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
@@ -23,6 +23,19 @@
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
 
+    <xs:complexType name="formElementFileUploader">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentFileUploaderSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
     <xs:group name="componentFileUploaderSettings">
         <xs:choice>
             <xs:group ref="abstractSettings"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
index 82282dd61673f..0e7a6f4ed5fe0 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentHidden">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="hiddenSetting"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementHidden">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="hiddenSetting">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
index 6bb29ba2e9069..f32d5c2c0fe8f 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
@@ -23,6 +23,19 @@
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
 
+    <xs:complexType name="formElementImageUploader">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentImageUploaderSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
     <xs:group name="componentImageUploaderSettings">
         <xs:choice>
             <xs:group ref="componentFileUploaderSettings"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
index fc3ea2d92576a..047212f3973e4 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
@@ -15,6 +15,7 @@
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings" minOccurs="0"/>
                         <xs:group ref="inputSetting"/>
                     </xs:choice>
                 </xs:complexType>
@@ -23,6 +24,18 @@
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
 
+    <xs:complexType name="formElementInput">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="inputSetting"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
 
     <xs:complexType name="componentRange">
         <xs:complexContent>
@@ -73,7 +86,6 @@
 
     <xs:group name="inputSetting">
         <xs:choice>
-            <xs:group ref="abstractSettings" minOccurs="0"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
index 28d9d24868820..aefb0328c8800 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentMultiselect">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentMultiselectSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementMultiselect">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
index 5a3053e59be95..69b936c3e5f8a 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
@@ -12,7 +12,32 @@
     <xs:complexType name="componentPrice">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice maxOccurs="unbounded" minOccurs="0">
+                        <xs:group ref="componentPriceSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
         </xs:sequence>
         <xs:attributeGroup ref="ui_element_attributes"/>
     </xs:complexType>
+
+    <xs:complexType name="formElementPrice">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice maxOccurs="unbounded" minOccurs="0">
+                        <xs:group ref="componentPriceSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:group name="componentPriceSettings">
+        <xs:choice>
+        </xs:choice>
+    </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd
index c53ad0333d6d7..f2db9a57c5a1c 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentRadioset">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentRadiosetSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementRadioset">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentRadiosetSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element ref="multiple"/>
             <xs:element name="options" type="optionsType"/>
         </xs:choice>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd
index 7e0d2dfbfeb18..76d37de771a4c 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd
@@ -15,6 +15,7 @@
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
                         <xs:group ref="componentSelectSettings"/>
                     </xs:choice>
                 </xs:complexType>
@@ -29,9 +30,21 @@
         </xs:complexContent>
     </xs:complexType>
 
+    <xs:complexType name="formElementSelect">
+        <xs:sequence>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentSelectSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
     <xs:group name="componentSelectSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element name="options" type="optionsType">
                 <xs:annotation>
                     <xs:documentation>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd
index e382af84111c7..813ad7870bfe9 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentText">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="dataTypeTextSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementText">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="dataTypeTextSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd
index ad7fda6200a79..67ee63a3f889f 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentTextarea">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentTextareaSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementTextarea">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentTextareaSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element ref="rows"/>
             <xs:element ref="cols"/>
         </xs:choice>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd
index 62c81234aba33..3e7bbb3a59f8c 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd
@@ -12,6 +12,20 @@
     <xs:complexType name="componentWysiwyg">
         <xs:sequence>
             <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="abstractSettings"/>
+                        <xs:group ref="componentWysiwygSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:complexType name="formElementWysiwyg">
+        <xs:sequence>
             <xs:element name="settings" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -25,7 +39,6 @@
 
     <xs:group name="componentWysiwygSettings">
         <xs:choice>
-            <xs:group ref="abstractSettings"/>
             <xs:element name="content" type="xs:string">
                 <xs:annotation>
                     <xs:documentation>
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 635c78ce65fe8..680b6a2b1e54e 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
@@ -224,6 +224,14 @@ define([
             return this;
         },
 
+        /** @inheritdoc */
+        destroy: function () {
+            if (this.dnd()) {
+                this.dnd().destroy();
+            }
+            this._super();
+        },
+
         /**
          * Calls 'initObservable' of parent
          *
diff --git a/app/code/Magento/Version/Controller/Index/Index.php b/app/code/Magento/Version/Controller/Index/Index.php
index 5c7c9b619facc..c5d02cd9a1fd2 100644
--- a/app/code/Magento/Version/Controller/Index/Index.php
+++ b/app/code/Magento/Version/Controller/Index/Index.php
@@ -9,7 +9,6 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\ProductMetadataInterface;
-use Magento\Framework\Exception\StateException;
 
 /**
  * Magento Version controller
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_rules-temp.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_rules-temp.less
index 29bbeb10f820d..a38cb17a95754 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_rules-temp.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_rules-temp.less
@@ -31,6 +31,11 @@
         padding-left: 0 !important;
     }
 
+    .x-tree li {
+        margin-bottom: 0 !important;
+        line-height: normal !important;
+    }
+
     .legend {
         font-weight: @font-weight__semibold;
     }
diff --git a/app/design/frontend/Magento/blank/web/css/print.less b/app/design/frontend/Magento/blank/web/css/print.less
index 474bc27b0751b..ebfc6ce4300b7 100644
--- a/app/design/frontend/Magento/blank/web/css/print.less
+++ b/app/design/frontend/Magento/blank/web/css/print.less
@@ -132,4 +132,8 @@
     .footer.content {
         padding: 0;
     }
+
+    .hidden-print {
+        display: none !important;
+    }
 }
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 fd004ef2c14d9..b5742b86cf9f1 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
@@ -528,6 +528,7 @@
 
         .header.links {
             min-width: 175px;
+            z-index: 1000;
         }
 
         &.active {
diff --git a/app/design/frontend/Magento/rush/LICENSE.txt b/app/design/frontend/Magento/rush/LICENSE.txt
deleted file mode 100644
index 36b2459f6aa63..0000000000000
--- a/app/design/frontend/Magento/rush/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Open Software License ("OSL") v. 3.0
-
-This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-
-Licensed under the Open Software License version 3.0
-
-   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-
-         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-
-         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-
-         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-
-         4. to perform the Original Work publicly; and
-
-         5. to display the Original Work publicly.
-
-   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-
-   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-
-   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-
-   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-
-   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-
-   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-
-   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-
-   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-
-  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-
-  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-
-  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-
-  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-
-  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-
-  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/design/frontend/Magento/rush/LICENSE_AFL.txt b/app/design/frontend/Magento/rush/LICENSE_AFL.txt
deleted file mode 100644
index f39d641b18a19..0000000000000
--- a/app/design/frontend/Magento/rush/LICENSE_AFL.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Academic Free License ("AFL") v. 3.0
-
-This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-
-Licensed under the Academic Free License version 3.0
-
-   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-
-         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-
-         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-
-         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
-
-         4. to perform the Original Work publicly; and
-
-         5. to display the Original Work publicly.
-
-   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-
-   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-
-   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-
-   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-
-   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-
-   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-
-   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-
-   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-
-  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-
-  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-
-  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-
-  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-
-  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-
-  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/design/frontend/Magento/rush/Magento_Theme/layout/default.xml b/app/design/frontend/Magento/rush/Magento_Theme/layout/default.xml
deleted file mode 100644
index 28e9d7e12f499..0000000000000
--- a/app/design/frontend/Magento/rush/Magento_Theme/layout/default.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-    <body>
-    </body>
-</page>
diff --git a/app/design/frontend/Magento/rush/Magento_Theme/layout/default_head_blocks.xml b/app/design/frontend/Magento/rush/Magento_Theme/layout/default_head_blocks.xml
deleted file mode 100644
index 60fc5aa8f56ab..0000000000000
--- a/app/design/frontend/Magento/rush/Magento_Theme/layout/default_head_blocks.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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">
-    <head>
-      <!--Include rush theme assets-->
-      <link src="js/foo.js"/>
-
-      <!--Remove require-js assets-->
-      <remove src="mage/calendar.css"/>
-      <remove src="requirejs/require.js"/>
-      <remove src="mage/requirejs/mixins.js"/>
-      <remove src="requirejs-config.js"/>
-    </head>
-</page>
diff --git a/app/design/frontend/Magento/rush/Magento_Theme/layouts.xml b/app/design/frontend/Magento/rush/Magento_Theme/layouts.xml
deleted file mode 100644
index 2ac2d369ade06..0000000000000
--- a/app/design/frontend/Magento/rush/Magento_Theme/layouts.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<page_layouts xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:framework:View/PageLayout/etc/layouts.xsd">
-
-    <layout id="app_shell">
-        <label translate="true">App Shell</label>
-    </layout>
-
-</page_layouts>
diff --git a/app/design/frontend/Magento/rush/Magento_Theme/page_layout/app_shell.xml b/app/design/frontend/Magento/rush/Magento_Theme/page_layout/app_shell.xml
deleted file mode 100644
index a0fdf9bc9738e..0000000000000
--- a/app/design/frontend/Magento/rush/Magento_Theme/page_layout/app_shell.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd">
-    <update handle="empty"/>
-</layout>
diff --git a/app/design/frontend/Magento/rush/Magento_Theme/templates/root.phtml b/app/design/frontend/Magento/rush/Magento_Theme/templates/root.phtml
deleted file mode 100644
index 5a2fb56828cc4..0000000000000
--- a/app/design/frontend/Magento/rush/Magento_Theme/templates/root.phtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * Try not to put things in this file.
- */
-
-// @codingStandardsIgnoreFile
-
-?>
-<!doctype html>
-<html>
-  <head>
-    <?= /* @escapeNotVerified */ $headContent ?>
-    <?= /* @escapeNotVerified */ $headAdditional ?>
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
-</html>
diff --git a/app/design/frontend/Magento/rush/composer.json b/app/design/frontend/Magento/rush/composer.json
deleted file mode 100644
index 99bf02d92a990..0000000000000
--- a/app/design/frontend/Magento/rush/composer.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "magento/theme-frontend-rush",
-  "description": "N/A",
-  "require": {
-    "php": "~7.1.3||~7.2.0",
-    "magento/framework": "*"
-  },
-  "type": "magento2-theme",
-  "license": ["OSL-3.0", "AFL-3.0"],
-  "autoload": {
-    "files": ["registration.php"]
-  }
-}
diff --git a/app/design/frontend/Magento/rush/etc/view.xml b/app/design/frontend/Magento/rush/etc/view.xml
deleted file mode 100644
index 1b62c30fa9c43..0000000000000
--- a/app/design/frontend/Magento/rush/etc/view.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
-    <media>
-        <images module="Magento_Catalog">
-            <image id="bundled_product_customization_page" type="thumbnail">
-                <width>140</width>
-                <height>140</height>
-
-            </image>
-            <image id="cart_cross_sell_products" type="thumbnail">
-                <width>152</width>
-                <height>188</height>
-            </image>
-            <image id="cart_page_product_thumbnail" type="small_image">
-                <width>110</width>
-                <height>160</height>
-            </image>
-            <image id="category_page_grid" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="category_page_list" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="customer_account_my_tags_tag_view" type="small_image">
-                <width>100</width>
-                <height>100</height>
-            </image>
-            <image id="customer_account_product_review_page" type="image">
-                <width>285</width>
-                <height>285</height>
-            </image>
-            <image id="customer_shared_wishlist" type="small_image">
-                <width>113</width>
-                <height>113</height>
-            </image>
-            <image id="gift_messages_checkout_small_image" type="small_image">
-                <width>75</width>
-                <height>75</height>
-            </image>
-            <image id="gift_messages_checkout_thumbnail" type="thumbnail">
-                <width>100</width>
-                <height>100</height>
-            </image>
-            <image id="mini_cart_product_thumbnail" type="thumbnail">
-                <width>78</width>
-                <height>78</height>
-            </image>
-            <image id="new_products_content_widget_grid" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="new_products_content_widget_list" type="small_image">
-                <width>270</width>
-                <height>270</height>
-            </image>
-            <image id="new_products_images_only_widget" type="small_image">
-                <width>78</width>
-                <height>78</height>
-            </image>
-            <image id="product_base_image" type="image">
-                <width>265</width>
-                <height>265</height>
-            </image>
-            <image id="product_comparison_list" type="small_image">
-                <width>140</width>
-                <height>140</height>
-            </image>
-            <image id="product_page_image_large" type="image"/>
-            <image id="product_page_image_medium" type="image">
-                <width>700</width>
-                <height>700</height>
-            </image>
-            <image id="product_page_image_small" type="thumbnail">
-                <width>90</width>
-                <height>90</height>
-            </image>
-            <image id="product_page_main_image" type="image">
-                <width>700</width>
-                <height>700</height>
-            </image>
-            <image id="product_page_main_image_default" type="image">
-                <width>700</width>
-                <height>700</height>
-            </image>
-            <image id="product_swatch_image_large" type="image"/>
-            <image id="product_swatch_image_medium" type="image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="product_swatch_image_small" type="thumbnail">
-                <width>88</width>
-                <height>110</height>
-            </image>
-            <image id="product_page_more_views" type="thumbnail">
-                <width>90</width>
-                <height>90</height>
-            </image>
-            <image id="product_stock_alert_email_product_image" type="small_image">
-                <width>76</width>
-                <height>76</height>
-            </image>
-            <image id="product_small_image" type="small_image">
-                <width>135</width>
-                <height>135</height>
-            </image>
-            <image id="product_thumbnail_image" type="thumbnail">
-                <width>75</width>
-                <height>75</height>
-            </image>
-            <image id="recently_compared_products_grid_content_widget" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="recently_compared_products_images_names_widget" type="thumbnail">
-                <width>75</width>
-                <height>90</height>
-            </image>
-            <image id="recently_compared_products_images_only_widget" type="thumbnail">
-                <width>76</width>
-                <height>76</height>
-            </image>
-            <image id="recently_compared_products_list_content_widget" type="small_image">
-                <width>270</width>
-                <height>207</height>
-            </image>
-            <image id="recently_viewed_products_grid_content_widget" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-            <image id="recently_viewed_products_images_names_widget" type="small_image">
-                <width>75</width>
-                <height>90</height>
-            </image>
-            <image id="recently_viewed_products_images_only_widget" type="small_image">
-                <width>76</width>
-                <height>76</height>
-            </image>
-            <image id="recently_viewed_products_list_content_widget" type="small_image">
-                <width>270</width>
-                <height>270</height>
-            </image>
-            <image id="related_products_list" type="small_image">
-                <width>140</width>
-                <height>140</height>
-            </image>
-            <image id="review_page_product_image" type="small_image">
-                <width>285</width>
-                <height>285</height>
-            </image>
-            <image id="rss_thumbnail" type="thumbnail">
-                <width>75</width>
-                <height>75</height>
-            </image>
-            <image id="sendfriend_small_image" type="small_image">
-                <width>75</width>
-                <height>75</height>
-            </image>
-            <image id="shared_wishlist_email" type="small_image">
-                <width>135</width>
-                <height>135</height>
-            </image>
-            <image id="side_column_widget_product_thumbnail" type="thumbnail">
-                <width>75</width>
-                <height>90</height>
-            </image>
-            <image id="upsell_products_list" type="small_image">
-                <width>140</width>
-                <height>140</height>
-            </image>
-            <image id="wishlist_sidebar_block" type="thumbnail">
-                <width>75</width>
-                <height>90</height>
-            </image>
-            <image id="wishlist_small_image" type="small_image">
-                <width>113</width>
-                <height>113</height>
-            </image>
-            <image id="wishlist_thumbnail" type="small_image">
-                <width>240</width>
-                <height>300</height>
-            </image>
-        </images>
-    </media>
-    <vars module="Magento_Catalog">
-
-        <!-- Gallery and magnifier theme settings. Start -->
-        <var name="gallery">
-            <var name="nav">thumbs</var> <!-- Gallery navigation style (false/thumbs/dots) -->
-            <var name="loop">true</var> <!-- Gallery navigation loop (true/false) -->
-            <var name="keyboard">true</var> <!-- Turn on/off keyboard arrows navigation (true/false) -->
-            <var name="arrows">true</var> <!-- Turn on/off arrows on the sides preview (true/false) -->
-            <var name="caption">false</var> <!-- Display alt text as image title (true/false) -->
-            <var name="allowfullscreen">true</var> <!-- Turn on/off fullscreen (true/false) -->
-            <var name="navdir">horizontal</var> <!-- Sliding direction of thumbnails (horizontal/vertical) -->
-            <var name="navarrows">true</var> <!-- Turn on/off on the thumbs navigation sides arrows(true/false) -->
-            <var name="navtype">slides</var> <!-- Sliding type of thumbnails (slides/thumbs) -->
-            <var name="transition">
-                <var name="effect">slide</var> <!-- Sets transition effect for slides changing (slide/crossfade/dissolve) -->
-                <var name="duration">500</var> <!-- Sets transition duration in ms -->
-            </var>
-            <var name="fullscreen">
-                <var name="nav">thumbs</var> <!-- Fullscreen navigation style (false/thumbs/dots) -->
-                <var name="loop">true</var> <!-- Fullscreen navigation loop (true/false/null) -->
-                <var name="arrows">false</var> <!-- Turn on/off arrows on the sides preview in fullscreen (true/false/null) -->
-                <var name="caption">false</var> <!-- Display alt text as image title in fullscreen(true/false) -->
-                <var name="navdir">horizontal</var> <!--Sliding direction of thumbnails in fullscreen(horizontal/vertical)  -->
-                <var name="navtype">slides</var> <!-- Sliding type of thumbnails (slides/thumbs) -->
-                <var name="transition">
-                    <var name="effect">dissolve</var> <!-- Sets transition effect for slides changing (slide/crossfade/dissolve) -->
-                    <var name="duration">500</var> <!-- Sets transition duration in ms -->
-                </var>
-            </var>
-        </var>
-
-        <var name="magnifier">
-            <var name="fullscreenzoom">20</var>  <!-- Zoom for fullscreen (integer)-->
-            <var name="top"></var> <!-- Top position of magnifier -->
-            <var name="left"></var> <!-- Left position of magnifier -->
-            <var name="width"></var> <!-- Width of magnifier block -->
-            <var name="height"></var> <!-- Height of magnifier block -->
-            <var name="eventType">hover</var> <!-- Action that atcivates zoom (hover/click) -->
-            <var name="enabled">false</var> <!-- Turn on/off magnifier (true/false) -->
-        </var>
-
-        <var name="breakpoints">
-            <var name="mobile">
-                <var name="conditions">
-                    <var name="max-width">767px</var>
-                </var>
-                <var name="options">
-                    <var name="options">
-                        <var name="nav">dots</var>
-                    </var>
-                </var>
-            </var>
-        </var>
-        <!-- end. Gallery and magnifier theme settings -->
-
-        <var name="product_small_image_sidebar_size">100</var>  <!-- Override for small product image -->
-        <var name="product_base_image_size">275</var>           <!-- Override for base product image -->
-        <var name="product_base_image_icon_size">48</var>       <!-- Base product image icon size -->
-
-        <var name="product_list_image_size">166</var>           <!-- New Product image size used in product list -->
-        <var name="product_zoom_image_size">370</var>           <!-- New Product image size used for zooming -->
-
-        <var name="product_image_white_borders">0</var>
-    </vars>
-    <vars module="Magento_Bundle">
-        <var name="product_summary_image_size">58</var>         <!-- New Product image size used for summary block-->
-    </vars>
-    <vars module="Js_Bundle">
-        <var name="bundle_size">1MB</var>
-    </vars>
-    <exclude>
-        <item type="file">Lib::jquery/jquery.min.js</item>
-        <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
-        <item type="file">Lib::jquery/jquery.details.js</item>
-        <item type="file">Lib::jquery/jquery.details.min.js</item>
-        <item type="file">Lib::jquery/jquery.hoverIntent.js</item>
-        <item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
-        <item type="file">Lib::requirejs/require.js</item>
-        <item type="file">Lib::requirejs/text.js</item>
-        <item type="file">Lib::date-format-normalizer.js</item>
-        <item type="file">Lib::legacy-build.min.js</item>
-        <item type="file">Lib::mage/captcha.js</item>
-        <item type="file">Lib::mage/dropdown_old.js</item>
-        <item type="file">Lib::mage/list.js</item>
-        <item type="file">Lib::mage/loader_old.js</item>
-        <item type="file">Lib::mage/webapi.js</item>
-        <item type="file">Lib::mage/zoom.js</item>
-        <item type="file">Lib::mage/translate-inline-vde.js</item>
-        <item type="file">Lib::mage/requirejs/mixins.js</item>
-        <item type="file">Lib::mage/requirejs/static.js</item>
-        <item type="file">Magento_Customer::js/zxcvbn.js</item>
-        <item type="file">Magento_Catalog::js/zoom.js</item>
-        <item type="file">Magento_Ui::js/lib/step-wizard.js</item>
-        <item type="file">Magento_Ui::js/form/element/ui-select.js</item>
-        <item type="file">Magento_Ui::js/form/element/file-uploader.js</item>
-        <item type="file">Magento_Ui::js/form/components/insert.js</item>
-        <item type="file">Magento_Ui::js/form/components/insert-listing.js</item>
-        <item type="directory">Magento_Ui::js/timeline</item>
-        <item type="directory">Magento_Ui::js/grid</item>
-        <item type="directory">Magento_Ui::js/dynamic-rows</item>
-        <item type="directory">Magento_Ui::templates/timeline</item>
-        <item type="directory">Magento_Ui::templates/grid</item>
-        <item type="directory">Magento_Ui::templates/dynamic-rows</item>
-        <item type="directory">Magento_Swagger::swagger-ui</item>
-        <item type="directory">Lib::modernizr</item>
-        <item type="directory">Lib::tiny_mce</item>
-        <item type="directory">Lib::varien</item>
-        <item type="directory">Lib::jquery/editableMultiselect</item>
-        <item type="directory">Lib::jquery/jstree</item>
-        <item type="directory">Lib::jquery/fileUploader</item>
-        <item type="directory">Lib::css</item>
-        <item type="directory">Lib::lib</item>
-        <item type="directory">Lib::extjs</item>
-        <item type="directory">Lib::prototype</item>
-        <item type="directory">Lib::scriptaculous</item>
-        <item type="directory">Lib::less</item>
-        <item type="directory">Lib::mage/adminhtml</item>
-        <item type="directory">Lib::mage/backend</item>
-    </exclude>
-</view>
diff --git a/app/design/frontend/Magento/rush/media/preview.jpg b/app/design/frontend/Magento/rush/media/preview.jpg
deleted file mode 100644
index 61be74876a1e9..0000000000000
Binary files a/app/design/frontend/Magento/rush/media/preview.jpg and /dev/null differ
diff --git a/app/design/frontend/Magento/rush/registration.php b/app/design/frontend/Magento/rush/registration.php
deleted file mode 100644
index d7b767d71e06d..0000000000000
--- a/app/design/frontend/Magento/rush/registration.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use \Magento\Framework\Component\ComponentRegistrar;
-
-ComponentRegistrar::register(
-    ComponentRegistrar::THEME,
-    'frontend/Magento/rush',
-    __DIR__
-);
diff --git a/app/design/frontend/Magento/rush/theme.xml b/app/design/frontend/Magento/rush/theme.xml
deleted file mode 100644
index cdd11220bc989..0000000000000
--- a/app/design/frontend/Magento/rush/theme.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/theme.xsd">
-    <title>Magento Rush</title>
-    <media>
-        <preview_image>media/preview.jpg</preview_image>
-    </media>
-</theme>
diff --git a/app/design/frontend/Magento/rush/web/css/_styles-l.less b/app/design/frontend/Magento/rush/web/css/_styles-l.less
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/app/design/frontend/Magento/rush/web/css/_styles-m.less b/app/design/frontend/Magento/rush/web/css/_styles-m.less
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/app/design/frontend/Magento/rush/web/images/logo.svg b/app/design/frontend/Magento/rush/web/images/logo.svg
deleted file mode 100644
index 556d839b8b84f..0000000000000
--- a/app/design/frontend/Magento/rush/web/images/logo.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="127" height="128" viewBox="0 0 127 128">
-  <metadata><?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01        ">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""/>
-   </rdf:RDF>
-</x:xmpmeta>
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                           
-<?xpacket end="w"?></metadata>
-<image id="Layer_0" data-name="Layer 0" width="127" height="128" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAH8AAACACAYAAAAiebbfAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH4QkVCCMVpnxlaQAAFz5JREFUeNrtnXlQFGfex7893XMzzGQQGJgZuR0uQQ7FiBAUJURFjRoTzeprTNyt6K67W6sxqd1N9q1ssknVJia7lGY3iUv2DSpGzaKoKY94kojAIoIcCgF1uA855oSZed4/kIkoRlSGBpxP1beKPqb79/y+3c/T/XTTD0UIwXgm53KpqMfcI7BZLFyr1cK1Wqxcq9XCs1qsHGKz0RSHY6UZ2kbTTA/N0L00zfRyGKaXx+eZFoSFG9iO35FQ48X8I2VlAoNeL9V1dckbtTcCG27c0DRcvxHYdONGYEd7e7JBp4fJaIDRaITRYIBJr4fVagVN0xCIxRCKRBAKhRAIRRC5iCGTy094qtVVXhPVVV5qdaVCpa5ycXVtF4nFnc+EhprYLu9wMKbN33vhgmd1efm00oKC5PKiosSaK1ei2ltaHLY/ubs7/CZNKgqJijoTHht7IiAk5MKyadOa2M7DwzKmzP+mspJ7taTkyfyzZxeXXriQfLWsLELf3Q0AGMlyUBQFABBLJAgKDb0UPm3aiakJCf8Jmjz5+1SNppftPA0ZQsio16dHDke9uGHDR35BQc0MwxCapgnF4RAArIvicAhN04RhGOIXFNT84oYNH3165HAU2zkbikbtmb8v/4LnqZzDa789cGDttaqrgWazGVarFcRmYzu0e0JxOKBpGnw+Hz6BQVWzFy7ckbRg3o6lU0dp08D20XenMs+c9lv60kufK1QqPV8gIDRNs352P4xomiZ8gYAoVCr90pde+jzzzGk/tnN7p1gPoF+ffXMkYt7y5/colEqjQCgkFEWxbuBwiKIoIhAKiUKpNM5b/vyez745EsF2rkeN+ZlnzvilLFn6tZdarRcIhayb5UgJhELipVbrU5Ys/TrzzBnWawJWd/7Kltfe9gkMbOYLxrfpd4ovEBKfwMDmV7a89vZjZ/6fP/t0SczMmfkyuZx1I9iUTC4nMTNn5v/5s0+XjHvzvzp/3nvxqtX/Vvr6drCd+NEkpa9vx+JVq//91fnz3uPS/L9mfpkam5CQP97b9YeVQCgksQkJ+X/N/DJ1XJn/yz+99Zp/cHAd2wkeC/IPDq775Z/eem3Mm5955ozfs2vWZMjd3VlP6liS3N2dPLtmTYaj7wgctuHt2dnTZsyde5rL47GezLEoLo9HZsyde3p7dva0MWX+1qzdyZFxcSVsJ3A8KDIurmRr1u7kMWH+exk7FmsmT65lO2njSZrJk2vfy9ixeFSb/9a2bSsnBgS0sZ2s8aiJAQFtb23btnJUmv/7jz9aq1AqjWwnaTxLoVQaf//xR2tHlfnv7vh8sZdKpWc7OY+DvFQq/bs7Ph+WJuCRN5C+f2+iys+vg+2kPE5S+fl1pO/fm8iq+RnHj4X4aTSN4+Xx61gRRVHET6NpzDh+LIQV8/fl57sHR0T8MFZfthjrommaBEdE/LAvP999xM2PnzP3NI/PZz0Jj7N4fD6JnzP39Iia//LvNr0rEruwXninQERiF/Ly7za9OyLmf7AzM0Uql4+b16zGuiiKIlK5nHywMzPFoeZ/lZfn6R8cXOc0fnSJoijiHxxc91VenqfDzE9euDCHZhjWC+vU3aIZhiQvXJjjEPPfTE9fJRSLWS+kU/eWUCwmb6anrxpW87/Ky/MMDA27wXbhnLq/AkPDbgy1+udgCOTs2rWpurxMNZR1nbBLdXmZKmfXrk1DWvl+R8ff9u1NnODpacEoOKqdGpomeHpa/rbv/t2/P7nwUGmpKHnRohy2C+PUgyt50aKcQ6Wlooeu9ovOf5+ae/TofDgZc+QePTq/6Pz3qT+1zj3NP3jpkuTkwZy1JqOR7XI4eQhMRiNOHsxZe/DSJcm91rmn+SX5+XPzTp50nvVjmAsnT80vKcife6/lg5p/+PJlUe6xYy/ourrYjt/JI9Dd1Ynco8deOHz5smiw5YOaX5yXl3L+22+fYzt4J4/O+W+/fa44Ly9lsGWDml+Ym5vmyA8bORk52ltaUJibmzbowjsv/9P374sPDA119uaNIwWGht5I378v/r63epUlJfFVZc7evPFEVVmZqrKkJP7O+QPMP1BcLC0vujiT7WCdDD/lRRdnHigult4+b4D5ZUVFiRUXL6Y92GadjAUqLl5MKysqSrx9HueOFRK1tbVsx+nEAWhra1Fx8eLg5u8vKHD/oaIylu0gnTiOHyoqY/cXFLj3T9vNr6msjKm7VpvEdoBOHEfdtdqkmsrKmP7p28y/ElV/7Rrb8TlxIPXXrqGm8kpU/7TdfG1tTYjzIc74xmQ0QltbE9I/zQH6Pl3epNUGsh2cE8fTpNUG7r1wwRO4ZX5VWdm0Rq32SbYDc+J4murqnqwuL5sG3DL/elV1ZGvT6PwwtJPhpaWxEdeqqyOBW+Y3N9T7OR/fPh7ourrQXFfvB9wyv7O93f3RNulkLNHvN+dweZlA39UlZzsgJyOHvqtLfri8TMBprq/303V1xT/6Jp2MFXRdXfHN9fV+nOb6en9ne383fD4fPB5vwDwOh2MfXGkso+vqQnN9vT/T1tTkY9DpWAuEYRhMmjQJarV6QLJpmgaHwwEhBL29vTAYDGhtbcW1a9fQ2dkJABCLxQgKCoJSqQSH8+MzKovFAq1Wi4qKCvT29g12JRQKERYWBoVCAZqm0dvbixs3bqC6uhoGgwFcLhcqlQp+fn7w8PCAm5sbbDYbWlpa0NzcjOrqaoSFheHKlStobW2FRqOBQqGw75eiKFgsFtTV1aGqqgp6vR5ubm6IioqCUCgcUGaTyYTq6mpcv34dFotlxHOu1+nQ1tTkw+g6u+Vms3nEA+iHy+Vi5syZmDdvHubPnw+GYQAAtbW1aG9vB4/Hg0QiAcMwqKysRFZWFrKzs9HU1ASpVIo5c+Zg2bJliIuLs2/z+PHjyM7ORk1Njd18iUSClJQUrFq1Cv7+/igtLcWOHTvQ0tKCnp4exMbG4pVXXsEzzzwDmUyGmpoadHZ2QigUoq2tDfn5+UhLS8M777yD3NxcpKamYtmyZQgPDwfDMLBarbh48SK+/PJLtLa2Qq/XQ6lU4uc//zliY2Ph5+cHADAYDMjJyUFWVhYaGhpYMb/HbIaus1uOlzdtftfF1ZX1V41cXFxIVVUV6Wf16v8hbm4TSGBgIPnFL35B8vPzCSGENDY2kt/+9rcDfhsfH2//XUtLCwkICLjnfjZs2EBOnTpFli1bZp8XHh5O9u3bRwghpLOzk2RkZJDIyEgiEAhIUFAQWbduHTl16hQxGo1k1apVRCQSEQBkyZIlpLS0lBBCSHl5OVmyZMld+5NKpWTLli2EEEJ6enrI6dOn7b9nLdeuruTlTZvfZcwmo4iNo+9OrFYrenp6QAgBRVHQ63Xo7OxAW1srqqqqIBKJ4O/vD09PTyQmJiIrKwv19fUA+qrRfgghMJlMoCiq7//R7sBsNkOn08FqtdrnhYaGIjk5GQCg1Wrxz3/+E8XFxQCAq1evorq6Gnl5edi/f/+AbZpMJvuZazab7bXMnRhvPTMhhECv1w9ootjAYrHAbDKKOCajSWzpHf2DQNbX16PpVi+kTCaDl5fXsG2bz+fDxcUFQN81iEwmG3D9YbPZUFFRgZMnT+LmzZuDHlRjCUtvL0xGk5gxGY2isWC+zWaD7daAirf/PRzU1dWhpKQEU6ZMga+vL15//XX09PSgsLAQRqMRZrMZPT092LBhA6xW64BaYyzSZ75RxOkxGUWPvjnHo1Ao4ObmBgBoaGjA1atXh23b5eXlOHz4MMxmM7hcLmbMmIGsrCzs2rULK1asgKenJwQCAXp7e+9pPIfDgUAgAI/Hg1gshlgshkgkglgsvuuWcTTQYzKKGLaDuBcMw4DH44HP5yMuLg6LFi2CQqHAzZs3UV5eDt0w3p42NDRg27Zt0Ol02LhxIyZMmACZTIbZs2dj+vTp2Lx5M/bs2YNt27ahpaVl0Grfx8cHmzdvxs9+9rMBfQFcLhdqtZrtdA6eY55AYGA7iMHYsmUL1qxZAzc3N3h7e0OhUKC8vBwff/wxsrKyhn1/DQ0NSE9Px5EjR7Bo0SIsX74cGo0GUqkUEokEv/71rxEcHIw33ngDNTU1d/2+o6MDubm5KCgosN+uEkIgEomQkJCAsLAwtlM6AJ5AYGD4QqGB4XIx2tr9/kSGhoZi+fLloGkaNTU1KCwsREdHx7Dvz2azobu7G5cuXUJtbS12796NmTNn4tVXX8WUKVMgk8mwYMECnD59GpmZmei6o1e0s7MT33//PbKzs8HlcgH0mS+TySCRSLBy5Uq2U2qH4XLBFwoNHKFQqGduBTuaOH/+PLKzs/H+++/j7NmzAICnnnoKCxYssJ9ZD4vNZhtQdVMUZa+qbTYbOjo67B1K69evx4ULF2CxWCAWi5GQkACpVDroNvsvDnU6HXQ6HfR6Pbq7u8FmJ9pgMFwuhEKhnsMXCA2PmkxHYDQa0d3djfb2dhQXF6O5uRlisRgzZsxAZGTkgHV7e3vR3NwMoO/Cy9XV9Z598FKpFCaTCd3d3QCAJ554AmvXrsVvfvObu9bV6XS4dOkSDhw4YO9L8PHxgUAgGHI5RuOzAIZhwBcIDRyBQGAYjWc+8GPirly5Aq1WC6CvQ2batGkD1jMYDLhy5QqAvgusmJiYe3akBAcHw2AwoKGhwb5+eHg4Fi5cCF9f37vWt9lsA87choaGRzqTR0MfAcPlQiAQGDgiV5f20XArYrPZwDCM3XCapu23VQUFBaioqAAAKJVKJCUlYeLEifbfNjU1ISMjAzqdDhKJBK+++ipSU1MhEvXdxYpEIsTGxuIPf/gDJk2ahHPnzqG6uhpAnxk2mw3Tp0/HX/7yFyQlJdkfxHh6euLpp5/G8uXLIRaLcfPmTezduxctt/59vf/hE4B7NkUWi8W+jKIoCAQC9PT0sJprHo8HkatLO73wxRcVxXl5Kzra21kJhM/nIy0tDevWrcOcOXNA0zQAwM3NDQqFAlqtFlqtFhRFwcPDA15eXggICIBarUZLSwuuX7+Onp4eaLVadHZ2gs/nIzo6GjExMUhISEBKSgpeeOEFpKamQiaTIScnBwcPHrRfNEokEsTExEAikaC8vByzZs1CWloa5s+fjxUrVmDp0qUICQnB+fPn8cknn+Drr78GRVFYuXIlXnrpJURHR9t7BeVyOaxWK1paWqDX6xEYGIhNmzZh0aJF8PLyAk3TkMlkcHV1hcViQUNDAysdRu5eXkh8JvUfjIe3ssZlkAuYkYIQgo6ODlRVVeGPf/yj/cy3Wq1obGy095efOHECzc3NCA0NhZubG7q6uqDX6+3baWlpwfbt25GXl4fw8HB4eHhALpfDZrOhubkZra2tKCoqQmFhob29B/ra9SNHjuDMmTOorKxEYmIifHx8IJFIYDAYUFxcjMbGRpSUlKCgoAB6vR4uLi5oa2vDsWPHcOrUKfvzCLPZjI6ODnvMZrMZ1dXVaG1txZ49e+z77OzsRHd3N2tNgItUCg9vZQ0OlZaK4mbPPodR8BGB4ZZIJCLih/xeMJfLJRKJZFx+Wj5u9uxzh0pLRZx5YWEGiasrO3W+gzEYDANqhweht7eX1bPTkUhcXdvnhYUZOADg+sQTzg/wPEb0+80BAA9vr2tiieTRtuhkTCCWSODh7XUNuGX+xICASxM8PdmOy8kIMMHTExMDAi4Bt8wPCAkpUChVF9gOzInjUShVFwJCQgqAW+Yvn/6k1lOlqmI7MCeOx1Olqlo+/UktcNv/5yt9fct5fD7bsTlxIDw+H0pf3/L+abv5fppJRUofH7bjc+JAlD4+8NNMKuqf/tH8SZOKlD6+Z9gO0InjUPr4nvGbNIj5y+Li6v2CNYVsB+jEcfgFawqXxcXV908PeO4ZHBl5zvu2p2VOxg/eEyciODLy3O3zBpgfEh11ShMZ+Q3bgToZfjSRkd+EREedun3eAPOfjYpuD50S5Wz3xyGhU6LOPBsVPeAZzl2vu2giJuf6aTRsx+pkGPHXaKCJmJx75/y7zZ8SmRs5ffoXbAfsZPiImD79C82UyPubnxIYZI2Jjz8kkzu/1DIekMnliImfcSglMOiuV4YGfctxSlzcN3GzZv2H7cCdPDpxs2b9JzJu+qAX8YOavyAiojs+JWWn6NZ/rjoZm4hcXBCfkrIzLSKie7Dl9/xH8clTp56Ymph4lO0COHl4piYmHp08deqJe67wU2Ot/u8n21/g8wWsv3Pm1IOLzxeQ//1k+wsPPZZu9Iz4Q3GzZ52AkzFH3OxZJ6JnxB/6yZXuN8z21qzdyTI3N9aPZKeGLpmbG9matTv5kYZQ79fK9ev/Ph5fYR6PoiiKrFy//u9D8XVI5u/+7juVb1BQM9sFc+r+8g0Kat793XeqYTOfEII3tm5dKxAKWS+cU/eWQCgkb2zdunaong7ZfEIIEp9OPUnTNOuFdOpu0TRNEp9OPfkgfj6Q+btyz/mo/f3bnO3/6BJFUUTt79+2K/ecj8PMJ4TgvYyMNIlUynqBnfpREqmUvJeRkfagXj6w+YQQrP7Vxg8FLH9C1Kk+CUQisvpXGz98GB8fynxCCOKeSsrj8nisF/5xFpfHI3FPJeU9rIcPbf7u3FxVYGjoDY7zApAVcWiaBIaG3tidmzuk27phNZ8Qgn/k5MRODAhwXgCOsCiKIhMDAtr+kZMT+yj+PZL5hBB8sDMzxUut1rOdkMdJXmq1/oOdmSmP6t0jm08IwVvbt6308PLqYTspj4M8vLx63tq+beVw+DYs5hNCsPn999e7KxTOA8CBclcoeja///764fJs2MwnhOD1Dz94Renj08V2ksajlD4+Xa9/+MErw+nXsJpPCMGftm9bGRASXMd2ssaTAkKC6/40TFW9Q80nhOC9LzLSQqOirrKdtPGg0Kioq+998eC9d6yZTwjBR3v2JE1NTMxjuFzWEzgWxXC5ZGpiYt5He/YkOcojh5lPCEHG8eMh855/fo9MLmc9mWNJMrmczHv++T0Zx4+HONIfh5pPCMGRigruute2vK32929jO6ljQWp//7Z1r215+0hFBdfR3jjc/H69s+PzxZOnTi1zvg08uPh8AZk8dWrZOzs+XzxSnoyY+YQQ7Dx71id12XP7PLy9jXB2CfeJooiHt7cxddlz+3aePeszkn6MqPn9ejM9fVVYTEzF4/5egEQqJWExMRVvpqevYsMHVswnhOBIZSW9euPGD73Uaj2Pz2fdiJEUj88nXmq1fvXGjR8eqayk2fKANfP7lXHieEjSM/OOu3l4WMb7QcDj84mbh4cl6Zl5xzNOOPZKfkyY36/tB7KnJS9anCN3dydcHm/cfOqcoijC5fGI3N2dJC9anLP9QPY0tnM96szv17+OHQ1fuPLFTDcPDwvD5RIOh8O6gQ8jDodDGC6XuHl4WBaufDHzX8eOhrOd2ztFEUIwGtl17qzfqZxDa749eHDtjR9+UPXeGmF7tMYL/DhEG5fHg9rfXzs7LW1H0oL5GStmJtSwHdugsH30DUXpX++PX75u3ScqX98OiqJGXZPQH5PK17dj+bp1n6R/vT+e7ZyN6TN/MA4UF0srL12aWZibO+9yQUFydXm5xmhgbzRYoUiEgJCQyrDY2BMx8fGHNRER5xZGRnaynaehMqbMv52cy5dFN1tavH+oKJ9WVvjfWRXFxfHXqqtDOh04SphULodPYGBpcGTE+dDo6JP+wSEXnnB3r18QFjYqxyO+H2PW/DvZ/99Cd0NXt7S7s9O9qb7Or1GrDWzS1gU2a7WrOtrbYdQbYDIZYTLeksHQV/VRFAQiEQRCYZ8EQgjFIsjkcnioVP/nqVJWKVSqKk9vZY1EKm0Rubq2L4mOHhdjEo0b8wfjm8pKrlGnk5lNRpGl18K1WCxcq8XCtVgsPIull0+sNpqiOVaG4ZoZhumhGaaXYZhehsv08gVCg9DFpSNVoxldI0wPI/8PtTbDaDsZI6YAAAAASUVORK5CYII="/>
-</svg>
diff --git a/app/design/frontend/Magento/rush/web/js/foo.js b/app/design/frontend/Magento/rush/web/js/foo.js
deleted file mode 100644
index c4ea9770085d2..0000000000000
--- a/app/design/frontend/Magento/rush/web/js/foo.js
+++ /dev/null
@@ -1 +0,0 @@
-console.log('logging from rush/web');
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 7093b72af5c8e..6e3dabaa0751f 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -174,10 +174,10 @@
     <preference for="Magento\Framework\App\View\Deployment\Version\StorageInterface" type="Magento\Framework\App\View\Deployment\Version\Storage\File"/>
     <preference for="Magento\Framework\View\Page\FaviconInterface" type="Magento\Theme\Model\Favicon\Favicon" />
     <preference for="Magento\Framework\View\Element\Message\InterpretationStrategyInterface" type="Magento\Framework\View\Element\Message\InterpretationMediator" />
+    <preference for="Magento\Framework\App\FeedInterface" type="Magento\Framework\App\Feed" />
+    <preference for="Magento\Framework\App\FeedFactoryInterface" type="Magento\Framework\App\FeedFactory" />
     <preference for="Magento\Framework\Indexer\Config\DependencyInfoProviderInterface" type="Magento\Framework\Indexer\Config\DependencyInfoProvider" />
     <preference for="Magento\Framework\Webapi\CustomAttribute\ServiceTypeListInterface" type="Magento\Eav\Model\TypeLocator\ComplexType"/>
-    <preference for="Magento\Framework\MultiDimensionalIndexer\IndexTableSwitcherInterface" type="Magento\Framework\MultiDimensionalIndexer\IndexTableSwitcher" />
-    <preference for="Magento\Framework\MultiDimensionalIndexer\IndexNameResolverInterface" type="Magento\Framework\MultiDimensionalIndexer\IndexNameResolver" />
     <preference for="Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface" type="Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DbSchemaReader" />
     <preference for="Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface" type="Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DbSchemaWriter" />
     <preference for="Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface" type="Magento\Framework\Setup\Declaration\Schema\SchemaConfig" />
@@ -282,6 +282,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\FeedFactory">
+        <arguments>
+            <argument name="formats" xsi:type="array">
+                <item name="rss" xsi:type="string">Magento\Framework\App\Feed</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Session\SaveHandler\Redis">
         <arguments>
             <argument name="config" xsi:type="object">Cm\RedisSession\Handler\ConfigInterface</argument>
@@ -1387,11 +1394,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\MultiDimensionalIndexer\IndexNameResolver">
-        <arguments>
-            <argument name="indexScopeResolver" xsi:type="object">Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory">
         <arguments>
             <argument name="typeFactories" xsi:type="array">
diff --git a/composer.json b/composer.json
index 856d078f8a340..e2a89ae1207a7 100644
--- a/composer.json
+++ b/composer.json
@@ -232,7 +232,6 @@
         "magento/theme-adminhtml-backend": "*",
         "magento/theme-frontend-blank": "*",
         "magento/theme-frontend-luma": "*",
-        "magento/theme-frontend-rush": "*",
         "magento/language-de_de": "*",
         "magento/language-en_us": "*",
         "magento/language-es_es": "*",
diff --git a/composer.lock b/composer.lock
index ee7503ce57328..b104cf2929ba7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "b491d3c677cbffbbcb7a64da82bfbec5",
-    "content-hash": "7e60e718b5d717fa3cca1f7e588de9c4",
+    "content-hash": "daacd8800615d44aa1af0ac06c1ecc46",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -52,7 +51,7 @@
                 }
             ],
             "description": "Braintree PHP Client Library",
-            "time": "2018-02-08 23:03:34"
+            "time": "2018-02-08T23:03:34+00:00"
         },
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -85,7 +84,7 @@
             ],
             "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
-            "time": "2018-04-05 15:28:43"
+            "time": "2018-04-05T15:28:43+00:00"
         },
         {
             "name": "colinmollenhour/cache-backend-redis",
@@ -121,7 +120,7 @@
             ],
             "description": "Zend_Cache backend using Redis with full support for tags.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-            "time": "2017-10-05 20:50:44"
+            "time": "2017-10-05T20:50:44+00:00"
         },
         {
             "name": "colinmollenhour/credis",
@@ -161,7 +160,7 @@
             ],
             "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
             "homepage": "https://github.com/colinmollenhour/credis",
-            "time": "2017-10-05 20:28:58"
+            "time": "2017-10-05T20:28:58+00:00"
         },
         {
             "name": "colinmollenhour/php-redis-session-abstract",
@@ -198,7 +197,7 @@
             ],
             "description": "A Redis-based session handler with optimistic locking",
             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-            "time": "2018-01-08 14:53:13"
+            "time": "2018-01-08T14:53:13+00:00"
         },
         {
             "name": "composer/ca-bundle",
@@ -254,7 +253,7 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2018-03-29 19:57:20"
+            "time": "2018-03-29T19:57:20+00:00"
         },
         {
             "name": "composer/composer",
@@ -331,7 +330,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2018-04-13 10:04:24"
+            "time": "2018-04-13T10:04:24+00:00"
         },
         {
             "name": "composer/semver",
@@ -393,7 +392,7 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2016-08-30 16:08:34"
+            "time": "2016-08-30T16:08:34+00:00"
         },
         {
             "name": "composer/spdx-licenses",
@@ -454,7 +453,7 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2018-01-31 13:17:27"
+            "time": "2018-01-31T13:17:27+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -485,7 +484,7 @@
             ],
             "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
             "homepage": "https://github.com/container-interop/container-interop",
-            "time": "2017-02-14 19:40:03"
+            "time": "2017-02-14T19:40:03+00:00"
         },
         {
             "name": "elasticsearch/elasticsearch",
@@ -540,7 +539,7 @@
                 "elasticsearch",
                 "search"
             ],
-            "time": "2017-11-08 17:04:47"
+            "time": "2017-11-08T17:04:47+00:00"
         },
         {
             "name": "guzzlehttp/ringphp",
@@ -591,7 +590,7 @@
                 }
             ],
             "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
-            "time": "2015-05-20 03:37:09"
+            "time": "2015-05-20T03:37:09+00:00"
         },
         {
             "name": "guzzlehttp/streams",
@@ -641,7 +640,7 @@
                 "Guzzle",
                 "stream"
             ],
-            "time": "2014-10-12 19:18:40"
+            "time": "2014-10-12T19:18:40+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -707,7 +706,7 @@
                 "json",
                 "schema"
             ],
-            "time": "2018-02-14 22:26:30"
+            "time": "2018-02-14T22:26:30+00:00"
         },
         {
             "name": "magento/composer",
@@ -743,7 +742,7 @@
                 "AFL-3.0"
             ],
             "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2018-03-26 16:19:52"
+            "time": "2018-03-26T16:19:52+00:00"
         },
         {
             "name": "magento/magento-composer-installer",
@@ -822,7 +821,7 @@
                 "composer-installer",
                 "magento"
             ],
-            "time": "2017-12-29 16:45:24"
+            "time": "2017-12-29T16:45:24+00:00"
         },
         {
             "name": "magento/zendframework1",
@@ -879,7 +878,7 @@
                 "source": "https://github.com/magento-engcom/zf1-php-7.2-support/tree/master",
                 "issues": "https://github.com/magento-engcom/zf1-php-7.2-support/issues"
             },
-            "time": "2018-04-06 17:12:22"
+            "time": "2018-04-06T17:12:22+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -957,7 +956,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19 01:22:40"
+            "time": "2017-06-19T01:22:40+00:00"
         },
         {
             "name": "oyejorge/less.php",
@@ -1019,7 +1018,7 @@
                 "php",
                 "stylesheet"
             ],
-            "time": "2017-03-28 22:19:25"
+            "time": "2017-03-28T22:19:25+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -1067,7 +1066,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2018-04-04 21:24:14"
+            "time": "2018-04-04T21:24:14+00:00"
         },
         {
             "name": "pelago/emogrifier",
@@ -1136,7 +1135,7 @@
                 "email",
                 "pre-processing"
             ],
-            "time": "2018-01-05 23:30:21"
+            "time": "2018-01-05T23:30:21+00:00"
         },
         {
             "name": "php-amqplib/php-amqplib",
@@ -1207,7 +1206,7 @@
                 "queue",
                 "rabbitmq"
             ],
-            "time": "2018-02-11 19:28:00"
+            "time": "2018-02-11T19:28:00+00:00"
         },
         {
             "name": "phpseclib/mcrypt_compat",
@@ -1256,7 +1255,7 @@
                 "encryption",
                 "mcrypt"
             ],
-            "time": "2018-01-13 23:07:52"
+            "time": "2018-01-13T23:07:52+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -1348,7 +1347,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2018-04-15 16:55:05"
+            "time": "2018-04-15T16:55:05+00:00"
         },
         {
             "name": "psr/container",
@@ -1397,7 +1396,7 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14 16:28:37"
+            "time": "2017-02-14T16:28:37+00:00"
         },
         {
             "name": "psr/http-message",
@@ -1447,7 +1446,7 @@
                 "request",
                 "response"
             ],
-            "time": "2016-08-06 14:39:51"
+            "time": "2016-08-06T14:39:51+00:00"
         },
         {
             "name": "psr/log",
@@ -1494,7 +1493,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10 12:19:37"
+            "time": "2016-10-10T12:19:37+00:00"
         },
         {
             "name": "ramsey/uuid",
@@ -1574,7 +1573,7 @@
                 "identifier",
                 "uuid"
             ],
-            "time": "2018-01-20 00:28:24"
+            "time": "2018-01-20T00:28:24+00:00"
         },
         {
             "name": "react/promise",
@@ -1620,7 +1619,7 @@
                 "promise",
                 "promises"
             ],
-            "time": "2017-03-25 12:08:31"
+            "time": "2017-03-25T12:08:31+00:00"
         },
         {
             "name": "seld/cli-prompt",
@@ -1668,7 +1667,7 @@
                 "input",
                 "prompt"
             ],
-            "time": "2017-03-18 11:32:45"
+            "time": "2017-03-18T11:32:45+00:00"
         },
         {
             "name": "seld/jsonlint",
@@ -1717,7 +1716,7 @@
                 "parser",
                 "validator"
             ],
-            "time": "2018-01-24 12:46:19"
+            "time": "2018-01-24T12:46:19+00:00"
         },
         {
             "name": "seld/phar-utils",
@@ -1761,7 +1760,7 @@
             "keywords": [
                 "phra"
             ],
-            "time": "2015-10-13 18:44:15"
+            "time": "2015-10-13T18:44:15+00:00"
         },
         {
             "name": "symfony/console",
@@ -1829,7 +1828,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-03 05:24:00"
+            "time": "2018-04-03T05:24:00+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -1892,7 +1891,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-06 07:35:43"
+            "time": "2018-04-06T07:35:43+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -1941,7 +1940,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-22 10:50:29"
+            "time": "2018-02-22T10:50:29+00:00"
         },
         {
             "name": "symfony/finder",
@@ -1990,7 +1989,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-04 05:10:37"
+            "time": "2018-04-04T05:10:37+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -2049,7 +2048,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-01-30 19:27:44"
+            "time": "2018-01-30T19:27:44+00:00"
         },
         {
             "name": "symfony/process",
@@ -2098,7 +2097,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-03 05:24:00"
+            "time": "2018-04-03T05:24:00+00:00"
         },
         {
             "name": "tedivm/jshrink",
@@ -2144,7 +2143,7 @@
                 "javascript",
                 "minifier"
             ],
-            "time": "2017-12-08 00:59:56"
+            "time": "2017-12-08T00:59:56+00:00"
         },
         {
             "name": "tubalmartin/cssmin",
@@ -2197,7 +2196,7 @@
                 "minify",
                 "yui"
             ],
-            "time": "2018-01-15 15:26:51"
+            "time": "2018-01-15T15:26:51+00:00"
         },
         {
             "name": "webonyx/graphql-php",
@@ -2244,7 +2243,7 @@
                 "api",
                 "graphql"
             ],
-            "time": "2017-12-12 09:03:21"
+            "time": "2017-12-12T09:03:21+00:00"
         },
         {
             "name": "zendframework/zend-captcha",
@@ -2301,7 +2300,7 @@
                 "captcha",
                 "zf2"
             ],
-            "time": "2017-02-23 08:09:44"
+            "time": "2017-02-23T08:09:44+00:00"
         },
         {
             "name": "zendframework/zend-code",
@@ -2354,7 +2353,7 @@
                 "code",
                 "zf2"
             ],
-            "time": "2017-10-20 15:21:32"
+            "time": "2017-10-20T15:21:32+00:00"
         },
         {
             "name": "zendframework/zend-config",
@@ -2410,7 +2409,7 @@
                 "config",
                 "zf2"
             ],
-            "time": "2016-02-04 23:01:10"
+            "time": "2016-02-04T23:01:10+00:00"
         },
         {
             "name": "zendframework/zend-console",
@@ -2463,7 +2462,7 @@
                 "console",
                 "zf"
             ],
-            "time": "2018-01-25 19:08:04"
+            "time": "2018-01-25T19:08:04+00:00"
         },
         {
             "name": "zendframework/zend-crypt",
@@ -2513,7 +2512,7 @@
                 "crypt",
                 "zf2"
             ],
-            "time": "2016-02-03 23:46:30"
+            "time": "2016-02-03T23:46:30+00:00"
         },
         {
             "name": "zendframework/zend-db",
@@ -2571,7 +2570,7 @@
                 "db",
                 "zf"
             ],
-            "time": "2018-04-09 13:21:36"
+            "time": "2018-04-09T13:21:36+00:00"
         },
         {
             "name": "zendframework/zend-di",
@@ -2618,7 +2617,7 @@
                 "di",
                 "zf2"
             ],
-            "time": "2016-04-25 20:58:11"
+            "time": "2016-04-25T20:58:11+00:00"
         },
         {
             "name": "zendframework/zend-diactoros",
@@ -2670,7 +2669,7 @@
                 "psr",
                 "psr-7"
             ],
-            "time": "2018-02-26 15:44:50"
+            "time": "2018-02-26T15:44:50+00:00"
         },
         {
             "name": "zendframework/zend-escaper",
@@ -2714,7 +2713,7 @@
                 "escaper",
                 "zf2"
             ],
-            "time": "2016-06-30 19:48:38"
+            "time": "2016-06-30T19:48:38+00:00"
         },
         {
             "name": "zendframework/zend-eventmanager",
@@ -2761,7 +2760,7 @@
                 "eventmanager",
                 "zf2"
             ],
-            "time": "2017-12-12 17:48:56"
+            "time": "2017-12-12T17:48:56+00:00"
         },
         {
             "name": "zendframework/zend-feed",
@@ -2822,7 +2821,7 @@
                 "feed",
                 "zf"
             ],
-            "time": "2017-12-04 17:59:38"
+            "time": "2017-12-04T17:59:38+00:00"
         },
         {
             "name": "zendframework/zend-filter",
@@ -2885,7 +2884,7 @@
                 "filter",
                 "zf"
             ],
-            "time": "2018-04-11 16:20:04"
+            "time": "2018-04-11T16:20:04+00:00"
         },
         {
             "name": "zendframework/zend-form",
@@ -2963,7 +2962,7 @@
                 "form",
                 "zf"
             ],
-            "time": "2017-12-06 21:09:08"
+            "time": "2017-12-06T21:09:08+00:00"
         },
         {
             "name": "zendframework/zend-http",
@@ -3016,7 +3015,7 @@
                 "zend",
                 "zf"
             ],
-            "time": "2017-10-13 12:06:24"
+            "time": "2017-10-13T12:06:24+00:00"
         },
         {
             "name": "zendframework/zend-hydrator",
@@ -3074,7 +3073,7 @@
                 "hydrator",
                 "zf2"
             ],
-            "time": "2016-02-18 22:38:26"
+            "time": "2016-02-18T22:38:26+00:00"
         },
         {
             "name": "zendframework/zend-i18n",
@@ -3141,7 +3140,7 @@
                 "i18n",
                 "zf2"
             ],
-            "time": "2017-05-17 17:00:12"
+            "time": "2017-05-17T17:00:12+00:00"
         },
         {
             "name": "zendframework/zend-inputfilter",
@@ -3194,7 +3193,7 @@
                 "inputfilter",
                 "zf"
             ],
-            "time": "2018-01-22 19:41:18"
+            "time": "2018-01-22T19:41:18+00:00"
         },
         {
             "name": "zendframework/zend-json",
@@ -3249,7 +3248,7 @@
                 "json",
                 "zf2"
             ],
-            "time": "2016-02-04 21:20:26"
+            "time": "2016-02-04T21:20:26+00:00"
         },
         {
             "name": "zendframework/zend-loader",
@@ -3293,7 +3292,7 @@
                 "loader",
                 "zf2"
             ],
-            "time": "2015-06-03 14:05:47"
+            "time": "2015-06-03T14:05:47+00:00"
         },
         {
             "name": "zendframework/zend-log",
@@ -3364,7 +3363,7 @@
                 "logging",
                 "zf2"
             ],
-            "time": "2018-04-09 21:59:51"
+            "time": "2018-04-09T21:59:51+00:00"
         },
         {
             "name": "zendframework/zend-mail",
@@ -3426,7 +3425,7 @@
                 "mail",
                 "zf2"
             ],
-            "time": "2018-03-01 18:57:00"
+            "time": "2018-03-01T18:57:00+00:00"
         },
         {
             "name": "zendframework/zend-math",
@@ -3476,7 +3475,7 @@
                 "math",
                 "zf2"
             ],
-            "time": "2016-04-07 16:29:53"
+            "time": "2016-04-07T16:29:53+00:00"
         },
         {
             "name": "zendframework/zend-mime",
@@ -3527,7 +3526,7 @@
                 "mime",
                 "zf"
             ],
-            "time": "2017-11-28 15:02:22"
+            "time": "2017-11-28T15:02:22+00:00"
         },
         {
             "name": "zendframework/zend-modulemanager",
@@ -3587,7 +3586,7 @@
                 "modulemanager",
                 "zf"
             ],
-            "time": "2017-12-02 06:11:18"
+            "time": "2017-12-02T06:11:18+00:00"
         },
         {
             "name": "zendframework/zend-mvc",
@@ -3679,7 +3678,7 @@
                 "mvc",
                 "zf2"
             ],
-            "time": "2017-12-14 22:44:10"
+            "time": "2017-12-14T22:44:10+00:00"
         },
         {
             "name": "zendframework/zend-psr7bridge",
@@ -3728,7 +3727,7 @@
                 "psr",
                 "psr-7"
             ],
-            "time": "2016-05-10 21:44:39"
+            "time": "2016-05-10T21:44:39+00:00"
         },
         {
             "name": "zendframework/zend-serializer",
@@ -3786,7 +3785,7 @@
                 "serializer",
                 "zf2"
             ],
-            "time": "2017-11-20 22:21:04"
+            "time": "2017-11-20T22:21:04+00:00"
         },
         {
             "name": "zendframework/zend-server",
@@ -3832,7 +3831,7 @@
                 "server",
                 "zf2"
             ],
-            "time": "2016-06-20 22:27:55"
+            "time": "2016-06-20T22:27:55+00:00"
         },
         {
             "name": "zendframework/zend-servicemanager",
@@ -3884,7 +3883,7 @@
                 "servicemanager",
                 "zf2"
             ],
-            "time": "2017-12-05 16:27:36"
+            "time": "2017-12-05T16:27:36+00:00"
         },
         {
             "name": "zendframework/zend-session",
@@ -3951,7 +3950,7 @@
                 "session",
                 "zf"
             ],
-            "time": "2018-02-22 16:33:54"
+            "time": "2018-02-22T16:33:54+00:00"
         },
         {
             "name": "zendframework/zend-soap",
@@ -4004,7 +4003,7 @@
                 "soap",
                 "zf2"
             ],
-            "time": "2018-01-29 17:51:26"
+            "time": "2018-01-29T17:51:26+00:00"
         },
         {
             "name": "zendframework/zend-stdlib",
@@ -4063,7 +4062,7 @@
                 "stdlib",
                 "zf2"
             ],
-            "time": "2016-04-12 21:17:31"
+            "time": "2016-04-12T21:17:31+00:00"
         },
         {
             "name": "zendframework/zend-text",
@@ -4110,7 +4109,7 @@
                 "text",
                 "zf2"
             ],
-            "time": "2016-02-08 19:03:52"
+            "time": "2016-02-08T19:03:52+00:00"
         },
         {
             "name": "zendframework/zend-uri",
@@ -4157,7 +4156,7 @@
                 "uri",
                 "zf2"
             ],
-            "time": "2018-04-10 17:08:10"
+            "time": "2018-04-10T17:08:10+00:00"
         },
         {
             "name": "zendframework/zend-validator",
@@ -4228,7 +4227,7 @@
                 "validator",
                 "zf2"
             ],
-            "time": "2018-02-01 17:05:33"
+            "time": "2018-02-01T17:05:33+00:00"
         },
         {
             "name": "zendframework/zend-view",
@@ -4315,7 +4314,7 @@
                 "view",
                 "zf2"
             ],
-            "time": "2018-01-17 22:21:50"
+            "time": "2018-01-17T22:21:50+00:00"
         }
     ],
     "packages-dev": [
@@ -4385,7 +4384,7 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2017-12-06 07:11:42"
+            "time": "2017-12-06T07:11:42+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -4439,7 +4438,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2017-07-22 11:58:36"
+            "time": "2017-07-22T11:58:36+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -4493,7 +4492,7 @@
                 "lexer",
                 "parser"
             ],
-            "time": "2014-09-09 13:34:57"
+            "time": "2014-09-09T13:34:57+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -4580,7 +4579,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2018-03-20 18:07:08"
+            "time": "2018-03-20T18:07:08+00:00"
         },
         {
             "name": "lusitanian/oauth",
@@ -4647,7 +4646,7 @@
                 "oauth",
                 "security"
             ],
-            "time": "2016-07-12 22:15:40"
+            "time": "2016-07-12T22:15:40+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -4692,7 +4691,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2017-10-19 19:58:43"
+            "time": "2017-10-19T19:58:43+00:00"
         },
         {
             "name": "pdepend/pdepend",
@@ -4732,7 +4731,7 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2017-12-13 13:21:38"
+            "time": "2017-12-13T13:21:38+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -4787,7 +4786,7 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2017-03-05 18:14:27"
+            "time": "2017-03-05T18:14:27+00:00"
         },
         {
             "name": "phar-io/version",
@@ -4834,7 +4833,7 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "time": "2017-03-05 17:38:23"
+            "time": "2017-03-05T17:38:23+00:00"
         },
         {
             "name": "php-cs-fixer/diff",
@@ -4885,7 +4884,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2018-02-15 16:58:55"
+            "time": "2018-02-15T16:58:55+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -4939,7 +4938,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2017-09-11 18:02:19"
+            "time": "2017-09-11T18:02:19+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -4990,7 +4989,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-30 07:14:17"
+            "time": "2017-11-30T07:14:17+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -5037,7 +5036,7 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-07-14 14:27:02"
+            "time": "2017-07-14T14:27:02+00:00"
         },
         {
             "name": "phpmd/phpmd",
@@ -5103,7 +5102,7 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2017-01-20 14:41:10"
+            "time": "2017-01-20T14:41:10+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -5166,7 +5165,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2018-02-19 10:16:54"
+            "time": "2018-02-19T10:16:54+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -5229,7 +5228,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-04-06 15:36:58"
+            "time": "2018-04-06T15:36:58+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -5276,7 +5275,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2017-11-27 13:52:08"
+            "time": "2017-11-27T13:52:08+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -5317,7 +5316,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21 13:50:34"
+            "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -5366,7 +5365,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2017-02-26 11:10:40"
+            "time": "2017-02-26T11:10:40+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -5415,7 +5414,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-11-27 05:48:46"
+            "time": "2017-11-27T05:48:46+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -5499,7 +5498,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-08-03 13:59:28"
+            "time": "2017-08-03T13:59:28+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -5558,7 +5557,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2017-08-03 14:08:16"
+            "time": "2017-08-03T14:08:16+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -5603,7 +5602,7 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04 06:30:41"
+            "time": "2017-03-04T06:30:41+00:00"
         },
         {
             "name": "sebastian/comparator",
@@ -5667,7 +5666,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2017-03-03 06:26:08"
+            "time": "2017-03-03T06:26:08+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -5719,7 +5718,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2017-05-22 07:24:03"
+            "time": "2017-05-22T07:24:03+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -5769,7 +5768,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2017-07-01 08:51:00"
+            "time": "2017-07-01T08:51:00+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -5836,7 +5835,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2017-04-03 13:19:02"
+            "time": "2017-04-03T13:19:02+00:00"
         },
         {
             "name": "sebastian/finder-facade",
@@ -5875,7 +5874,7 @@
             ],
             "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
             "homepage": "https://github.com/sebastianbergmann/finder-facade",
-            "time": "2017-11-18 17:31:49"
+            "time": "2017-11-18T17:31:49+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -5926,7 +5925,7 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2017-04-27 15:39:26"
+            "time": "2017-04-27T15:39:26+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -5973,7 +5972,7 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03 12:35:26"
+            "time": "2017-08-03T12:35:26+00:00"
         },
         {
             "name": "sebastian/object-reflector",
@@ -6018,7 +6017,7 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29 09:07:27"
+            "time": "2017-03-29T09:07:27+00:00"
         },
         {
             "name": "sebastian/phpcpd",
@@ -6068,7 +6067,7 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "time": "2017-11-16 08:49:28"
+            "time": "2017-11-16T08:49:28+00:00"
         },
         {
             "name": "sebastian/recursion-context",
@@ -6121,7 +6120,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03 06:23:57"
+            "time": "2017-03-03T06:23:57+00:00"
         },
         {
             "name": "sebastian/resource-operations",
@@ -6163,7 +6162,7 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28 20:34:47"
+            "time": "2015-07-28T20:34:47+00:00"
         },
         {
             "name": "sebastian/version",
@@ -6206,7 +6205,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03 07:35:21"
+            "time": "2016-10-03T07:35:21+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -6257,7 +6256,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2017-12-19 21:44:46"
+            "time": "2017-12-19T21:44:46+00:00"
         },
         {
             "name": "symfony/config",
@@ -6319,7 +6318,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-19 22:35:49"
+            "time": "2018-03-19T22:35:49+00:00"
         },
         {
             "name": "symfony/dependency-injection",
@@ -6390,7 +6389,7 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-02 09:52:41"
+            "time": "2018-04-02T09:52:41+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -6444,7 +6443,7 @@
                 "configuration",
                 "options"
             ],
-            "time": "2018-01-18 22:19:33"
+            "time": "2018-01-18T22:19:33+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -6503,7 +6502,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-01-30 19:27:44"
+            "time": "2018-01-30T19:27:44+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
@@ -6558,7 +6557,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-01-31 17:43:24"
+            "time": "2018-01-31T17:43:24+00:00"
         },
         {
             "name": "symfony/stopwatch",
@@ -6607,7 +6606,7 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-19 16:50:22"
+            "time": "2018-02-19T16:50:22+00:00"
         },
         {
             "name": "theseer/fdomdocument",
@@ -6647,7 +6646,7 @@
             ],
             "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
             "homepage": "https://github.com/theseer/fDOMDocument",
-            "time": "2017-06-30 11:53:12"
+            "time": "2017-06-30T11:53:12+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -6687,7 +6686,7 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07 12:08:54"
+            "time": "2017-04-07T12:08:54+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -6737,7 +6736,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2018-01-29 19:49:41"
+            "time": "2018-01-29T19:49:41+00:00"
         }
     ],
     "aliases": [],
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLogoutPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLogoutPage.xml
new file mode 100644
index 0000000000000..5660df619c73d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLogoutPage.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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminLogoutPage" url="admin/auth/logout/" area="admin" module="Magento_Backend">
+        <section name="removeAfterMqe-896"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMainActionsSection.xml
new file mode 100644
index 0000000000000..3097a6962a064
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMainActionsSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminMainActionsSection">
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml
index 3fe09e53dbdac..a8598ded6ec17 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml
@@ -17,5 +17,6 @@
         <data key="optionInputType1">checkbox</data>
         <data key="defaultQuantity">10</data>
         <data key="status">1</data>
+        <data key="urlKey" unique="suffix">bundleproduct</data>
     </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/AdminProductFormBundleSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/AdminProductFormBundleSection.xml
index 4598c9b984d20..551d0e44b58ae 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/AdminProductFormBundleSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/AdminProductFormBundleSection.xml
@@ -9,12 +9,17 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFormBundleSection">
+        <element name="bundleItemsToggle" type="button" selector="//span[text()='Bundle Items']"/>
         <element name="shipmentType" type="select" selector=".admin__control-select[name='product[shipment_type]']"/>
         <element name="addOption" type="button" selector="button[data-index='add_button']"/>
         <element name="firstOptionTitle" type="input" selector="[name='bundle_options[bundle_options][0][title]']"/>
         <element name="firstInputType" type="select" selector="[name='bundle_options[bundle_options][0][type]']"/>
         <element name="firstRequired" type="checkbox" selector="[name='bundle_options[bundle_options][0][required]']"/>
         <element name="firstProductQuantity" type="input" selector="[name='bundle_options[bundle_options][0][bundle_selections][0][selection_qty]']"/>
+        <element name="bundleOptionXTitle" type="input" selector="[name='bundle_options[bundle_options][{{x}}][title]']" parameterized="true"/>
+        <element name="bundleOptionXInputType" type="select" selector="[name='bundle_options[bundle_options][{{x}}][type]']" parameterized="true"/>
+        <element name="bundleOptionXRequired" type="checkbox" selector="[name='bundle_options[bundle_options][{{x}}][required]']" parameterized="true"/>
+        <element name="bundleOptionXProductYQuantity" type="input" selector="[name='bundle_options[bundle_options][{{x}}][bundle_selections][{{y}}][selection_qty]']" parameterized="true"/>
         <element name="addProductsToOption" type="button" selector="[data-index='modal_set']" timeout="30"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddRemoveProductImageBundleProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddRemoveProductImageBundleProductTest.xml
new file mode 100644
index 0000000000000..d39b633bedcba
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddRemoveProductImageBundleProductTest.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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddRemoveProductImageBundleProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle Product Add/Remove Images"/>
+            <title value="Admin should be able to add/remove images for a Bundle Product"/>
+            <description value="Admin should be able to add/remove images for a Bundle Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-115"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Create a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
+        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillBundleProductNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add two bundle items -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!--Save product-->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="BundleProduct"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Remove image from product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageRemove"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid"/>
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <!-- Skip success message check when saving product because of bug MAGETWO-91177 -->
+        <!-- actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage" stepKey="assertProductImageNotInStorefrontProductPage">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml
index 436d7cf5a8d17..c4843260f9310 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml
@@ -25,18 +25,41 @@
         <arguments>
             <argument name="product" defaultValue="_defaultProduct"/>
         </arguments>
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductSku"/>
-        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="fillProductPrice"/>
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="fillProductQty"/>
         <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="selectStockStatus"/>
+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has weight" stepKey="selectWeight"/>
         <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="fillProductWeight"/>
     </actionGroup>
 
+    <!--Fill main fields in create product form with no weight, useful for virtual and downloadable products -->
+    <actionGroup name="fillMainProductFormNoWeight">
+        <arguments>
+            <argument name="product" defaultValue="DownloadableProduct"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="fillProductQty"/>
+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="selectStockStatus"/>
+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has no weight" stepKey="selectWeight"/>
+    </actionGroup>
+
+    <!--Fill main fields in create product form with name and sku -->
+    <actionGroup name="fillProductNameAndSkuInProductForm">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
+    </actionGroup>
+
     <!--Check that required fields are actually required-->
     <actionGroup name="checkRequiredFieldsInProductForm">
-        <clearField selector="{{AdminProductFormSection.productName}}" stepKey="clearProductSku"/>
-        <clearField selector="{{AdminProductFormSection.productSku}}" stepKey="clearProductName"/>
+        <clearField selector="{{AdminProductFormSection.productName}}" stepKey="clearProductName"/>
+        <clearField selector="{{AdminProductFormSection.productSku}}" stepKey="clearProductSku"/>
         <clearField selector="{{AdminProductFormSection.productPrice}}" stepKey="clearProductPrice"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeStillOnEditPage"/>
@@ -64,6 +87,33 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
     </actionGroup>
 
+    <!--Remove image for product-->
+    <actionGroup name="removeProductImage">
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
+        <waitForPageLoad time="30" stepKey="waitForPageRefresh"/>
+        <click selector="{{AdminProductImagesSection.removeImageButton}}" stepKey="clickRemoveImage"/>
+    </actionGroup>
+
+    <!-- Assert product image in Admin Product page -->
+    <actionGroup name="assertProductImageAdminProductPage">
+        <arguments>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{AdminProductImagesSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!-- Assert no product image in Admin Product page -->
+    <actionGroup name="assertProductImageNotInAdminProductPage">
+        <arguments>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dontSeeElement selector="{{AdminProductImagesSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+
     <!--Fill fields for simple product in a category in Admin-->
     <actionGroup name="FillAdminSimpleProductForm">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductGridActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductGridActionGroup.xml
index b153cf4a5b538..9bfbab2d5d872 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductGridActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductGridActionGroup.xml
@@ -29,6 +29,18 @@
         <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
     </actionGroup>
 
+    <!--Filter the product grid by the SKU string -->
+    <actionGroup name="filterProductGridBySku2">
+        <arguments>
+            <argument name="sku" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.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"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+    </actionGroup>
+
     <!--Filter the product grid by the Name field-->
     <actionGroup name="filterProductGridByName">
         <arguments>
@@ -82,6 +94,17 @@
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearch"/>
     </actionGroup>
 
+    <!--Search product grid with keyword search-->
+    <!-- Argument type: string (see more in MQE-965) -->
+    <actionGroup name="searchProductGridByKeyword2">
+        <arguments>
+            <argument name="keyword" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearch"/>
+    </actionGroup>
+
     <!--Filter product grid by name, sku, and type; and see expected product-->
     <actionGroup name="viewProductInAdminGrid">
         <arguments>
@@ -121,4 +144,24 @@
         <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
     </actionGroup>
 
+    <!--Open product for edit by clicking row X and column Y in product grid-->
+    <actionGroup name="openProducForEditByClickingRowXColumnYInProductGrid">
+        <arguments>
+            <argument name="X" type="string" defaultValue="1"/>
+            <argument name="Y" type="string" defaultValue="2"/>
+        </arguments>
+        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton(X, Y)}}" stepKey="openProductForEdit"/>
+    </actionGroup>
+
+    <!-- Sort products by ID descending -->
+    <actionGroup name="sortProductsByIdDescending">
+        <conditionalClick selector="{{AdminProductGridTableHeaderSection.id('ascend')}}" dependentSelector="{{AdminProductGridTableHeaderSection.id('descend')}}" visible="false" stepKey="sortById"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Sort products by ID ascending -->
+    <actionGroup name="sortProductsByIdAscending">
+        <conditionalClick selector="{{AdminProductGridTableHeaderSection.id('descend')}}" dependentSelector="{{AdminProductGridTableHeaderSection.id('ascend')}}" visible="false" stepKey="sortById"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
 </actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
index 6b9310cb95f53..3d4195d92f2c7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
@@ -12,7 +12,7 @@
         <arguments>
             <argument name="product"/>
         </arguments>
-        <!-- Go to storefront product page, assert product visibility -->
+        <!-- Go to storefront product page, assert product name, sku and price -->
         <amOnPage url="{{product.urlKey}}.html" stepKey="navigateToProductPage"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
         <seeInTitle userInput="{{product.name}}" stepKey="assertProductNameTitle"/>
@@ -20,4 +20,26 @@
         <see userInput="{{product.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
         <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
     </actionGroup>
+    <actionGroup name="AssertProductNameAndSkuInStorefrontProductPage">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <!-- Go to storefront product page, assert product name and sku -->
+        <amOnPage url="{{product.urlKey}}.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="assertProductNameTitle"/>
+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+    </actionGroup>
+    <actionGroup name="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <!-- Go to storefront product page, assert product name and sku -->
+        <amOnPage url="{{product.custom_attributes[url_key]}}.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="assertProductNameTitle"/>
+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+    </actionGroup>
 </actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductActionGroup.xml
index ffc1687bc9f58..7673ce6874482 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductActionGroup.xml
@@ -23,4 +23,48 @@
         <see userInput="{{product.custom_attributes[description]}}" selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="assertProductDescription"/>
         <see userInput="{{product.custom_attributes[short_description]}}" selector="{{StorefrontProductInfoMainSection.productShortDescription}}" stepKey="assertProductShortDescription"/>
     </actionGroup>
+
+    <!-- Assert product image in Storefront Product page -->
+    <actionGroup name="assertProductImageStorefrontProductPage">
+        <arguments>
+            <argument name="product"/>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!-- Assert product image in Storefront Product page -->
+    <actionGroup name="assertProductImageStorefrontProductPage2">
+        <arguments>
+            <argument name="product"/>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!-- Assert no product image in Storefront Product page -->
+    <actionGroup name="assertProductImageNotInStorefrontProductPage">
+        <arguments>
+            <argument name="product"/>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dontSeeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
+
+    <!-- Assert no product image in Storefront Product page -->
+    <actionGroup name="assertProductImageNotInStorefrontProductPage2">
+        <arguments>
+            <argument name="product"/>
+            <argument name="image" defaultValue="MagentoLogo"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dontSeeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CategoryData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CategoryData.xml
index 54e9c476908f4..9ce257942b30d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CategoryData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CategoryData.xml
@@ -14,7 +14,7 @@
         <data key="is_active">true</data>
     </entity>
     <entity name="ApiCategory" type="category">
-        <data key="name" unique="suffix">Api Category</data>
+        <data key="name" unique="suffix">ApiCategory</data>
         <data key="is_active">true</data>
     </entity>
     <entity name="SimpleSubCategory" type="category">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeData.xml
index 0adf1e91ae853..ab0eac4960dc6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeData.xml
@@ -73,4 +73,25 @@
         <data key="used_for_sort_by">true</data>
         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
     </entity>
+    <entity name="productAttributeWithDropdownTwoOptions" type="ProductAttribute">
+        <data key="attribute_code">testattribute</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">true</data>
+        <data key="is_visible">true</data>
+        <data key="is_visible_in_advanced_search">true</data>
+        <data key="is_visible_on_front">true</data>
+        <data key="is_filterable">true</data>
+        <data key="is_filterable_in_search">true</data>
+        <data key="used_in_product_listing">true</data>
+        <data key="is_used_for_promo_rules">true</data>
+        <data key="is_comparable">true</data>
+        <data key="is_used_in_grid">true</data>
+        <data key="is_visible_in_grid">true</data>
+        <data key="is_filterable_in_grid">true</data>
+        <data key="used_for_sort_by">true</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
index a9f270c4d4de0..cc6a32e7223f9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
@@ -38,6 +38,10 @@
         <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
         <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
     </entity>
+    <entity name="ApiSimpleProductUpdateName" type="product">
+        <data key="name" unique="suffix">Updated Api Simple Product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+    </entity>
     <entity name="SimpleProduct" type="product">
         <data key="sku" unique="suffix">SimpleProduct</data>
         <data key="type_id">simple</data>
@@ -47,10 +51,34 @@
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">1000</data>
+        <data key="urlKey" unique="suffix">simpleproduct</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>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">123.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">1000</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+    </entity>
+    <entity name="SimpleProduct3" type="product">
+        <data key="sku" unique="suffix">simple</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">simple</data>
+        <data key="price">123.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">1000</data>
+        <data key="urlKey" unique="suffix">simple</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+    </entity>
     <entity name="NewSimpleProduct" type="product">
         <data key="price">321.00</data>
     </entity>
@@ -120,6 +148,15 @@
         <data key="shareable">Yes</data>
         <data key="file">magento-logo.png</data>
     </entity>
+    <entity name="MagentoLogo" type="image">
+        <data key="title" unique="suffix">MagentoLogo</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="file">magento-logo.png</data>
+        <data key="filename">magento-logo</data>
+        <data key="file_extension">png</data>
+    </entity>
     <entity name="ProductWithUnicode" type="product">
         <data key="sku" unique="suffix">&#38657;&#20135;&#21697;</data>
         <data key="type_id">simple</data>
@@ -133,6 +170,20 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="defaultVirtualProduct" type="product">
+        <data key="sku" unique="suffix">virtualProduct</data>
+        <data key="type_id">virtual</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">virtualProduct</data>
+        <data key="price">12.34</data>
+        <data key="urlKey" unique="suffix">virtualproduct</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="weight">0</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
     <entity name="productWithDescription" type="product">
         <data key="sku" unique="suffix">testProductWithDescriptionSku</data>
         <data key="type_id">simple</data>
@@ -148,6 +199,20 @@
         <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
+    <entity name="ApiProductWithDescription" type="product">
+        <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 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="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
+    </entity>
     <entity name="_newDefaultProduct" type="product">
         <data key="sku" unique="suffix">testSku</data>
         <data key="type_id">simple</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributesEditPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributesEditPage.xml
new file mode 100644
index 0000000000000..e9a40a7541a98
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributesEditPage.xml
@@ -0,0 +1,13 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="ProductAttributesEditPage" url="catalog/product_action_attribute/edit/" area="admin" module="Catalog">
+        <section name="AdminEditProductAttributesSection"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml
new file mode 100644
index 0000000000000..a08c3e5fb1fec
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminProductEditPage" url="catalog/product/edit/id/{{productId}}/" area="admin" module="Magento_Catalog" parameterized="true">
+        <!-- This page object only exists for the url. Use the AdminProductCreatePage for selectors. -->
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminEditProductAttributesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminEditProductAttributesSection.xml
new file mode 100644
index 0000000000000..bb0343c3a85c0
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminEditProductAttributesSection.xml
@@ -0,0 +1,22 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminEditProductAttributesSection">
+        <element name="AttributeName" type="text" selector="#name"/>
+        <element name="ChangeAttributeNameToggle" type="checkbox" selector="#toggle_name"/>
+        <element name="NameError" type="text" selector="#name-error"/>
+        <element name="AttributePrice" type="text" selector="#price"/>
+        <element name="ChangeAttributePriceToggle" type="checkbox" selector="#toggle_price"/>
+        <element name="PriceError" type="text" selector="#price-error"/>
+        <element name="AttributeDescription" type="text" selector="#description"/>
+        <element name="ChangeAttributeDescriptionToggle" type="checkbox" selector="#toggle_description"/>
+        <element name="Save" type="button" selector="button[title=Save]" timeout="30"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
index 08c3d42c02457..efc2de3c007e5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
@@ -11,12 +11,12 @@
         <element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
         <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
         <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
-        <element name="productWeight" type="input" selector=".admin__field[data-index=weight] input"/>
         <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']"/>
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
         <element name="productStockStatus" type="select" selector="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]']"/>
         <element name="contentTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Content']"/>
         <element name="fieldError" type="text" selector="//input[@name='product[{{fieldName}}]']/following-sibling::label[@class='admin__field-error']" parameterized="true"/>
         <element name="priceFieldError" type="text" selector="//input[@name='product[price]']/parent::div/parent::div/label[@class='admin__field-error']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridFilterSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridFilterSection.xml
index ea822d223e4a2..3436bbf0c08d2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridFilterSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridFilterSection.xml
@@ -10,7 +10,7 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductGridFilterSection">
         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
-        <element name="clearAll" type="button" selector=".admin__data-grid-header .admin__data-grid-filters-current._show .action-clear"/>
+        <element name="clearAll" type="button" selector=".admin__data-grid-header .admin__data-grid-filters-current._show .action-clear" timeout="30"/>
         <element name="enabledFilters" type="textarea" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
         <element name="basicSearchFilter" type="textarea" selector=".admin__control-text.data-grid-search-control"/>
         <element name="basicSearchFilterButton" type="button" selector=".data-grid-search-control-wrap button.action-submit"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
index c513c22ddde60..e4f571f7f0d83 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
@@ -23,6 +23,8 @@
         <element name="bulkActionDropdown" type="button" selector="div.admin__data-grid-header-row.row div.action-select-wrap button.action-select"/>
         <element name="bulkActionOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/>
         <element name="productGridXRowYColumnButton" type="input" selector="table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
+        <element name="table" type="text" selector="#container > div > div.admin__data-grid-wrap > table"/>
         <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
+        <element name="productGridCheckboxOnRow" type="checkbox" selector="//*[@id='container']//tr[{{row}}]/td[1]//input" parameterized="true"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridTableHeaderSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridTableHeaderSection.xml
new file mode 100644
index 0000000000000..7b9fe410f7c94
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridTableHeaderSection.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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminProductGridTableHeaderSection">
+        <element name="id" type="button" selector=".//*[@class='sticky-header']/following-sibling::*//th[@class='data-grid-th _sortable _draggable _{{order}}']/span[text()='ID']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductImagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductImagesSection.xml
index bc59aae93296c..a9749ac677964 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductImagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductImagesSection.xml
@@ -12,5 +12,7 @@
         <element name="productImagesToggle" type="button" selector="div[data-index=gallery] .admin__collapsible-title"/>
         <element name="imageFileUpload" type="input" selector="#fileupload"/>
         <element name="imageUploadButton" type="button" selector="div.image div.fileinput-button"/>
+        <element name="imageFile" type="text" selector="//*[@id='media_gallery_content']//img[contains(@src, '{{url}}')]" parameterized="true"/>
+        <element name="removeImageButton" type="button" selector=".action-remove"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminUpdateAttributesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminUpdateAttributesSection.xml
new file mode 100644
index 0000000000000..7ef8d7706ba20
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminUpdateAttributesSection.xml
@@ -0,0 +1,41 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminUpdateAttributesSection">
+        <element name="saveButton" type="button" selector="button[title='Save']" timeout="30"/>
+
+        <element name="toggleCountryOfManufacture" type="checkbox" selector="#toggle_country_of_manufacture"/>
+        <element name="toggleCustomDesign" type="checkbox" selector="#toggle_custom_design"/>
+        <element name="toggleCustomDesignFrom" type="checkbox" selector="#toggle_custom_design_from"/>
+        <element name="toggleCustomDesignTo" type="checkbox" selector="#toggle_custom_design_to"/>
+        <element name="toggleCustomLayout" type="checkbox" selector="#toggle_custom_layout"/>
+        <element name="toggleCustomLayoutUpdate" type="checkbox" selector="#toggle_custom_layout_update"/>
+        <element name="toggleDescription" type="checkbox" selector="#toggle_description"/>
+        <element name="toggleMetaDescription" type="checkbox" selector="#toggle_meta_description"/>
+        <element name="toggleMetaKeyword" type="checkbox" selector="#toggle_meta_keyword"/>
+        <element name="toggleMetaTitle" type="checkbox" selector="#toggle_meta_title"/>
+        <element name="toggleName" type="checkbox" selector="#toggle_name"/>
+        <element name="toggleNewsFromDate" type="checkbox" selector="#toggle_news_from_date"/>
+        <element name="toggleNewsToDate" type="checkbox" selector="#toggle_news_to_date"/>
+        <element name="toggleOptionsContainer" type="checkbox" selector="#toggle_options_container"/>
+        <element name="togglePageLayout" type="checkbox" selector="#toggle_page_layout"/>
+        <element name="togglePrice" type="checkbox" selector="#toggle_price"/>
+        <element name="toggleShortDescription" type="checkbox" selector="#toggle_short_description"/>
+        <element name="toggleSpecialFromDate" type="checkbox" selector="#toggle_special_from_date"/>
+        <element name="toggleSpecialPrice" type="checkbox" selector="#toggle_special_price"/>
+        <element name="toggleSpecialToDate" type="checkbox" selector="#toggle_special_to_date"/>
+        <element name="toggleTaxClass" type="checkbox" selector="#toggle_tax_class_id"/>
+        <element name="toggleVisibility" type="checkbox" selector="#toggle_visibility"/>
+        <element name="toggleWeight" type="checkbox" selector="#toggle_weight"/>
+        <element name="toggleColor" type="checkbox" selector="#toggle_color"/>
+
+        <element name="description" type="input" selector="#description"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml
index d40fbbfc75d25..39275d61485a8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryMainSection">
+        <element name="modeListButton" type="button" selector="#mode-list"/>
         <element name="CategoryTitle" type="text" selector="#page-title-heading span"/>
         <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
         <element name="specifiedProductItemInfo" type="button" selector="//a[@class='product-item-link'][contains(text(), '{{var1}}')]" parameterized="true"/>
@@ -18,5 +19,9 @@
         <element name="CatalogDescription" type="text" selector="//div[@class='category-description']//p"/>
         <element name="mediaDescription" type="text" selector="img[alt='{{var1}}']" parameterized="true"/>
         <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
+        <element name="productImage" type="text" selector="img.product-image-photo"/>
+        <element name="productLink" type="text" selector="a.product-item-link"/>
+        <element name="productLinkByHref" type="text" selector="a.product-item-link[href$='{{var1}}.html']" parameterized="true"/>
+        <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductMediaSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductMediaSection.xml
new file mode 100644
index 0000000000000..89b9a344e7d12
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductMediaSection.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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductMediaSection">
+        <element name="imageFile" type="text" selector="//*[@class='product media']//img[contains(@src, '{{filename}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddRemoveProductImageSimpleProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddRemoveProductImageSimpleProductTest.xml
new file mode 100644
index 0000000000000..f3ff2d1b3f635
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddRemoveProductImageSimpleProductTest.xml
@@ -0,0 +1,84 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddRemoveProductImageSimpleProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Simple Product Add/Remove Images"/>
+            <title value="Admin should be able to add/remove images for a Simple Product"/>
+            <description value="Admin should be able to add/remove images for a Simple Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-113"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!--Create product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateSimpleProduct">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillSimpleProductMain">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProductSimple">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="SimpleProduct3"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Remove image from product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageRemove"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid"/>
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <!-- Skip success message check when saving product because of bug MAGETWO-91177 -->
+        <!-- actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage" stepKey="assertProductImageNotInStorefrontProductPage">
+            <argument name="product" value="SimpleProduct3"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddRemoveProductImageVirtualProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddRemoveProductImageVirtualProductTest.xml
new file mode 100644
index 0000000000000..360b1b4d95819
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddRemoveProductImageVirtualProductTest.xml
@@ -0,0 +1,84 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddRemoveProductImageVirtualProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Virtual Product Add/Remove Images"/>
+            <title value="Admin should be able to add/remove images for a Virtual Product"/>
+            <description value="Admin should be able to add/remove images for a Virtual Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-103"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!--Create product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductMain">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="defaultVirtualProduct"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Remove image from product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageRemove"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid"/>
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <!-- Skip success message check when saving product because of bug MAGETWO-91177 -->
+        <!-- actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage" stepKey="assertProductImageNotInStorefrontProductPage">
+            <argument name="product" value="defaultVirtualProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductDuplicateUrlkeyTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductDuplicateUrlkeyTest.xml
index 9f16ce22745ee..bb5583f0c3d1a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductDuplicateUrlkeyTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductDuplicateUrlkeyTest.xml
@@ -15,8 +15,7 @@
             <title value="Error when try to save project with duplicate URL key."/>
             <description value="Error when try to save project with duplicate URL key."/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-87586"/>
-            <!--useCaseId value="USECASE-114"/-->
+            <testCaseId value="MC-112"/>
             <group value="product"/>
         </annotations>
         <before>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductWithUnicodeTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductWithUnicodeTest.xml
index 46cf809ce9d47..ace6cf7198fc4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductWithUnicodeTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductWithUnicodeTest.xml
@@ -15,8 +15,7 @@
             <title value="You should be able to create a unicode named simple product in admin."/>
             <description value="You should be able to create a unicode named simple product in admin."/>
             <severity value="MAJOR" />
-            <testCaseId value="MAGETWO-87504"/>
-            <!--useCaseId value="USECASE-114"/-->
+            <testCaseId value="MC-105"/>
             <group value="product"/>
         </annotations>
         <before>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
new file mode 100644
index 0000000000000..f0d50c8a5f7d6
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -0,0 +1,84 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminMassUpdateProductAttributesGlobalScopeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Mass update product attributes"/>
+            <title value="Admin should be able to mass update product attributes in global scope"/>
+            <description value="Admin should be able to mass update product attributes in global scope"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-56"/>
+            <group value="Catalog"/>
+            <group value="Product Attributes"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProductOne">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="AdminDeleteStoreViewActionGroup"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Search and select products -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
+            <argument name="keyword" value="api-simple-product"/>
+        </actionGroup>
+        <actionGroup ref="sortProductsByIdDescending" stepKey="sortProductsByIdDescending"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckbox1"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckbox2"/>
+        <!-- Mass update attributes -->
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickOption"/>
+        <waitForPageLoad stepKey="waitForBulkUpdatePage"/>
+        <seeInCurrentUrl stepKey="seeInUrl" url="catalog/product_action_attribute/edit/"/>
+        <!-- Switch store view -->
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewActionGroup"/>
+        <!-- Update attribute -->
+        <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"/>
+
+        <!-- Assert on storefront default view -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameDefault">
+            <argument name="name" value="$$createProductOne.name$$"/>
+            <argument name="priceFrom" value="$$createProductOne.price$$0"/>
+            <argument name="priceTo" value="$$createProductOne.price$$0"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
+
+        <!-- Assert on storefront custom view -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupCustom"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="StorefrontSwitchStoreViewActionGroup"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameCustom">
+            <argument name="name" value="$$createProductOne.name$$"/>
+            <argument name="priceFrom" value="$$createProductOne.price$$0"/>
+            <argument name="priceTo" value="$$createProductOne.price$$0"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultCustom"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInCustom"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
new file mode 100644
index 0000000000000..96b8032f88751
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
@@ -0,0 +1,56 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminMassUpdateProductAttributesMissingRequiredFieldTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Mass update product attributes"/>
+            <title value="Mass update product attributes - missing required field"/>
+            <description value="Mass update product attributes - missing required field"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-55"/>
+            <group value="Catalog"/>
+            <group value="Product Attributes"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProductOne">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Search and select products -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
+            <argument name="keyword" value="api-simple-product"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckbox1"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckbox2"/>
+        <!-- Mass update attributes -->
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickOption"/>
+        <waitForPageLoad stepKey="waitForBulkUpdatePage"/>
+        <seeInCurrentUrl stepKey="seeInUrl" url="catalog/product_action_attribute/edit/"/>
+        <click selector="{{AdminEditProductAttributesSection.ChangeAttributeNameToggle}}" stepKey="toggleToChangeName"/>
+        <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
+        <see stepKey="seeError" selector="{{AdminEditProductAttributesSection.NameError}}" userInput="This is a required field"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
new file mode 100644
index 0000000000000..00a2e41e2dfb3
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
@@ -0,0 +1,76 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminMassUpdateProductAttributesStoreViewScopeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Mass update product attributes"/>
+            <title value="Admin should be able to mass update product attributes in store view scope"/>
+            <description value="Admin should be able to mass update product attributes in store view scope"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-128"/>
+            <group value="Catalog"/>
+            <group value="Product Attributes"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
+            <createData entity="ApiProductWithDescription" stepKey="createProductOne"/>
+            <createData entity="ApiProductWithDescription" stepKey="createProductTwo"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="AdminDeleteStoreViewActionGroup"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Search and select products -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
+            <argument name="keyword" value="api-simple-product"/>
+        </actionGroup>
+        <actionGroup ref="sortProductsByIdDescending" stepKey="sortProductsByIdDescending"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckbox1"/>
+        <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckbox2"/>
+        <!-- Mass update attributes -->
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickOption"/>
+        <waitForPageLoad stepKey="waitForBulkUpdatePage"/>
+        <seeInCurrentUrl stepKey="seeInUrl" url="catalog/product_action_attribute/edit/"/>
+        <!-- Switch store view -->
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewActionGroup"/>
+        <!-- Update attribute -->
+        <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"/>
+
+        <!-- Assert on storefront default view -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault">
+            <argument name="name" value="$$createProductOne.name$$"/>
+            <argument name="description" value="$$createProductOne.custom_attributes[description]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
+
+        <!-- Assert on storefront custom view -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupCustom"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="StorefrontSwitchStoreViewActionGroup"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameCustom">
+            <argument name="name" value="$$createProductOne.name$$"/>
+            <argument name="description" value="Updated $$createProductOne.custom_attributes[description]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultCustom"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInCustom"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductWithEmptyAttributeTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductWithEmptyAttributeTest.xml
new file mode 100644
index 0000000000000..f858340bc09fa
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductWithEmptyAttributeTest.xml
@@ -0,0 +1,48 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontProductWithEmptyAttributeTest">
+        <annotations>
+            <title value="Product attribute is not visible on storefront if it is empty"/>
+            <description value="Product attribute should not be visible on storefront if it is empty"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-91893"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="productAttributeWithDropdownTwoOptions" stepKey="createProductAttribute"/>
+        </before>
+        <after>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProduct">
+                <argument name="product" value="SimpleProduct"/>
+            </actionGroup>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="amOnAttributeSetPage"/>
+        <click selector="{{AdminProductAttributeSetGridSection.AttributeSetName('Default')}}" stepKey="chooseDefaultAttributeSet"/>
+        <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
+        <dragAndDrop selector1="{{UnassignedAttributes.ProductAttributeName('testattribute')}}" selector2="{{Group.FolderName('Product Details')}}" stepKey="moveProductAttributeToGroup"/>
+        <click selector="{{AttributeSetSection.Save}}" stepKey="saveAttributeSet"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear" />
+        <seeElement selector=".message-success" stepKey="assertSuccess"/>
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
+        <amOnPage url="{{StorefrontProductPage.url(SimpleProduct.urlKey)}}" stepKey="goProductPageOnStorefront"/>
+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
+        <dontSeeElement selector="//table[@id='product-attribute-specs-table']/tbody/tr/th[contains(text(),'testattribute')]" stepKey="seeAttribute2"/>
+    </test>
+    </tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index 88daae5679085..5e6bfeb448e13 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -42,6 +42,38 @@
         </arguments>
         <click selector="{{StorefrontCategoryFilterSection.CategoryFilter}}" stepKey="clickCategoryFilterTitle" />
         <scrollTo selector="{{StorefrontCategoryFilterSection.CategoryByName(category.name)}}" stepKey="scrollToClickCategoryFilter"/>
-        <click selector="{{StorefrontCategoryFilterSection.CategoryByName(category.name)}}" stepKey="clickCategoryFilter" />
+        <click selector="{{StorefrontCategoryFilterSection.CategoryByName(category.name)}}" stepKey="clickCategoryFilter"/>
+    </actionGroup>
+
+    <!-- Go to store's advanced catalog search page -->
+    <actionGroup name="GoToStoreViewAdvancedCatalogSearchActionGroup">
+        <amOnPage url="{{StorefrontCatalogSearchAdvancedFormPage.url}}" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Storefront advanced catalog search by product name and price -->
+    <actionGroup name="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup">
+        <arguments>
+            <argument name="name" type="string"/>
+            <argument name="priceFrom" type="string"/>
+            <argument name="priceTo" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" userInput="{{name}}" stepKey="fillName"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFrom}}" userInput="{{priceFrom}}" stepKey="fillPriceFrom"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceTo}}" userInput="{{priceTo}}" stepKey="fillPriceTo"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Storefront advanced catalog search by product name and description -->
+    <actionGroup name="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup">
+        <arguments>
+            <argument name="name" type="string"/>
+            <argument name="description" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" userInput="{{name}}" stepKey="fillName"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.Description}}" userInput="{{description}}" stepKey="fillDescription"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
index 25671dc811285..f211561177da4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
@@ -15,5 +15,6 @@
         <element name="SuccessMsg" type="button" selector="div.message-success"/>
         <element name="productCount" type="text" selector="#toolbar-amount"/>
         <element name="message" type="text" selector="div.message div"/>
+        <element name="itemFound" type="text" selector=".search.found>strong"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
index a31c7e6dc526c..8446dd8fba446 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
@@ -16,6 +16,7 @@
         "magento/magento2-functional-test-module-search": "100.0.0-dev",
         "magento/magento2-functional-test-module-theme": "100.0.0-dev",
         "magento/magento2-functional-test-module-ui": "100.0.0-dev",
+        "magento/magento2-functional-test-module-store": "100.0.0-dev",
         "php": "~7.1.3||~7.2.0"
     },
     "suggest": {
@@ -23,8 +24,7 @@
         "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-customer": "100.0.0-dev",
         "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
+        "magento/magento2-functional-test-module-eav": "100.0.0-dev"
     },
     "autoload": {
         "psr-4": {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/AdminConfigurableProductActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/AdminConfigurableProductActionGroup.xml
index b1845bdff03b1..c2866816110c5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/AdminConfigurableProductActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -35,4 +35,72 @@
 
         <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
     </actionGroup>
+
+    <!--
+
+    Create a configurable product with three options for color: red, white, and blue
+
+    Expected start state = logged in as an admin
+    End state = on the product edit page in the admin
+
+    -->
+    <actionGroup name="createConfigurableProduct">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+            <argument name="category" defaultValue="_defaultCategory"/>
+        </arguments>
+
+        <!-- fill in basic configurable product values -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad time="30" stepKey="wait1"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
+        <click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" stepKey="clickOnAddConfigurableProduct"/>
+        <fillField userInput="{{product.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{product.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{product.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="fillCategory"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{product.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+
+        <!-- create configurations for colors the product is available in -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
+        <waitForPageLoad stepKey="waitForIFrame"/>
+        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{colorProductAttribute.default_label}}" stepKey="fillDefaultLabel"/>
+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+        <waitForPageLoad stepKey="waitForFilters"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
+        <fillField userInput="{{colorProductAttribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
+        <fillField userInput="{{colorProductAttribute1.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue2"/>
+        <fillField userInput="{{colorProductAttribute2.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue3"/>
+        <fillField userInput="{{colorProductAttribute3.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesByAttributeToEachSku}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
+        <selectOption selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}" userInput="{{colorProductAttribute.default_label}}" stepKey="selectAttributes"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute1}}" userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice1"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute2}}" userInput="{{colorProductAttribute2.price}}" stepKey="fillAttributePrice2"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute3}}" userInput="{{colorProductAttribute3.price}}" stepKey="fillAttributePrice3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="seeProductNameInTitle"/>
+    </actionGroup>
 </actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml
index 4cb5c680090a4..40d700fd4b75c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml
@@ -16,6 +16,9 @@
         <element name="currentVariationsPriceCells" type="textarea" selector=".admin__control-fields[data-index='price_container']"/>
         <element name="currentVariationsQuantityCells" type="textarea" selector=".admin__control-fields[data-index='quantity_container']"/>
         <element name="currentVariationsAttributesCells" type="textarea" selector=".admin__control-fields[data-index='attributes']"/>
+        <element name="actionsBtn" type="button" selector="(//button[@class='action-select']/span[contains(text(), 'Select')])[{{var1}}]" parameterized="true"/>
+        <element name="removeProductBtn" type="button" selector="//a[text()='Remove Product']"/>
+        <element name="disableProductBtn" type="button" selector="//a[text()='Disable Product']"/>
     </section>
     <section name="AdminConfigurableProductFormSection">
         <element name="productWeight" type="input" selector=".admin__control-text[name='product[weight]']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminAddRemoveProductImageConfigurableTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminAddRemoveProductImageConfigurableTest.xml
new file mode 100644
index 0000000000000..52dc1bf0b5390
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminAddRemoveProductImageConfigurableTest.xml
@@ -0,0 +1,147 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddRemoveProductImageConfigurableTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Configurable Product Add/Remove Images"/>
+            <title value="Admin should be able to add/remove images for a Configurable Product"/>
+            <description value="Admin should be able to add/remove images for a Configurable Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-101"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="categoryHandle"/>
+
+            <createData entity="SimpleProduct" stepKey="simple1Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="simple2Handle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+
+            <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
+            <createData entity="BaseConfigurableProduct" stepKey="baseConfigProductHandle">
+                <requiredEntity createDataKey="categoryHandle"/>
+            </createData>
+            <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
+
+            <createData entity="productAttributeOption1" stepKey="productAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="productAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <createData entity="AddToDefaultSet" stepKey="addToAttributeSetHandle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </createData>
+
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getAttributeOption1Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getAttributeOption2Handle">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+            </getData>
+
+            <createData entity="SimpleOne" stepKey="childProductHandle1">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+            </createData>
+            <createData entity="SimpleOne" stepKey="childProductHandle2">
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductTwoOptions" stepKey="configProductOptionHandle">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="productAttributeHandle"/>
+                <requiredEntity createDataKey="getAttributeOption1Handle"/>
+                <requiredEntity createDataKey="getAttributeOption2Handle"/>
+            </createData>
+
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle1">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="childProductHandle1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+                <requiredEntity createDataKey="childProductHandle2"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1"/>
+            <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChild1"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChild2"/>
+            <deleteData createDataKey="baseConfigProductHandle" stepKey="deleteConfig"/>
+            <deleteData createDataKey="categoryHandle" stepKey="deleteCategory"/>
+            <deleteData createDataKey="productAttributeHandle" stepKey="deleteProductAttribute"/>
+        </after>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGrid">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid1"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage2" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Remove image from product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageRemove"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid2"/>
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <!-- Skip success message check when saving product because of bug MAGETWO-91177 -->
+        <!-- actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKey" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage2" stepKey="assertProductImageNotInStorefrontProductPage2">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductCreateTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductCreateTest.xml
new file mode 100644
index 0000000000000..55a7e21729d78
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductCreateTest.xml
@@ -0,0 +1,71 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductCreateTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="admin should be able to create a configurable product with attributes"/>
+            <description value="admin should be able to create a configurable product with attributes"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-84"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create a configurable product via the UI -->
+        <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+            <argument name="product" value="_defaultProduct"/>
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+
+        <!-- assert color configurations on the admin create product page -->
+        <seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="3" stepKey="seeNumberOfRows"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeName1InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeName2InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeName3InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeSku1InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeSku2InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeSku3InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute1.price}}" stepKey="seeUniquePrice1InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute2.price}}" stepKey="seeUniquePrice2InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute3.price}}" stepKey="seeUniquePrice3InField"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsQuantityCells}}" userInput="{{colorProductAttribute.attribute_quantity}}" stepKey="seeQuantityInField"/>
+
+        <!-- assert storefront category list page -->
+        <amOnPage url="/" stepKey="amOnStorefront"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/>
+        <see userInput="{{colorProductAttribute1.price}}" stepKey="assertProductPricePresent"/>
+
+        <!-- assert storefront product details page -->
+        <click userInput="{{_defaultProduct.name}}" stepKey="clickOnProductName"/>
+        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/>
+        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{colorProductAttribute1.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+        <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{colorProductAttribute.default_label}}" stepKey="seeColorAttributeName1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeInDropDown1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeInDropDown3"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductDeleteTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductDeleteTest.xml
new file mode 100644
index 0000000000000..02f742cd5f1c4
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductDeleteTest.xml
@@ -0,0 +1,262 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductDeleteTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="admin should be able to delete a configurable product"/>
+            <description value="admin should be able to delete a configurable product"/>
+            <testCaseId value="MC-87"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- assert product visible in storefront -->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="gotoStorefront1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProduct"/>
+
+        <!-- go to admin and delete -->
+        <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchForProduct">
+            <argument name="keyword" value="ApiConfigurableProduct.name"/>
+        </actionGroup>
+        <click selector="label.data-grid-checkbox-cell-inner" stepKey="clickCheckbox"/>
+        <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"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="seeSuccessMsg"/>
+
+        <!-- after delete, assert product page is 404 -->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="gotoStorefront2"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="dontSeeProduct"/>
+    </test>
+
+    <test name="AdminConfigurableProductBulkDeleteTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="admin should be able to mass delete configurable products"/>
+            <description value="admin should be able to mass delete configurable products"/>
+            <testCaseId value="MC-99"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <!-- TODO: Parts of this should be converted to an actionGroup once MQE-993 is fixed. -->
+            <!-- Create shared category and attribute -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create first of three configurable products -->
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption1">
+                <requiredEntity createDataKey="createProduct1"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createProduct1"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createProduct1"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!-- Create second configurable product -->
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct4">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption2">
+                <requiredEntity createDataKey="createProduct2"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
+                <requiredEntity createDataKey="createProduct2"/>
+                <requiredEntity createDataKey="createConfigChildProduct3"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild4">
+                <requiredEntity createDataKey="createProduct2"/>
+                <requiredEntity createDataKey="createConfigChildProduct4"/>
+            </createData>
+
+            <!-- Create third configurable product -->
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct3">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct5">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct6">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption3">
+                <requiredEntity createDataKey="createProduct3"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild5">
+                <requiredEntity createDataKey="createProduct3"/>
+                <requiredEntity createDataKey="createConfigChildProduct5"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild6">
+                <requiredEntity createDataKey="createProduct3"/>
+                <requiredEntity createDataKey="createConfigChildProduct6"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
+            <deleteData createDataKey="createConfigChildProduct4" stepKey="deleteConfigChildProduct4"/>
+            <deleteData createDataKey="createConfigChildProduct5" stepKey="deleteConfigChildProduct5"/>
+            <deleteData createDataKey="createConfigChildProduct6" stepKey="deleteConfigChildProduct6"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Search for prefix of the 3 products we created via api -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchForProduct">
+            <argument name="keyword" value="ApiConfigurableProduct.name"/>
+        </actionGroup>
+
+        <!-- Select all, then delete -->
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <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"/>
+
+        <!-- Should not see the records in the admin panel -->
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 3 record(s) have been deleted." stepKey="seeSuccessMsg"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="0" stepKey="seeNoResults"/>
+
+        <!-- after delete, assert product pages are 404 -->
+        <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoStorefront1"/>
+        <waitForPageLoad stepKey="waitForProduct1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops1"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createProduct1.name$$" stepKey="dontSeeProduct1"/>
+        <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoStorefront2"/>
+        <waitForPageLoad stepKey="waitForProduct2"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops2"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createProduct1.name$$" stepKey="dontSeeProduct2"/>
+        <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoStorefront3"/>
+        <waitForPageLoad stepKey="waitForProduct3"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops3"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createProduct1.name$$" stepKey="dontSeeProduct3"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductSearchTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductSearchTest.xml
new file mode 100644
index 0000000000000..5da689aa5e61c
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductSearchTest.xml
@@ -0,0 +1,164 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductSearchTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Search"/>
+            <title value="admin should be able to search for a configurable product"/>
+            <description value="admin should be able to search for a configurable product"/>
+            <testCaseId value="MC-100"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchForProduct">
+            <argument name="keyword" value="ApiConfigurableProduct.name"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="wait2"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOneResult"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="seeInGrid"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="seeInActiveFilters"/>
+    </test>
+
+    <test name="AdminConfigurableProductFilterByTypeTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Search"/>
+            <title value="admin should be able to filter by type configurable product"/>
+            <description value="admin should be able to filter by type configurable product"/>
+            <testCaseId value="MC-66"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickShowFilters"/>
+        <selectOption selector="{{AdminProductGridFilterSection.typeFilter}}" userInput="{{ApiConfigurableProduct.type_id}}" stepKey="selectConfigurableType"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Type: Configurable Product" stepKey="seeFilter"/>
+        <see selector="{{AdminProductGridSection.table}}" userInput="$$createConfigProduct.name$$" stepKey="seeProduct"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductUpdateTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductUpdateTest.xml
new file mode 100644
index 0000000000000..646bf9f65bbe5
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductUpdateTest.xml
@@ -0,0 +1,249 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductBulkUpdateTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="admin should be able to bulk update attributes of configurable products"/>
+            <description value="admin should be able to bulk update attributes of configurable products"/>
+            <testCaseId value="MC-88"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct3">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Search for prefix of the 3 products we created via api -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="searchForProduct">
+            <argument name="keyword" value="ApiConfigurableProduct.name"/>
+        </actionGroup>
+
+        <!-- Select all, then start the bulk update attributes flow -->
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickBulkUpdate"/>
+        <waitForPageLoad stepKey="wait2"/>
+
+        <!-- Update the description -->
+        <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"/>
+
+        <!-- Check storefront for description -->
+        <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoProduct1"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeDescription1"/>
+        <amOnPage url="$$createProduct2.sku$$.html" stepKey="gotoProduct2"/>
+        <waitForPageLoad stepKey="wait4"/>
+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeDescription2"/>
+        <amOnPage url="$$createProduct3.sku$$.html" stepKey="gotoProduct3"/>
+        <waitForPageLoad stepKey="wait5"/>
+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeDescription3"/>
+    </test>
+
+    <test name="AdminConfigurableProductRemoveAnOptionTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="Admin should be able to remove a product configuration"/>
+            <description value="Admin should be able to remove a product configuration"/>
+            <testCaseId value="MC-63"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <!-- This was copied and modified from the EndToEndB2CGuestUserTest -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!--check storefront for both options-->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="amOnStorefront1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option1" stepKey="seeOption1Storefront"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option2" stepKey="seeOption2Storefront"/>
+
+        <!--check admin for both options-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="goToEditPage"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="$$createConfigChildProduct1.name$$" stepKey="seeOption1Admin"/>
+        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="$$createConfigChildProduct2.name$$" stepKey="seeOption2Admin"/>
+
+        <!--remove an option-->
+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActions"/>
+        <click selector="{{AdminProductFormConfigurationsSection.removeProductBtn}}" stepKey="clickRemove"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="wait3"/>
+
+        <!--check admin for one option-->
+        <dontSee selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="$$createConfigChildProduct1.name$$" stepKey="dontSeeOption1Admin"/>
+
+        <!--check storefront for one option-->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="amOnStorefront2"/>
+        <waitForPageLoad stepKey="wait4"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option1" stepKey="dontSeeOption1InStorefront"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option2" stepKey="seeOption2Again"/>
+    </test>
+
+    <test name="AdminConfigurableProductDisableAnOptionTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="Admin should be able to disable a product configuration"/>
+            <description value="Admin should be able to disable a product configuration"/>
+            <testCaseId value="MC-119"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <!-- This was copied and modified from the EndToEndB2CGuestUserTest -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!--check storefront for both options-->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="amOnStorefront1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option1" stepKey="seeOption1Storefront"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option2" stepKey="seeOption2Storefront"/>
+
+        <!--go to admin and disable an option-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="goToEditPage"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActions"/>
+        <click selector="{{AdminProductFormConfigurationsSection.disableProductBtn}}" stepKey="clickDisable"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="wait3"/>
+
+        <!--check storefront for one option-->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="amOnStorefront2"/>
+        <waitForPageLoad stepKey="wait4"/>
+        <dontSee selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option1" stepKey="dontSeeOption1InStorefront"/>
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="option2" stepKey="seeOption2Again"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminCreateTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminCreateTest.xml
deleted file mode 100644
index 133c39f7bb444..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminCreateTest.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-
-
-    <test name="AdminCreateTest">
-        <annotations>
-            <features value="ConfigurableProduct"/>
-            <stories value="Create, Read, Update, Delete"/>
-            <title value="admin should be able to create a configurable product with attributes"/>
-            <description value="admin should be able to create a configurable product with attributes"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-89941"/>
-            <group value="configurable"/>
-            <group value="product"/>
-        </annotations>
-
-        <before>
-            <createData entity="ApiCategory" stepKey="createCategory"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-        </before>
-
-        <after>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
-        </after>
-
-        <!-- fill in basic configurable product values -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
-        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
-        <click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" stepKey="clickOnAddConfigurableProduct"/>
-        <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
-        <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
-        <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
-        <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
-        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="searchAndSelectCategory"/>
-        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-        <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
-
-        <!-- create color configurations -->
-        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
-        <waitForPageLoad stepKey="waitForIFrame"/>
-        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
-        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{colorProductAttribute.default_label}}" stepKey="fillDefaultLabel"/>
-        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
-        <switchToIFrame stepKey="switchOutOfIFrame"/>
-        <waitForPageLoad stepKey="waitForFilters"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
-        <fillField userInput="{{colorProductAttribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
-        <fillField userInput="{{colorProductAttribute1.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute1"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue2"/>
-        <fillField userInput="{{colorProductAttribute2.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute2"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute2"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue3"/>
-        <fillField userInput="{{colorProductAttribute3.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute3"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute3"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesByAttributeToEachSku}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
-        <selectOption selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}" userInput="{{colorProductAttribute.default_label}}" stepKey="selectAttributes"/>
-        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute1}}" userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice1"/>
-        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute2}}" userInput="{{colorProductAttribute2.price}}" stepKey="fillAttributePrice2"/>
-        <fillField selector="{{AdminCreateProductConfigurationsPanel.attribute3}}" userInput="{{colorProductAttribute3.price}}" stepKey="fillAttributePrice3"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
-        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
-        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
-        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
-        <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="seeProductNameInTitle"/>
-
-        <!-- assert color configurations on the admin create product page -->
-        <seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="3" stepKey="seeNumberOfRows"/>
-        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeName1InField"/>
-        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeName2InField"/>
-        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeName3InField"/>
-        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeSku1InField"/>
-        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeSku2InField"/>
-        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeAttributeSku3InField"/>
-        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute1.price}}" stepKey="seeUniquePrice1InField"/>
-        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute2.price}}" stepKey="seeUniquePrice2InField"/>
-        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute3.price}}" stepKey="seeUniquePrice3InField"/>
-        <see selector="{{AdminProductFormConfigurationsSection.currentVariationsQuantityCells}}" userInput="{{colorProductAttribute.attribute_quantity}}" stepKey="seeQuantityInField"/>
-
-        <!-- assert storefront category list page -->
-        <amOnPage url="/" stepKey="amOnStorefront"/>
-        <waitForPageLoad stepKey="waitForPageLoad3"/>
-        <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/>
-        <waitForPageLoad stepKey="waitForPageLoad4"/>
-        <see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/>
-        <see userInput="{{colorProductAttribute1.price}}" stepKey="assertProductPricePresent"/>
-
-        <!-- assert storefront product details page -->
-        <click userInput="{{_defaultProduct.name}}" stepKey="clickOnProductName"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
-        <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/>
-        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
-        <see userInput="{{colorProductAttribute1.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
-        <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
-        <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{colorProductAttribute.default_label}}" stepKey="seeColorAttributeName1"/>
-        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeInDropDown1"/>
-        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/>
-        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeInDropDown3"/>
-    </test>
-
-
-</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRelatedProductsTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRelatedProductsTest.xml
index 74247c1a98c15..0d773cb6df666 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRelatedProductsTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRelatedProductsTest.xml
@@ -12,11 +12,10 @@
         <annotations>
             <features value="Promote Products as Related"/>
             <stories value="Promote Products as Related"/>
-            <title value="Promote Products as Related"/>
-            <description value="You should be able to promote products as related via the admin."/>
+            <title value="Admin should be able to promote products as related"/>
+            <description value="Admin should be able to promote products as related"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-12392"/>
-            <useCaseId value="USECASE-114"/>
+            <testCaseId value="MC-116"/>
             <group value="configurable"/>
             <group value="product"/>
         </annotations>
@@ -82,7 +81,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
         </before>
         <after>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2"/>
             <deleteData createDataKey="childProductHandle1" stepKey="deleteChild1"/>
@@ -99,7 +98,7 @@
         <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimple">
             <argument name="product" value="$$simple1Handle$$"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid"/>
         <conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openRelatedProductTab"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
 
@@ -144,7 +143,7 @@
         <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridConfig">
             <argument name="product" value="$$baseConfigProductHandle$$"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit2"/>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid2"/>
         <conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openRelatedProductTab2"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
 
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/StorefrontConfigurableProductViewTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/StorefrontConfigurableProductViewTest.xml
new file mode 100644
index 0000000000000..447bb6683bca0
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/StorefrontConfigurableProductViewTest.xml
@@ -0,0 +1,125 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontConfigurableProductGridViewTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Storefront"/>
+            <title value="customer should see the configurable product in the category grid"/>
+            <description value="customer should see the configurable product in the category grid"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-94"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+            <!-- Create a configurable product via the UI -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Verify the storefront category grid view -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="amOnCategoryPage1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productImage}}" stepKey="seePhoto"/>
+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{_defaultProduct.name}}" stepKey="seeName"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref(_defaultProduct.urlKey)}}" stepKey="seeNameLink"/>
+        <see selector="{{StorefrontCategoryMainSection.productPrice}}" userInput="{{colorProductAttribute1.price}}" stepKey="seePrice"/>
+    </test>
+
+    <test name="StorefrontConfigurableProductListViewTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Storefront"/>
+            <title value="customer should see the configurable product in the category list"/>
+            <description value="customer should see the configurable product in the category list"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-61"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+            <!-- Create a configurable product via the UI -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Verify storefront category list view -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="amOnCategoryPage1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{StorefrontCategoryMainSection.modeListButton}}" stepKey="clickListView"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productImage}}" stepKey="seePhoto"/>
+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{_defaultProduct.name}}" stepKey="seeName"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref(_defaultProduct.urlKey)}}" stepKey="seeNameLink"/>
+        <see selector="{{StorefrontCategoryMainSection.productPrice}}" userInput="{{colorProductAttribute1.price}}" stepKey="seePrice"/>
+    </test>
+
+    <test name="StorefrontConfigurableProductAddToCartTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Storefront"/>
+            <title value="customer should be taken to the product details page when clicking add to cart"/>
+            <description value="customer should be taken to the product details page when clicking add to cart"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-89"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+
+            <!-- Create a configurable product via the UI -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Should be taken to product details page when adding to cart because an option needs to be selected -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="amOnCategoryPage1"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <click selector="{{StorefrontCategoryMainSection.modeListButton}}" stepKey="clickListView"/>
+        <waitForPageLoad stepKey="wait2"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="clickAddToCart"/>
+        <waitForPageLoad stepKey="wait3"/>
+        <grabFromCurrentUrl stepKey="grabUrl"/>
+        <assertContains stepKey="assertUrl">
+            <expectedResult type="string">{{_defaultProduct.urlKey}}</expectedResult>
+            <actualResult type="string">{$grabUrl}</actualResult>
+        </assertContains>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/ActionGroup/AdminDownloadableProductActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/ActionGroup/AdminDownloadableProductActionGroup.xml
index f760156facb65..c1370ddcfb95e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/ActionGroup/AdminDownloadableProductActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/ActionGroup/AdminDownloadableProductActionGroup.xml
@@ -25,7 +25,7 @@
             <argument name="link" defaultValue="downloadableLinkWithMaxDownloads"/>
         </arguments>
         <click selector="{{AdminProductDownloadableSection.linksAddLinkButton}}" stepKey="clickLinkAddLinkButton"/>
-        <waitForElementVisible selector="{{AdminProductDownloadableSection.addLinkPriceInput('0')}}" stepKey="waitForDownloadableLinkPriceInput"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <fillField userInput="{{link.title}}" selector="{{AdminProductDownloadableSection.addLinkTitleInput('0')}}" stepKey="fillDownloadableLinkTitle"/>
         <fillField userInput="{{link.price}}" selector="{{AdminProductDownloadableSection.addLinkPriceInput('0')}}" stepKey="fillDownloadableLinkPrice"/>
         <selectOption userInput="{{link.file_type}}" selector="{{AdminProductDownloadableSection.addLinkFileTypeSelector('0')}}" stepKey="selectDownloadableLinkFileType"/>
@@ -42,7 +42,7 @@
             <argument name="link" defaultValue="downloadableLink"/>
         </arguments>
         <click selector="{{AdminProductDownloadableSection.linksAddLinkButton}}" stepKey="clickLinkAddLinkButton"/>
-        <waitForElementVisible selector="{{AdminProductDownloadableSection.addLinkPriceInput('1')}}" stepKey="waitForDownloadableLinkPriceInput"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <fillField userInput="{{link.title}}" selector="{{AdminProductDownloadableSection.addLinkTitleInput('1')}}" stepKey="fillDownloadableLinkTitle"/>
         <fillField userInput="{{link.price}}" selector="{{AdminProductDownloadableSection.addLinkPriceInput('1')}}" stepKey="fillDownloadableLinkPrice"/>
         <selectOption userInput="{{link.file_type}}" selector="{{AdminProductDownloadableSection.addLinkFileTypeSelector('1')}}" stepKey="selectDownloadableLinkFileType"/>
@@ -59,7 +59,7 @@
             <argument name="sample" defaultValue="downloadableSampleFile"/>
         </arguments>
         <click selector="{{AdminProductDownloadableSection.samplesAddLinkButton}}" stepKey="clickSampleAddLinkButton"/>
-        <waitForElementVisible selector="{{AdminProductDownloadableSection.addSampleTitleInput('0')}}" stepKey="waitForDownloadableSampleRow"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <fillField userInput="{{sample.title}}" selector="{{AdminProductDownloadableSection.addSampleTitleInput('0')}}" stepKey="fillDownloadableSampleTitle"/>
         <selectOption userInput="{{sample.file_type}}" selector="{{AdminProductDownloadableSection.addSampleFileTypeSelector('0')}}" stepKey="selectDownloadableSampleFileType"/>
         <attachFile userInput="{{sample.file}}" selector="{{AdminProductDownloadableSection.addSampleFileUploadFile('0')}}" stepKey="selectDownloadableSampleUpload"/>
@@ -72,7 +72,7 @@
             <argument name="sample" defaultValue="downloadableSampleUrl"/>
         </arguments>
         <click selector="{{AdminProductDownloadableSection.samplesAddLinkButton}}" stepKey="clickSampleAddLinkButton2"/>
-        <waitForElementVisible selector="{{AdminProductDownloadableSection.addSampleTitleInput('1')}}" stepKey="waitForDownloadableSampleRow"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <fillField userInput="{{sample.title}}" selector="{{AdminProductDownloadableSection.addSampleTitleInput('1')}}" stepKey="fillDownloadableSampleTitle"/>
         <selectOption userInput="{{sample.file_type}}" selector="{{AdminProductDownloadableSection.addSampleFileTypeSelector('1')}}" stepKey="selectDownloadableSampleFileType"/>
         <fillField userInput="{{sample.file}}" selector="{{AdminProductDownloadableSection.addSampleFileUrlInput('1')}}" stepKey="fillDownloadableSampleFileUrl"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml
index f7132a172704f..427f2577a8ab9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml
@@ -17,5 +17,6 @@
         <data key="quantity">100</data>
         <data key="weight">0</data>
         <data key="status">1</data>
+        <data key="urlKey" unique="suffix">downloadableproduct</data>
     </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdminAddRemoveProductImageDownloadableProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdminAddRemoveProductImageDownloadableProductTest.xml
new file mode 100644
index 0000000000000..6b086a3d4050b
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdminAddRemoveProductImageDownloadableProductTest.xml
@@ -0,0 +1,98 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddRemoveProductImageDownloadableProductTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Downloadable Product Add/Remove Images"/>
+            <title value="Admin should be able to add/remove images for a Downloadable Product"/>
+            <description value="Admin should be able to add/remove images for a Downloadable Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-117"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- Create product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillMainProductForm">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Add downloadable links -->
+        <click selector="{{AdminProductDownloadableSection.sectionHeader}}" stepKey="openDownloadableSection"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkIsDownloadable"/>
+        <fillField userInput="{{downloadableData.link_title}}" selector="{{AdminProductDownloadableSection.linksTitleInput}}" stepKey="fillDownloadableLinkTitle"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkLinksPurchasedSeparately"/>
+        <fillField userInput="{{downloadableData.sample_title}}" selector="{{AdminProductDownloadableSection.samplesTitleInput}}" stepKey="fillDownloadableSampleTitle"/>
+        <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addDownloadableLinkWithMaxDownloads">
+            <argument name="link" value="downloadableLinkWithMaxDownloads"/>
+        </actionGroup>
+        <actionGroup ref="addDownloadableProductLink" stepKey="addDownloadableLink">
+            <argument name="link" value="downloadableLink"/>
+        </actionGroup>
+
+        <!--Save product-->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Remove image from product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageRemove"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid"/>
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <!-- Skip success message check when saving product because of bug MAGETWO-91177 -->
+        <!-- actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage" stepKey="assertProductImageNotInStorefrontProductPage">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/GroupedProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/GroupedProductData.xml
index 7c2ddd35dabed..019b0d24dec52 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/GroupedProductData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/GroupedProductData.xml
@@ -14,6 +14,7 @@
         <data key="attribute_set_id">4</data>
         <data key="name" unique="suffix">GroupedProduct</data>
         <data key="status">1</data>
+        <data key="urlKey" unique="suffix">groupedproduct</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
     </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Section/AdminAddProductsToGroupPanelSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Section/AdminAddProductsToGroupPanelSection.xml
index f8b0490983178..45e32e7f2cd04 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Section/AdminAddProductsToGroupPanelSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Section/AdminAddProductsToGroupPanelSection.xml
@@ -14,5 +14,6 @@
         <element name="applyFilters" type="button" selector=".product_form_product_form_grouped_grouped_products_modal [data-action='grid-filter-apply']" timeout="30"/>
         <element name="nameFilter" type="input" selector=".product_form_product_form_grouped_grouped_products_modal [name='name']"/>
         <element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
+        <element name="nThCheckbox" type="input" selector="tr[data-repeat-index='{{n}}'] .admin__control-checkbox" parameterized="true"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/AdminAddRemoveProductImageGroupedProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/AdminAddRemoveProductImageGroupedProductTest.xml
new file mode 100644
index 0000000000000..84ecec485db6d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/AdminAddRemoveProductImageGroupedProductTest.xml
@@ -0,0 +1,107 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminAddRemoveProductImageGroupedProductTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="Grouped Product Add/Remove Images"/>
+            <title value="Admin should be able to add/remove images for a Grouped Product"/>
+            <description value="Admin should be able to add/remove images for a Grouped Product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-106"/>
+            <group value="GroupedProduct"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProductOne">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Create product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
+        <click selector="body" stepKey="clickBodyToCorrectFocusGrouped"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForGroupedProductModal"/>
+        <actionGroup ref="filterProductGridBySku2" stepKey="filterGroupedProducts">
+            <argument name="sku" value="api-simple-product"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('0')}}" stepKey="checkFilterResult1"/>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('1')}}" stepKey="checkFilterResult2"/>
+
+        <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
+
+        <!-- Add image to product -->
+        <actionGroup ref="addProductImage" stepKey="addImageForProduct">
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Assert product image in admin product form -->
+        <actionGroup ref="assertProductImageAdminProductPage" stepKey="assertProductImageAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <!-- Assert product image in storefront product page -->
+        <actionGroup ref="assertProductImageStorefrontProductPage" stepKey="assertProductImageStorefrontProductPage">
+            <argument name="product" value="GroupedProduct"/>
+            <argument name="image" value="MagentoLogo"/>
+        </actionGroup>
+
+        <!-- Remove image from product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageRemove"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridBySku">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProducForEditByClickingRow1Column2InProductGrid"/>
+        <actionGroup ref="removeProductImage" stepKey="removeProductImage"/>
+
+        <!-- Skip success message check when saving product because of bug MAGETWO-91177 -->
+        <!-- actionGroup ref="saveProductForm" stepKey="saveProductFormAfterRemove"/-->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductFormAfterRemove"/>
+
+        <!-- Assert product image not in admin product form -->
+        <actionGroup ref="assertProductImageNotInAdminProductPage" stepKey="assertProductImageNotInAdminProductPage"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPageAfterRemove">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <!-- Assert product image not in storefront product page -->
+        <actionGroup ref="assertProductImageNotInStorefrontProductPage" stepKey="assertProductImageNotInStorefrontProductPage">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/AdminProductVideoActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/AdminProductVideoActionGroup.xml
new file mode 100644
index 0000000000000..9fe81d56efa84
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/AdminProductVideoActionGroup.xml
@@ -0,0 +1,56 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!-- Add video in Admin Product page -->
+    <actionGroup name="addProductVideo">
+        <arguments>
+            <argument name="video" defaultValue="mftfTestProductVideo"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="waitForAddVideoButtonVisible" time="30"/>
+        <click selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="addVideo"/>
+        <waitForElementVisible selector=".modal-slide.mage-new-video-dialog.form-inline._show" stepKey="waitForUrlElementVisibleslide" time="30"/>
+        <waitForElementVisible selector="{{AdminProductNewVideoSection.videoUrlTextField}}" stepKey="waitForUrlElementVisible" time="60"/>
+        <fillField selector="{{AdminProductNewVideoSection.videoUrlTextField}}" userInput="{{video.videoUrl}}" stepKey="fillFieldVideoUrl"/>
+        <fillField selector="{{AdminProductNewVideoSection.videoTitleTextField}}" userInput="{{video.videoTitle}}" stepKey="fillFieldVideoTitle"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementNotVisible selector="{{AdminProductNewVideoSection.saveButtonDisabled}}" stepKey="waitForSaveButtonVisible" time="30"/>
+        <click selector="{{AdminProductNewVideoSection.saveButton}}" stepKey="saveVideo"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+
+    <!-- Remove video in Admin Product page -->
+    <actionGroup name="removeProductVideo">
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="waitForAddVideoButtonVisible" time="30"/>
+        <click selector="{{AdminProductImagesSection.removeVideoButton}}" stepKey="removeVideo"/>
+    </actionGroup>
+
+    <!-- Assert product video in Admin Product page -->
+    <actionGroup name="assertProductVideoAdminProductPage">
+        <arguments>
+            <argument name="video" defaultValue="mftfTestProductVideo"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{AdminProductImagesSection.videoTitleText(video.videoShortTitle)}}" stepKey="seeVideoTitle"/>
+        <seeElementInDOM selector="{{AdminProductImagesSection.videoUrlHiddenField(video.videoUrl)}}" stepKey="seeVideoItem"/>
+    </actionGroup>
+
+    <!-- Assert product video not in Admin Product page -->
+    <actionGroup name="assertProductVideoNotInAdminProductPage">
+        <arguments>
+            <argument name="video" defaultValue="mftfTestProductVideo"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductVideoSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dontSeeElement selector="{{AdminProductImagesSection.videoTitleText(video.videoShortTitle)}}" stepKey="seeVideoTitle"/>
+        <dontSeeElementInDOM selector="{{AdminProductImagesSection.videoUrlHiddenField(video.videoUrl)}}" stepKey="seeVideoItem"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/StorefrontProductVideoActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/StorefrontProductVideoActionGroup.xml
new file mode 100644
index 0000000000000..3aba592dee0b0
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/StorefrontProductVideoActionGroup.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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!--Assert product video in Storefront Product page -->
+    <actionGroup name="assertProductVideoStorefrontProductPage">
+        <arguments>
+            <argument name="dataTypeAttribute" defaultValue="'youtube'"/>
+        </arguments>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productVideo(dataTypeAttribute)}}" stepKey="seeProductVideoDataType"/>
+    </actionGroup>
+
+    <!--Assert product video not in Storefront Product page -->
+    <actionGroup name="assertProductVideoNotInStorefrontProductPage">
+        <arguments>
+            <argument name="dataTypeAttribute" defaultValue="'youtube'"/>
+        </arguments>
+        <dontSeeElement selector="{{StorefrontProductInfoMainSection.productVideo(dataTypeAttribute)}}" stepKey="dontSeeProductVideoDataType"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoConfigData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoConfigData.xml
new file mode 100644
index 0000000000000..2873febbe1e97
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoConfigData.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- mftf test youtube api key configuration -->
+    <entity name="ProductVideoYoutubeApiKeyConfig" type="product_video_config">
+        <requiredEntity type="youtube_api_key_config">YouTubeApiKey</requiredEntity>
+    </entity>
+    <entity name="YouTubeApiKey" type="youtube_api_key_config">
+        <data key="value">AIzaSyDwqDWuw1lra-LnpJL2Mr02DYuFmkuRSns</data>
+    </entity>
+
+    <!-- default configuration used to restore Magento config -->
+    <entity name="DefaultProductVideoConfig" type="product_video_config">
+        <requiredEntity type="youtube_api_key_config">DefaultYouTubeApiKey</requiredEntity>
+    </entity>
+    <entity name="DefaultYouTubeApiKey" type="youtube_api_key_config">
+        <data key="value"/>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoData.xml
new file mode 100644
index 0000000000000..05ecb1a69444a
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoData.xml
@@ -0,0 +1,16 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="mftfTestProductVideo" type="product_video">
+        <data key="videoUrl">https://youtu.be/bpOSxM0rNPM</data>
+        <data key="videoTitle">Arctic Monkeys - Do I Wanna Know? (Official Video)</data>
+        <data key="videoShortTitle">Arctic Monkeys</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Metadata/product_video_config-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Metadata/product_video_config-meta.xml
new file mode 100644
index 0000000000000..be54d9038d0d1
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Metadata/product_video_config-meta.xml
@@ -0,0 +1,21 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateProductVideoYouTubeApiKeyConfig" dataType="product_video_config" type="create" auth="adminFormKey" url="admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="product_video_config">
+            <object key="product_video" dataType="product_video_config">
+                <object key="fields" dataType="product_video_config">
+                    <object key="youtube_api_key" dataType="youtube_api_key_config">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductImagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductImagesSection.xml
new file mode 100644
index 0000000000000..66a93a6ec4b36
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductImagesSection.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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminProductImagesSection">
+        <element name="addVideoButton" type="button" selector="#add_video_button" timeout="60"/>
+        <element name="removeVideoButton" type="button" selector="//*[@id='media_gallery_content']//button[@class='action-remove']" timeout="60"/>
+        <element name="videoUrlHiddenField" type="text" selector="//*[@id='media_gallery_content']//input[@value='{{url}}']" parameterized="true"/>
+        <element name="videoTitleText" type="text" selector="//*[@id='media_gallery_content']//div[contains(text(), '{{title}}')]" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductNewVideoSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductNewVideoSection.xml
new file mode 100644
index 0000000000000..8f55468a12748
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductNewVideoSection.xml
@@ -0,0 +1,24 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminProductNewVideoSection">
+        <element name="saveButton" type="button" selector=".action-primary.video-create-button" timeout="30"/>
+        <element name="saveButtonDisabled" type="text" selector="//button[@class='action-primary video-create-button' and @disabled='disabled']"/>
+        <element name="cancelButton" type="button" selector=".video-cancel-button" timeout="30"/>
+        <element name="videoUrlTextField" type="input" selector="#video_url"/>
+        <element name="videoTitleTextField" type="input" selector="#video_title"/>
+        <element name="videoDescriptionTextField" type="input" selector="#video_description"/>
+        <element name="baseCheckbox" type="checkbox" selector="#video_image"/>
+        <element name="smallCheckbox" type="checkbox" selector="#video_small_image"/>
+        <element name="swatchCheckbox" type="checkbox" selector="#video_swatch_image"/>
+        <element name="thumbnailCheckbox" type="checkbox" selector="#video_thumbnail"/>
+        <element name="hideFromProductPageCheckbox" type="checkbox" selector="#new_video_disabled"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/StorefrontProductInfoMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..33d9cc8d0a03f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/StorefrontProductInfoMainSection.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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="productVideo" type="text" selector="//*[@class='product-video' and @data-type='{{videoType}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json
index 0e1f83433049a..40d03272a3292 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json
@@ -12,11 +12,11 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "php": "~7.1.3||~7.2.0"
     },
     "suggest": {
         "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "magento/magento2-functional-test-module-eav": "100.0.0-dev",
         "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
         "magento/magento2-functional-test-module-store": "100.0.0-dev"
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Page/PriceRuleNewPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Page/PriceRuleNewPage.xml
new file mode 100644
index 0000000000000..c8475de4c61f7
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Page/PriceRuleNewPage.xml
@@ -0,0 +1,11 @@
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <page name="PriceRuleNewPage" url="sales_rule/promo_quote/new/" area="admin" module="Magento_SalesRule">
+        <section name="PriceRuleConditionsSection"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml
new file mode 100644
index 0000000000000..39c6dd6b31968
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml
@@ -0,0 +1,20 @@
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <section name="PriceRuleConditionsSection">
+        <element name="conditionsTab" type="text" selector="//div[@data-index='conditions']//span[contains(.,'Conditions')][1]"/>
+        <element name="createNewRule" type="text" selector="span.rule-param.rule-param-new-child"/>
+        <element name="rulesDropdown" type="select" selector="select[data-form-part='sales_rule_form'][data-ui-id='newchild-0-select-rule-conditions-1-new-child']"/>
+        <element name="addProductAttributesButton" type="text" selector="#conditions__1--1__children>li>span>a"/>
+        <element name="productAttributesDropdown" type="select" selector="#conditions__1--1__new_child"/>
+        <element name="changeCategoriesButton" type="text" selector="#conditions__1--1__children>li>span.rule-param:nth-of-type(2)>a"/>
+        <element name="categoriesChooser" type="text" selector="#conditions__1--1__children>li>span.rule-param:nth-of-type(2)>span>label>a"/>
+        <element name="treeRoot" type="text" selector=".x-tree-root-ct.x-tree-lines"/>
+        <element name="lastTreeNode" type="text" selector=".x-tree-root-ct.x-tree-lines > div > li > ul > li:last-child div img.x-tree-elbow-end-plus"/>
+        <element name="subcategory4level" type="text" selector=".x-tree-root-ct.x-tree-lines > div > li > ul > li > ul > li > ul > li > ul > li > div img.x-tree-elbow-end-plus"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/PriceRuleCategoryNestingTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/PriceRuleCategoryNestingTest.xml
new file mode 100644
index 0000000000000..9d47a5e823e83
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/PriceRuleCategoryNestingTest.xml
@@ -0,0 +1,63 @@
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <test name="PriceRuleCategoryNestingTest">
+        <annotations>
+            <description value="Category nesting level must be the same as were created in categories."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-91101"/>
+            <group value="sale_rules"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="subcategory1"/>
+            <createData entity="SubCategoryWithParent" stepKey="subcategory2">
+                <requiredEntity createDataKey="subcategory1"/>
+            </createData>
+            <createData entity="SubCategoryWithParent" stepKey="subcategory3">
+                <requiredEntity createDataKey="subcategory2"/>
+            </createData>
+            <createData entity="SubCategoryWithParent" stepKey="subcategory4">
+                <requiredEntity createDataKey="subcategory3"/>
+            </createData>
+            <createData entity="SubCategoryWithParent" stepKey="subcategory5">
+                <requiredEntity createDataKey="subcategory4"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="subcategory1" stepKey="deleteCategory1"/>
+            <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <!-- Login as admin and open page for creation new Price Rule -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{PriceRuleNewPage.url}}" stepKey="openCatalogPriceRulePage"/>
+        <waitForPageLoad stepKey="waitCatalogPriceRulePageLoad"/>
+        <!-- Open Conditions section and select Categories condition -->
+        <click selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="openConditionsSection"/>
+        <scrollTo selector="{{PriceRuleConditionsSection.conditionsTab}}" stepKey="scrollToConditionsTab"/>
+        <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="createNewRule"/>
+        <selectOption selector="{{PriceRuleConditionsSection.rulesDropdown}}" userInput="Magento\SalesRule\Model\Rule\Condition\Product\Found" stepKey="selectProductAttributes"/>
+        <waitForAjaxLoad stepKey="ajaxLoad1"/>
+        <waitForElement selector="{{PriceRuleConditionsSection.addProductAttributesButton}}" stepKey="wait1"/>
+        <scrollTo selector="{{PriceRuleConditionsSection.addProductAttributesButton}}" stepKey="scrollToAddProductAttributeButton"/>
+        <click selector="{{PriceRuleConditionsSection.addProductAttributesButton}}" stepKey="clickToshowAttributes"/>
+        <selectOption selector="{{PriceRuleConditionsSection.productAttributesDropdown}}" userInput="Magento\SalesRule\Model\Rule\Condition\Product|category_ids" stepKey="selectCategoryAttribute"/>
+        <waitForAjaxLoad stepKey="ajaxLoad2"/>
+        <!-- Select categories chooser -->
+        <waitForElement selector="{{PriceRuleConditionsSection.changeCategoriesButton}}" stepKey="wait2"/>
+        <click selector="{{PriceRuleConditionsSection.changeCategoriesButton}}" stepKey="changeCategories"/>
+        <click selector="{{PriceRuleConditionsSection.categoriesChooser}}" stepKey="showCategoriesChooser"/>
+        <waitForAjaxLoad stepKey="ajaxLoad3"/>
+        <!-- Click on categories to check that the deepest subcategory is clickable -->
+        <waitForElement selector="{{PriceRuleConditionsSection.treeRoot}}" stepKey="wait3"/>
+        <click selector="{{PriceRuleConditionsSection.lastTreeNode}}" stepKey="openLatestTreeNode1"/>
+        <click selector="{{PriceRuleConditionsSection.lastTreeNode}}" stepKey="openLatestTreeNode2"/>
+        <click selector="{{PriceRuleConditionsSection.lastTreeNode}}" stepKey="openLatestTreeNode3"/>
+        <waitForAjaxLoad stepKey="ajaxLoad4"/>
+        <waitForElement selector="{{PriceRuleConditionsSection.subcategory4level}}" stepKey="wait4"/>
+        <click selector="{{PriceRuleConditionsSection.subcategory4level}}" stepKey="openLatestTreeNode4"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminSwitchStoreViewActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminSwitchStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..8c4ecbed047b8
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminSwitchStoreViewActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSwitchStoreViewActionGroup">
+        <arguments>
+            <argument name="storeView" defaultValue="customStore.name"/>
+        </arguments>
+        <click selector="{{AdminMainActionsSection.storeViewDropdown}}" stepKey="clickStoreViewSwitchDropdown"/>
+        <waitForElementVisible selector="{{AdminMainActionsSection.storeViewByName('Default Store View')}}" stepKey="waitForStoreViewsAreVisible"/>
+        <click selector="{{AdminMainActionsSection.storeViewByName(storeView)}}" stepKey="clickStoreViewByName"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
+        <waitForPageLoad stepKey="waitForStoreViewSwitched"/>
+        <see userInput="{{storeView}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..9f06c2773dc3a
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontSwitchStoreViewActionGroup">
+        <arguments>
+            <argument name="storeView" defaultValue="customStore"/>
+        </arguments>
+        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown"/>
+        <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.name)}}" stepKey="clickSelectStoreView"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminMainActionsSection.xml
new file mode 100644
index 0000000000000..14429c298b5e5
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminMainActionsSection.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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminMainActionsSection">
+        <element name="storeSwitcher" type="text" selector=".store-switcher"/>
+        <element name="storeViewDropdown" type="button" selector="#store-change-button"/>
+        <element name="storeViewByName" type="button" selector="//*[@class='store-switcher-store-view  ']/a[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Page/ThemesPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Page/ThemesPage.xml
new file mode 100644
index 0000000000000..358d88875d02f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Page/ThemesPage.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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="ThemesPageIndex" url="admin/system_design_theme/" area="admin" module="Magento_Theme">
+        <section name="AdminThemeSection"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/AdminThemeSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/AdminThemeSection.xml
new file mode 100644
index 0000000000000..281cc290b4f39
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/AdminThemeSection.xml
@@ -0,0 +1,21 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminThemeSection">
+        <!--All rows in a specific Column e.g. {{Section.rowsInColumn('columnName')}}-->
+        <element name="rowsInColumn" type="text" selector="//tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
+        <!--selector for Theme Title column since it needs to be handled separately-->
+        <element name="rowsInThemeTitleColumn" type="text" selector="//tbody/tr/td[contains(@class, 'parent_theme')]/preceding-sibling::td"/>
+        <element name="rowsInColumn" type="text" selector="//tbody/tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
+        <!--Specific cell e.g. {{Section.gridCell('Name')}}-->
+        <element name="gridCell" type="text" selector="//table[@id='theme_grid_table']//td[contains(text(), '{{gridCellText}}')]" parameterized="true"/>
+        <element name="columnHeader" type="text" selector="//thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Test/ThemeTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Test/ThemeTest.xml
new file mode 100644
index 0000000000000..8764750d473c3
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Test/ThemeTest.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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="ThemeTest">
+        <annotations>
+            <features value="Theme Test"/>
+            <title value="Magento Rush theme should not be available in Themes grid"/>
+            <description value="Magento Rush theme should not be available in Themes grid"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-91409"/>
+            <group value="theme"/>
+        </annotations>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <!--Login to Admin Area-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+        <!--Navigate to Themes page-->
+        <amOnPage url="{{ThemesPageIndex.url}}" stepKey="navigateToThemesIndexPage" />
+        <waitForPageLoad stepKey="wait1"/>
+        <dontSee selector="{{AdminThemeSection.gridCell('Magento Rush')}}" stepKey="dontSeeRushThemeInTitleColumn"/>
+        <seeNumberOfElements selector="{{AdminThemeSection.rowsInColumn('theme_path')}}" userInput="2" stepKey="see2RowsOnTheGrid"/>
+    </test>
+</tests>
diff --git a/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductOptionRepositoryTest.php
index 582508184b5d6..5fb2020de3e81 100644
--- a/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductOptionRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductOptionRepositoryTest.php
@@ -31,8 +31,8 @@ public function testGet()
                     'position' => 0,
                     'can_change_quantity' => 1,
                     'is_default' => false,
-                    'price' => null,
-                    'price_type' => null,
+                    'price' => 2.75,
+                    'price_type' => 0,
                 ],
             ],
         ];
@@ -72,8 +72,8 @@ public function testGetList()
                         'position' => 0,
                         'can_change_quantity' => 1,
                         'is_default' => false,
-                        'price' => null,
-                        'price_type' => null,
+                        'price' => 2.75,
+                        'price_type' => 0,
                     ],
                 ],
             ],
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php
index 7d5143faf937a..8ccd9d0c94f61 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php
@@ -40,7 +40,6 @@ public function testAllFieldsBundleProducts()
            ... on PhysicalProductInterface {
              weight
            }
-           category_ids 
            ... on BundleProduct {
            dynamic_sku
             dynamic_price
@@ -126,7 +125,6 @@ public function testBundleProdutWithNotVisibleChildren()
            ... on PhysicalProductInterface {
              weight
            }
-           category_ids 
            ... on BundleProduct {
            dynamic_sku
             dynamic_price
@@ -329,7 +327,6 @@ public function testAndMaxMinPriceBundleProduct()
            ... on PhysicalProductInterface {
              weight
            }
-           category_ids
            price {
              minimalPrice {
                amount {
@@ -434,7 +431,6 @@ public function testNonExistentFieldQtyExceptionOnBundleProduct()
            ... on PhysicalProductInterface {
              weight
            }
-           category_ids
 
            ... on BundleProduct {
            dynamic_sku
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 e193b556fa942..eb138d738ea10 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -32,13 +32,10 @@ public function testCategoriesTree()
         $rootCategoryId = 2;
         $query = <<<QUERY
 {
-  categories(filter: {root_category_id: {$rootCategoryId}}) {
-    category_tree {
+  category(id: {$rootCategoryId}) {
       id
       level
-      is_active
       description
-      all_children
       path
       path_in_store
       product_count
@@ -46,7 +43,6 @@ public function testCategoriesTree()
       url_path
       children {
         id
-        is_active
         description
         available_sort_by
         default_sort_by
@@ -54,7 +50,6 @@ public function testCategoriesTree()
         level
         children {
           id
-          is_active
           filter_price_range
           description
           image
@@ -71,7 +66,6 @@ public function testCategoriesTree()
         }
       }
     }
-  }
 }
 QUERY;
 
@@ -88,31 +82,31 @@ public function testCategoriesTree()
         //Some sort of smoke testing
         self::assertEquals(
             'Ololo',
-            $responseDataObject->getData('categories/category_tree/children/7/children/1/description')
+            $responseDataObject->getData('category/children/7/children/1/description')
         );
         self::assertEquals(
             'default-category',
-            $responseDataObject->getData('categories/category_tree/url_key')
+            $responseDataObject->getData('category/url_key')
         );
         self::assertEquals(
             [],
-            $responseDataObject->getData('categories/category_tree/children/0/available_sort_by')
+            $responseDataObject->getData('category/children/0/available_sort_by')
         );
         self::assertEquals(
             'name',
-            $responseDataObject->getData('categories/category_tree/children/0/default_sort_by')
+            $responseDataObject->getData('category/children/0/default_sort_by')
         );
         self::assertCount(
             8,
-            $responseDataObject->getData('categories/category_tree/children')
+            $responseDataObject->getData('category/children')
         );
         self::assertCount(
             2,
-            $responseDataObject->getData('categories/category_tree/children/7/children')
+            $responseDataObject->getData('category/children/7/children')
         );
         self::assertEquals(
             5,
-            $responseDataObject->getData('categories/category_tree/children/7/children/1/children/0/id')
+            $responseDataObject->getData('category/children/7/children/1/children/0/id')
         );
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
index b6866c1374069..b95e0f933ea04 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -616,7 +616,9 @@ public function testFilteringForProductInMultipleCategories()
      sku
      name
      attribute_set_id
-     category_ids
+     categories {
+        id
+     }
    }
  }
 }
@@ -630,11 +632,11 @@ public function testFilteringForProductInMultipleCategories()
         $product = $productRepository->get('simple333');
         $categoryIds  = $product->getCategoryIds();
         foreach ($categoryIds as $index => $value) {
-            $categoryIds[$index] = (int)$value;
+            $categoryIds[$index] = [ 'id' => (int)$value];
         }
-        $this->assertNotEmpty($response['products']['items'][0]['category_ids'], "Category_ids must not be empty");
-        $this->assertNotNull($response['products']['items'][0]['category_ids'], "categoy_ids must not be null");
-        $this->assertEquals($categoryIds, $response['products']['items'][0]['category_ids']);
+        $this->assertNotEmpty($response['products']['items'][0]['categories'], "Categories must not be empty");
+        $this->assertNotNull($response['products']['items'][0]['categories'], "categories must not be null");
+        $this->assertEquals($categoryIds, $response['products']['items'][0]['categories']);
         /** @var MetadataPool $metaData */
         $metaData = ObjectManager::getInstance()->get(MetadataPool::class);
         $linkField = $metaData->getMetadata(ProductInterface::class)->getLinkField();
@@ -672,14 +674,12 @@ public function testFilterProductsByCategoryIds()
        sku
        name
        type_id
-       category_ids
        categories{
           name
           id
           path
           children_count
           product_count
-          is_active
         }
       }
        total_count
@@ -710,7 +710,6 @@ public function testFilterProductsByCategoryIds()
             foreach ($categoryIds as $index => $value) {
                 $categoryIds[$index] = (int)$value;
             }
-            $this->assertEquals($response['products']['items'][$itemIndex]['category_ids'], $categoryIds);
             $categoryInResponse = array_map(
                 null,
                 $categoryIds,
@@ -728,7 +727,6 @@ public function testFilterProductsByCategoryIds()
                         'path' => $category->getPath(),
                         'children_count' => $category->getChildrenCount(),
                         'product_count' => $category->getProductCount(),
-                        'is_active' => $category->getIsActive(),
                     ]
                 );
             }
@@ -1144,7 +1142,6 @@ public function testQueryWithNoSearchOrFilterArgumentException()
            ... on PhysicalProductInterface {
                weight
            }
-           category_ids
        }
    }
 }
@@ -1178,7 +1175,6 @@ public function testFilterProductsThatAreOutOfStockWithConfigSettings()
       {
        sku
        name
-       category_ids
       }
        total_count
         
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 34c5402a3e8d0..a4c7f41df0e99 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
@@ -44,14 +44,11 @@ public function testQueryAllFieldsSimpleProduct()
             attribute_set_id
             country_of_manufacture
             created_at
-            custom_layout
-            custom_layout_update
             description
             gift_message_available
             id
             categories {
                name
-               is_active
                url_path
                available_sort_by
                level
@@ -292,15 +289,12 @@ public function testQueryMediaGalleryEntryFieldsSimpleProduct()
     {
         items{
             attribute_set_id
-            category_ids
             categories
             {
                 id
             }
             country_of_manufacture
             created_at
-            custom_layout
-            custom_layout_update
             description
             gift_message_available
             id
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 6ce4b522047ab..84c4e80d325ab 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
@@ -89,7 +89,6 @@ public function testQueryConfigurableProductLinks()
           }
         }
       }
-      category_ids
       ... on ConfigurableProduct {
         configurable_options {
           id
@@ -110,7 +109,6 @@ public function testQueryConfigurableProductLinks()
         variants {
           product {
             id
-            category_ids
             name
             sku
             attribute_set_id
@@ -305,10 +303,6 @@ private function assertConfigurableVariants($actualResponse)
             );
             $indexValue = $variantArray['product']['sku'];
             unset($variantArray['product']['id']);
-            $this->assertTrue(
-                isset($variantArray['product']['category_ids']),
-                'variant product doesn\'t contain category_ids key'
-            );
             $this->assertTrue(
                 isset($variantArray['product']['categories']),
                 'variant product doesn\'t contain categories key'
@@ -327,12 +321,6 @@ private function assertConfigurableVariants($actualResponse)
             $this->assertEquals($actualValue, ['id' => $id]);
             unset($variantArray['product']['categories']);
 
-            $categoryIdsAttribute = $childProduct->getCustomAttribute('category_ids');
-            $this->assertNotEmpty($categoryIdsAttribute, "Precondition failed: 'category_ids' must not be empty");
-            $categoryIdsAttributeValue = $categoryIdsAttribute ? $categoryIdsAttribute->getValue() : [];
-            $this->assertEquals($categoryIdsAttributeValue, $variantArray['product']['category_ids']);
-            unset($variantArray['product']['category_ids']);
-
             $mediaGalleryEntries = $childProduct->getMediaGalleryEntries();
             $this->assertCount(
                 1,
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php
index d8929bab8e9e5..57d39f04347bf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php
@@ -48,7 +48,6 @@ public function testQueryAllFieldsDownloadableProductsWithDownloadableFileAndSam
           }
         }
       }          
-           category_ids                
            ... on DownloadableProduct {
             links_title
             links_purchased_separately
@@ -139,7 +138,6 @@ public function testDownloadableProductQueryWithNoSample()
           }
         }
       }
-           category_ids
            ... on DownloadableProduct {
             links_title
             links_purchased_separately
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php
index 453a7b5940e1d..3aa6fc8f2a84f 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php
@@ -192,6 +192,14 @@ public function getDependencyCheck()
         return $this->_rootElement->find($this->dependencyCheck, Locator::SELECTOR_CSS)->getText();
     }
 
+    /**
+     * @return bool
+     */
+    public function isPhpVersionCheckVisible() : bool
+    {
+        return $this->_rootElement->find($this->phpVersionCheck)->isVisible();
+    }
+
     /**
      * Get PHP Version check result.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php
index ea6355d574549..5cb71d85a51ce 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php
@@ -10,6 +10,7 @@
 use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid;
 
 /**
  * Select version block.
@@ -37,6 +38,29 @@ class SelectVersion extends Form
      */
     private $showAllVersions = '#showUnstable';
 
+    /**
+     * CSS selector for Other Components Grid Block.
+     *
+     * @var string
+     */
+    private $otherComponentsGrid = '.admin__data-grid-outer-wrap';
+
+    /**
+     * @var string
+     */
+    private $empty = '[ng-show="componentsProcessed && total == 0"]';
+
+    /**
+     * @var string
+     */
+    private $waitEmpty =
+        '//div[contains(@ng-show, "componentsProcessed && total") and not(contains(@class,"ng-hide"))]';
+
+    /**
+     * @var OtherComponentsGrid
+     */
+    private $otherComponentGrid;
+
     /**
      * Click on 'Next' button.
      *
@@ -76,13 +100,59 @@ private function chooseShowAllVersions()
     }
 
     /**
-     * Choose 'yes' for upgrade option called 'Other components'
+     * Choose 'yes' for upgrade option called 'Other components'.
      *
+     * @param array $packages
      * @return void
      */
-    public function chooseUpgradeOtherComponents()
+    public function chooseUpgradeOtherComponents(array $packages) :void
     {
-        $this->_rootElement->find("[for=yesUpdateComponents]", Locator::SELECTOR_CSS)->click();
-        $this->waitForElementVisible("[ng-show='componentsProcessed']");
+        $this->_rootElement->find("[for=yesUpdateComponents]")->click();
+        $this->waitForElementNotVisible("[ng-show=\"!componentsProcessed\"");
+
+        if (!$this->isComponentsEmpty()) {
+            $otherComponentGrid = $this->getOtherComponentsGrid();
+            $otherComponentGrid->setItemsPerPage(200);
+            $otherComponentGrid->setVersions($packages);
+        }
+    }
+
+    /**
+     * Check that grid is empty.
+     *
+     * @return bool
+     */
+    public function isComponentsEmpty()
+    {
+        $this->waitForElementVisible($this->waitEmpty, Locator::SELECTOR_XPATH);
+
+        return $this->_rootElement->find($this->empty)->isVisible();
+    }
+
+    /**
+     * Returns selected packages.
+     *
+     * @return array
+     */
+    public function getSelectedPackages()
+    {
+        return $this->getOtherComponentsGrid()->getSelectedPackages();
+    }
+
+    /**
+     * Get grid block for other components.
+     *
+     * @return OtherComponentsGrid
+     */
+    private function getOtherComponentsGrid() : OtherComponentsGrid
+    {
+        if (!isset($this->otherComponentGrid)) {
+            $this->otherComponentGrid = $this->blockFactory->create(
+                OtherComponentsGrid::class,
+                ['element' => $this->_rootElement->find($this->otherComponentsGrid)]
+            );
+        }
+
+        return $this->otherComponentGrid;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php
new file mode 100644
index 0000000000000..8ca2c0654e28c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Test\Block\SelectVersion;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid\Item;
+
+/**
+ * Perform OtherComponentsGrid block.
+ */
+class OtherComponentsGrid extends Block
+{
+    /**
+     * @var string
+     */
+    private $itemComponent = '//tr[contains(@ng-repeat,"component") and ./td[contains(.,"%s")]]';
+
+    /**
+     * @var string
+     */
+    private $perPage = '#perPage';
+
+    /**
+     * @var array
+     */
+    private $selectedPackages = [];
+
+    /**
+     * Set version of the packages.
+     *
+     * @param array $packages
+     * @return void
+     */
+    public function setVersions(array $packages) : void
+    {
+        foreach ($packages as $package) {
+            $selector = sprintf($this->itemComponent, $package['name']);
+            $elements = $this->_rootElement->getElements($selector, Locator::SELECTOR_XPATH);
+            foreach ($elements as $element) {
+                $row = $this->getComponentRow($element);
+                $row->setVersion($package['version']);
+                $this->selectedPackages[$row->getPackageName()] = $package['version'];
+            }
+        }
+    }
+
+    /**
+     * Returns selected packages.
+     *
+     * @return array
+     */
+    public function getSelectedPackages() : array
+    {
+        return $this->selectedPackages;
+    }
+
+    /**
+     * Set pager size.
+     *
+     * @param int $count
+     * @return void
+     */
+    public function setItemsPerPage(int $count) : void
+    {
+        $this->_rootElement->find($this->perPage, Locator::SELECTOR_CSS, 'select')->setValue($count);
+    }
+
+    /**
+     * Get component block.
+     *
+     * @param ElementInterface $element
+     * @return Item
+     */
+    private function getComponentRow(ElementInterface $element) : Item
+    {
+        return $this->blockFactory->create(
+            Item::class,
+            ['element' => $element]
+        );
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php
new file mode 100644
index 0000000000000..8c24323f37618
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Block for each component.
+ */
+class Item extends Block
+{
+    /**
+     * CSS selector for version element.
+     *
+     * @var string
+     */
+    private $version = '[ng-change*="setComponentVersion"]';
+
+    /**
+     * CSS selector for package name element.
+     *
+     * @var string
+     */
+    private $packageName = 'td:nth-child(2)';
+
+    /**
+     * Set version for particular component.
+     *
+     * @param string $version
+     */
+    public function setVersion(string $version)
+    {
+        $this->_rootElement->find($this->version, Locator::SELECTOR_CSS, 'select')->setValue($version);
+    }
+
+    /**
+     * Returns package name of element.
+     *
+     * @return array|string
+     */
+    public function getPackageName()
+    {
+        return $this->_rootElement->find($this->packageName)->getText();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php
index 5ddc5794ff816..caafa814a871a 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php
@@ -18,17 +18,24 @@ class AssertVersionAndEditionCheck extends AbstractConstraint
      * Assert that package and version is correct
      *
      * @param SetupWizard $setupWizard
-     * @param string $package
-     * @param string $version
+     * @param array $upgrade
      * @return void
      */
-    public function processAssert(SetupWizard $setupWizard, $package, $version)
+    public function processAssert(SetupWizard $setupWizard, array $upgrade) :void
     {
-        $message = "We're ready to upgrade $package to $version";
+        $message = "We're ready to upgrade {$upgrade['package']} to {$upgrade['version']}.";
+        if ($upgrade['otherComponents'] === 'Yes' && isset($upgrade['selectedPackages'])) {
+            foreach ($upgrade['selectedPackages'] as $name => $version) {
+                $message .= "\nWe're ready to upgrade {$name} to {$version}.";
+            }
+        }
+        $actualMessage = $setupWizard->getSystemUpgrade()->getUpgradeMessage();
         \PHPUnit\Framework\Assert::assertContains(
             $message,
-            $setupWizard->getSystemUpgrade()->getUpgradeMessage(),
-            'Updater application check is incorrect.'
+            $actualMessage,
+            "Updater application check is incorrect: \n"
+            . "Expected: '$message' \n"
+            . "Actual: '$actualMessage'"
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php
index 53c36e0a1e1b0..c9b3ce35e84ed 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php
@@ -31,23 +31,18 @@ class UpgradeSystemTest extends Injectable
     protected $adminDashboard;
 
     /**
-     * @var \Magento\Mtf\Util\Iterator\ApplicationState
-     */
-    private $applicationStateIterator;
-
-    /**
+     * Injection data.
+     *
      * @param Dashboard $adminDashboard
      * @param SetupWizard $setupWizard
-     * @param \Magento\Mtf\Util\Iterator\ApplicationState $applicationStateIterator
+     * @return void
      */
     public function __inject(
         Dashboard $adminDashboard,
-        SetupWizard $setupWizard,
-        \Magento\Mtf\Util\Iterator\ApplicationState $applicationStateIterator
+        SetupWizard $setupWizard
     ) {
         $this->adminDashboard = $adminDashboard;
         $this->setupWizard = $setupWizard;
-        $this->applicationStateIterator = $applicationStateIterator;
     }
 
     /**
@@ -114,7 +109,7 @@ public function test(
         $this->setupWizard->getSetupHome()->clickSystemUpgrade();
         $this->setupWizard->getSelectVersion()->fill($upgradeFixture);
         if ($upgrade['otherComponents'] === 'Yes') {
-            $this->setupWizard->getSelectVersion()->chooseUpgradeOtherComponents();
+            $this->setupWizard->getSelectVersion()->chooseUpgradeOtherComponents($upgrade['otherComponentsList']);
         }
         $this->setupWizard->getSelectVersion()->clickNext();
 
@@ -128,7 +123,9 @@ public function test(
         $this->setupWizard->getCreateBackup()->clickNext();
 
         // Check info and press 'Upgrade' button
-        $assertVersionAndEdition->processAssert($this->setupWizard, $upgrade['package'], $version);
+        $upgrade['version'] = $version;
+        $upgrade['selectedPackages'] = $this->setupWizard->getSelectVersion()->getSelectedPackages();
+        $assertVersionAndEdition->processAssert($this->setupWizard, $upgrade);
         $this->setupWizard->getSystemUpgrade()->clickSystemUpgrade();
 
         $assertSuccessMessage->processAssert($this->setupWizard, $upgrade['package']);
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml
index b092fe1812201..95193dbf6c097 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml
@@ -18,6 +18,13 @@
             <data name="upgrade/optionsMedia" xsi:type="string">No</data>
             <data name="upgrade/optionsDb" xsi:type="string">No</data>
             <data name="upgrade/otherComponents" xsi:type="string">{otherComponents}</data>
+            <!-- If otherComponents value is Yes specify otherComponentsList items-->
+            <data name="upgrade/otherComponentsList" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="name" xsi:type="string">{package_0_name}</item>
+                    <item name="version" xsi:type="string">{package_0_version}</item>
+                </item>
+            </data>
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
index 6f6f1b9d818af..dc525a46428c4 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\TestFramework\Annotation;
 
+use PHPUnit\Framework\Exception;
+
 class DataFixture
 {
     /**
@@ -171,8 +173,13 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            throw new \Exception(
-                sprintf("Error in fixture: %s.\n %s", json_encode($fixture), $e->getMessage()),
+            throw new Exception(
+                sprintf(
+                    "Error in fixture: %s.\n %s\n %s",
+                    json_encode($fixture),
+                    $e->getMessage(),
+                    $e->getTraceAsString()
+                ),
                 500,
                 $e
             );
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
index 423bd22f0a8a9..db7f57362d807 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\TestFramework\Annotation;
 
+use PHPUnit\Framework\Exception;
+
 class DataFixtureBeforeTransaction
 {
     /**
@@ -138,8 +140,15 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            throw new \Exception(
-                sprintf("Error in fixture: %s.\n %s", json_encode($fixture), (string)$e)
+            throw new Exception(
+                sprintf(
+                    "Error in fixture: %s.\n %s\n %s",
+                    json_encode($fixture),
+                    $e->getMessage(),
+                    $e->getTraceAsString()
+                ),
+                500,
+                $e
             );
         }
     }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
new file mode 100644
index 0000000000000..d9f1095000c0a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model;
+
+use Magento\Bundle\Api\Data\LinkInterface;
+use Magento\Bundle\Api\Data\OptionInterface;
+use Magento\Bundle\Api\Data\LinkInterfaceFactory;
+use Magento\Bundle\Api\Data\OptionInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test option repository class
+ */
+class OptionRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var OptionRepository
+     */
+    private $optionRepository;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->optionRepository = $this->objectManager->get(OptionRepository::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     * @magentoDataFixture Magento/Bundle/_files/empty_bundle_product.php
+     */
+    public function testBundleProductIsSaleableAfterNewOptionSave()
+    {
+        $bundleProduct = $this->productRepository->get('bundle-product');
+
+        /** @var OptionInterface $newOption */
+        $newOption = $this->objectManager->create(OptionInterfaceFactory::class)->create();
+        /** @var LinkInterface $productLink */
+        $productLink = $this->objectManager->create(LinkInterfaceFactory::class)->create();
+
+        $newOption->setTitle('new-option');
+        $newOption->setRequired(true);
+        $newOption->setType('select');
+        $newOption->setSku($bundleProduct->getSku());
+
+        $productLink->setSku('simple');
+        $productLink->setQty(1);
+        $productLink->setIsDefault(true);
+        $productLink->setCanChangeQuantity(0);
+
+        $newOption->setProductLinks([$productLink]);
+
+        $optionId = $this->optionRepository->save($bundleProduct, $newOption);
+        $bundleProduct = $this->productRepository->get($bundleProduct->getSku(), false, null, true);
+
+        $this->assertNotNull($optionId, 'Bundle option was not saved correctly');
+        $this->assertTrue($bundleProduct->isSaleable(), 'Bundle product should show as in stock once option is added');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product.php
new file mode 100644
index 0000000000000..cc20b293e69d1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId('bundle')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Bundle Product')
+    ->setSku('bundle-product')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setPriceView(0)
+    ->setPriceType(0)
+    ->setShipmentType(1)
+    ->setWeightType(0)
+    ->setDescription('description')
+    ->setPrice(99);
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product_rollback.php
new file mode 100644
index 0000000000000..a124661a45bac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/empty_bundle_product_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('bundle-product', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product.php
index 09aca0fe9f454..864d2dfafe53b 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product.php
@@ -3,22 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 /*
  * Since the bundle product creation GUI doesn't allow to choose values for bundled products' custom options,
  * bundled items should not contain products with required custom options.
  * However, if to create such a bundle product, it will be always out of stock.
  */
 require __DIR__ . '/../../../Magento/Catalog/_files/products.php';
+
 /** @var $objectManager \Magento\TestFramework\ObjectManager */
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 $sampleProduct = $productRepository->get('simple');
+
 /** @var $product \Magento\Catalog\Model\Product */
 $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId('bundle')
     ->setId(3)
     ->setAttributeSetId(4)
+    ->setWeight(2)
     ->setWebsiteIds([1])
     ->setName('Bundle Product')
     ->setSku('bundle-product')
@@ -26,8 +30,10 @@
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->setPriceView(1)
+    ->setSkuType(1)
+    ->setWeightType(1)
     ->setPriceType(1)
-    ->setShipmentType(1)
+    ->setShipmentType(0)
     ->setPrice(10.0)
     ->setBundleOptionsData(
         [
@@ -44,13 +50,16 @@
             [
                 [
                     'product_id' => $sampleProduct->getId(),
+                    'selection_price_value' => 2.75,
                     'selection_qty' => 1,
                     'selection_can_change_qty' => 1,
                     'delete' => '',
+
                 ],
             ],
         ]
     );
+
 if ($product->getBundleOptionsData()) {
     $options = [];
     foreach ($product->getBundleOptionsData() as $key => $optionData) {
@@ -59,6 +68,7 @@
                 ->create(['data' => $optionData]);
             $option->setSku($product->getSku());
             $option->setOptionId(null);
+
             $links = [];
             $bundleLinks = $product->getBundleSelectionsData();
             if (!empty($bundleLinks[$key])) {
@@ -70,6 +80,7 @@
                         $linkProduct = $productRepository->getById($linkData['product_id']);
                         $link->setSku($linkProduct->getSku());
                         $link->setQty($linkData['selection_qty']);
+                        $link->setPrice($linkData['selection_price_value']);
                         if (isset($linkData['selection_can_change_qty'])) {
                             $link->setCanChangeQuantity($linkData['selection_can_change_qty']);
                         }
@@ -85,4 +96,5 @@
     $extension->setBundleProductOptions($options);
     $product->setExtensionAttributes($extension);
 }
-$product->save();
+
+$productRepository->save($product, true);
diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php
index 29dd6550e4ece..e65d518af3419 100644
--- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php
+++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\BundleImportExport\Model\Import\Product\Type;
 
-use Magento\Framework\App\Bootstrap;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\ImportExport\Model\Import;
 
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class BundleTest extends \PHPUnit\Framework\TestCase
+class BundleTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /**
      * Bundle product test Name
@@ -41,9 +41,22 @@ class BundleTest extends \PHPUnit\Framework\TestCase
      */
     protected $optionSkuList = ['Simple 1', 'Simple 2', 'Simple 3'];
 
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     protected function setUp()
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
         $this->model = $this->objectManager->create(\Magento\CatalogImportExport\Model\Import\Product::class);
     }
 
@@ -122,6 +135,7 @@ public function testBundleImport()
 
     /**
      * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDbIsolation disabled
      * @magentoAppArea adminhtml
      * @return void
      */
@@ -179,4 +193,12 @@ public function testBundleImportWithMultipleStoreViews(): void
             }
         }
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
index cd312f147c7c7..1d7936d740b8d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -323,7 +323,7 @@ public function testDeleteChildren()
     /**
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/Catalog/_files/categories.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @return void
      */
     public function testCreateSubcategoryWithMultipleStores()
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php
index f55afc8c6a211..bb7e241d972e5 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute.php
@@ -32,8 +32,8 @@
             'is_filterable_in_search'       => 0,
             'is_used_for_promo_rules'       => 0,
             'is_html_allowed_on_front'      => 1,
-            'is_visible_on_front'           => 0,
-            'used_in_product_listing'       => 0,
+            'is_visible_on_front'           => 1,
+            'used_in_product_listing'       => 1,
             'used_for_sort_by'              => 0,
             'frontend_label'                => ['Drop-Down Attribute'],
             'backend_type'                  => 'varchar',
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php
index c39e03773c356..04769401c147e 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php
@@ -152,18 +152,19 @@ public function testConfigurableImport($pathToFile, $productName, $optionSkuList
     }
 
     /**
+     * @magentoDataFixture Magento/Catalog/_files/enable_reindex_schedule.php
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_attribute.php
      * @magentoAppArea adminhtml
      * @magentoAppIsolation enabled
-     * @return void
+     * @magentoDbIsolation disabled
      */
     public function testConfigurableImportWithMultipleStores()
     {
         $productSku = 'Configurable 1';
         $products = [
             'default' => 'Configurable 1',
-            'fixture_second_store' => 'Configurable 1 Second Store',
+            'fixture_second_store' => 'Configurable 1 Second Store'
         ];
         $filesystem = $this->objectManager->create(
             \Magento\Framework\Filesystem::class
@@ -174,24 +175,26 @@ public function testConfigurableImportWithMultipleStores()
             \Magento\ImportExport\Model\Import\Source\Csv::class,
             [
                 'file' =>  __DIR__ . '/../../_files/import_configurable_for_multiple_store_views.csv',
-                'directory' => $directory,
+                'directory' => $directory
             ]
         );
-        $errors = $this->model->setSource($source)->setParameters(
+        $errors = $this->model->setSource(
+            $source
+        )->setParameters(
             [
                 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
-                'entity' => 'catalog_product',
+                'entity' => 'catalog_product'
             ]
         )->validateData();
 
-        $this->assertTrue($errors->getErrorsCount() === 0);
+        $this->assertTrue($errors->getErrorsCount() == 0);
         $this->model->importData();
 
         foreach ($products as $storeCode => $productName) {
             $store = $this->objectManager->create(\Magento\Store\Model\Store::class);
             $store->load($storeCode, 'code');
-            /** @var ProductRepositoryInterface $productRepository */
-            $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+            /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+            $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
             /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
             $product = $productRepository->get($productSku, 0, $store->getId());
             $this->assertFalse($product->isObjectNew());
@@ -201,36 +204,40 @@ public function testConfigurableImportWithMultipleStores()
     }
 
     /**
+     * @magentoDataFixture Magento/Catalog/_files/enable_reindex_schedule.php
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_attribute.php
      * @magentoDbIsolation disabled
      * @magentoAppArea adminhtml
-     * @return void
      */
     public function testConfigurableImportWithStoreSpecifiedMainItem()
     {
-        $expectedErrorMessage = 'Product with assigned super attributes should not have specified "store_view_code"'
-            . ' value';
-        $filesystem = $this->objectManager->create(
-            \Magento\Framework\Filesystem::class
-        );
-
-        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
-        $source = $this->objectManager->create(
-            \Magento\ImportExport\Model\Import\Source\Csv::class,
-            [
-                'file' =>  __DIR__ . '/../../_files/import_configurable_for_multiple_store_views_error.csv',
-                'directory' => $directory,
-            ]
-        );
-        $errors = $this->model->setSource($source)->setParameters(
-            [
-                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
-                'entity' => 'catalog_product',
-            ]
-        )->validateData();
-
-        $this->assertTrue($errors->getErrorsCount() === 1);
-        $this->assertEquals($expectedErrorMessage, $errors->getAllErrors()[0]->getErrorMessage());
+        {
+            $expectedErrorMessage = 'Product with assigned super attributes should not have specified "store_view_code"'
+                . ' value';
+            $filesystem = $this->objectManager->create(
+                \Magento\Framework\Filesystem::class
+            );
+
+            $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+            $source = $this->objectManager->create(
+                \Magento\ImportExport\Model\Import\Source\Csv::class,
+                [
+                    'file' =>  __DIR__ . '/../../_files/import_configurable_for_multiple_store_views_error.csv',
+                    'directory' => $directory
+                ]
+            );
+            $errors = $this->model->setSource(
+                $source
+            )->setParameters(
+                [
+                    'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                    'entity' => 'catalog_product'
+                ]
+            )->validateData();
+
+            $this->assertTrue($errors->getErrorsCount() == 1);
+            $this->assertEquals($expectedErrorMessage, $errors->getAllErrors()[0]->getErrorMessage());
+        }
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
index 5925eb06500e0..05d9c5d3acb1e 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
@@ -135,6 +135,82 @@ public function testImportData()
         );
     }
 
+    /**
+     * Tests importData() method.
+     *
+     * @magentoDataFixture Magento/Customer/_files/import_export/customer.php
+     *
+     * @return void
+     */
+    public function testImportDataWithOneAdditionalColumn(): void
+    {
+        $source = new \Magento\ImportExport\Model\Import\Source\Csv(
+            __DIR__ . '/_files/customer_to_import_with_one_additional_column.csv',
+            $this->directoryWrite
+        );
+
+        /** @var $customersCollection \Magento\Customer\Model\ResourceModel\Customer\Collection */
+        $customersCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Customer\Model\ResourceModel\Customer\Collection::class
+        );
+        $customersCollection->resetData();
+        $customersCollection->clear();
+
+        $this->_model
+            ->setParameters(['behavior' => Import::BEHAVIOR_ADD_UPDATE])
+            ->setSource($source)
+            ->validateData()
+            ->hasToBeTerminated();
+        sleep(1);
+        $this->_model->importData();
+
+        $customers = $customersCollection->getItems();
+
+        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $existingCustomer = $objectManager->get(\Magento\Framework\Registry::class)
+            ->registry('_fixture/Magento_ImportExport_Customer');
+
+        $updatedCustomer = $customers[$existingCustomer->getId()];
+
+        $this->assertNotEquals(
+            $existingCustomer->getFirstname(),
+            $updatedCustomer->getFirstname(),
+            'Firstname must be changed'
+        );
+
+        $this->assertNotEquals(
+            $existingCustomer->getUpdatedAt(),
+            $updatedCustomer->getUpdatedAt(),
+            'Updated at date must be changed'
+        );
+
+        $this->assertEquals(
+            $existingCustomer->getLastname(),
+            $updatedCustomer->getLastname(),
+            'Lastname must not be changed'
+        );
+
+        $this->assertEquals(
+            $existingCustomer->getStoreId(),
+            $updatedCustomer->getStoreId(),
+            'Store Id must not be changed'
+        );
+
+        $this->assertEquals(
+            $existingCustomer->getCreatedAt(),
+            $updatedCustomer->getCreatedAt(),
+            'Creation date must not be changed'
+        );
+
+        $this->assertEquals(
+            $existingCustomer->getCustomerGroupId(),
+            $updatedCustomer->getCustomerGroupId(),
+            'Customer group must not be changed'
+        );
+    }
+
     /**
      * Test importData() method (delete behavior)
      *
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/customer_to_import_with_one_additional_column.csv b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/customer_to_import_with_one_additional_column.csv
new file mode 100644
index 0000000000000..fd081e090eb85
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/customer_to_import_with_one_additional_column.csv
@@ -0,0 +1,2 @@
+email,_website,firstname
+CharlesTAlston@teleworm.us,base,Jhon
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
index 7d5cb55ec2f96..5e8239586d76b 100644
--- a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
@@ -78,6 +78,19 @@ public function testGetSelectOptions()
         );
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/dropdown_attribute.php
+     */
+    public function testAttributeEntityValueNotSet()
+    {
+        $entity = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
+        $entity->setStoreId(0);
+        $entity->load(1);
+        $frontEnd = $this->attribute->loadByCode('catalog_product', 'dropdown_attribute');
+        $value = $frontEnd->getFrontend()->getValue($entity);
+        $this->assertFalse($value);
+    }
+
     /**
      * Cache key generation
      * @return string
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php
index d1b22e853ce1d..103df9f570a2a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php
@@ -44,6 +44,9 @@ public function getConstructorArgumentTypesDataProvider()
                     '\Imported\Name\Space\ClassName\Under\Test',
                     '\Imported\Name\Space\ClassName',
                     '\Some\Testing\Name\Space\Test',
+                    '\Exception',
+                    '',
+                    '\Imported\Name\Space\ClassName',
                     'array',
                     ''
                 ],
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample
index 47c059de2034b..5efe7837e7a3a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample
@@ -19,6 +19,9 @@ class AnotherSimpleClass
         ClassName\Under\Test $itemFive,
         ClassName $itemSix,
         Test $itemSeven,
+        ?\Exception $optionalException,
+        $defaultString = '$default),value;',
+        ?ClassName $optionalWithDefaultValue = null,
         array $itemEight = [],
         $itemNine = 'test'
     ) {
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php
new file mode 100644
index 0000000000000..5b39a2afb9d6c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Config/ConverterTest.php
@@ -0,0 +1,86 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Config;
+
+/**
+ * Tests Magento\Framework\Config\Convert
+ */
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Converter
+     */
+    private $converter;
+
+    /**
+     * Tests config value "false" is not interpreted as true.
+     *
+     * @param string $sourceString
+     * @param array $expected
+     * @dataProvider parseVarElementDataProvider
+     */
+    public function testParseVarElement($sourceString, $expected)
+    {
+        $document = new \DOMDocument();
+        $document->loadXML($sourceString);
+        $actual = $this->converter->convert($document);
+
+        self::assertEquals(
+            $expected,
+            $actual
+        );
+    }
+
+    /**
+     * Data provider for testParseVarElement.
+     *
+     * @return array
+     */
+    public function parseVarElementDataProvider()
+    {
+        $sourceString = <<<'XML'
+<?xml version="1.0"?>
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
+    <vars module="Magento_Test">    
+        <var name="str">some string</var>  
+        <var name="int-1">1</var>        
+        <var name="int-0">0</var>        
+        <var name="bool-true">true</var> 
+        <var name="bool-false">false</var> 
+    </vars>
+ </view>
+XML;
+        $expectedResult = [
+            'vars' => [
+                'Magento_Test' => [
+                    'str' => 'some string',
+                    'int-1' => '1',
+                    'int-0' => '0',
+                    'bool-true' => true,
+                    'bool-false' => false
+                ]
+            ]
+        ];
+
+        return [
+            [
+                $sourceString,
+                $expectedResult
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->converter = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+              ->create(\Magento\Framework\Config\Converter::class);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
index b05d98133980b..f1f65ec2ada80 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
@@ -48,7 +48,7 @@ public function testLoadDataCaching()
         /** @var \Magento\Framework\Translate $model */
         $model = $this->objectManager->get(\Magento\Framework\Translate::class);
 
-        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND); // this is supposed to cache the fixture
+        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND, true); // this is supposed to cache the fixture
         $this->assertEquals('Fixture Db Translation', new Phrase('Fixture String'));
 
         /** @var \Magento\Translation\Model\ResourceModel\StringUtils $translateString */
diff --git a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
index 3d717d6282268..f362e75ea790e 100644
--- a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
+++ b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
@@ -19,6 +19,7 @@
  * Tests the different cases of consumers running by ConsumersRunner
  *
  * {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
 {
@@ -104,7 +105,7 @@ protected function setUp()
                 $command = str_replace('bin/magento', 'dev/tests/integration/bin/magento', $command);
                 $command = $params . ' ' . $command;
 
-                return exec("{$command} > /dev/null &");
+                return exec("{$command} >/dev/null &");
             });
     }
 
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 b1ba88f601cdd..bd641dab26c09 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
@@ -12,6 +12,7 @@
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Model\Info;
 use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\ResourceModel\Quote\Collection;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -28,22 +29,22 @@ class CheckoutTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var Info
+     * @var Info|\PHPUnit_Framework_MockObject_MockObject
      */
     private $paypalInfo;
 
     /**
-     * @var Config
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
      */
     private $paypalConfig;
 
     /**
-     * @var Factory
+     * @var Factory|\PHPUnit_Framework_MockObject_MockObject
      */
     private $apiTypeFactory;
 
     /**
-     * @var Nvp
+     * @var Nvp|\PHPUnit_Framework_MockObject_MockObject
      */
     private $api;
 
@@ -96,7 +97,7 @@ protected function setUp()
      */
     public function testCheckoutStartWithBillingAddress()
     {
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $paypalConfig = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -151,7 +152,7 @@ public function testCheckoutStartWithBillingAddress()
     public function testPrepareCustomerQuote()
     {
         /** @var Quote $quote */
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $quote->setCheckoutMethod(Onepage::METHOD_CUSTOMER); // to dive into _prepareCustomerQuote() on switch
         $quote->getShippingAddress()->setSameAsBilling(0);
         $quote->setReservedOrderId(null);
@@ -163,7 +164,7 @@ public function testPrepareCustomerQuote()
         /** @var \Magento\Customer\Model\Session $customerSession */
         $customerSession = $this->objectManager->get(\Magento\Customer\Model\Session::class);
         $customerSession->loginById(1);
-        $checkout = $this->_getCheckout($quote);
+        $checkout = $this->getCheckout($quote);
         $checkout->place('token');
 
         /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerService */
@@ -191,12 +192,12 @@ public function testPrepareCustomerQuote()
     public function testPlaceGuestQuote()
     {
         /** @var Quote $quote */
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $quote->setCheckoutMethod(Onepage::METHOD_GUEST); // to dive into _prepareGuestQuote() on switch
         $quote->getShippingAddress()->setSameAsBilling(0);
         $quote->setReservedOrderId(null);
 
-        $checkout = $this->_getCheckout($quote);
+        $checkout = $this->getCheckout($quote);
         $checkout->place('token');
 
         $this->assertNull($quote->getCustomerId());
@@ -218,7 +219,7 @@ public function testPlaceGuestQuote()
      * @param Quote $quote
      * @return Checkout
      */
-    protected function _getCheckout(Quote $quote)
+    protected function getCheckout(Quote $quote)
     {
         return $this->objectManager->create(
             Checkout::class,
@@ -242,7 +243,7 @@ protected function _getCheckout(Quote $quote)
      */
     public function testReturnFromPaypal()
     {
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $this->checkoutModel = $this->objectManager->create(
             Checkout::class,
             [
@@ -252,12 +253,13 @@ public function testReturnFromPaypal()
             ]
         );
 
-        $exportedBillingAddress = $this->_getExportedAddressFixture($quote->getBillingAddress()->getData());
+        $prefix = 'exported';
+        $exportedBillingAddress = $this->getExportedAddressFixture($quote->getBillingAddress()->getData(), $prefix);
         $this->api->expects($this->any())
             ->method('getExportedBillingAddress')
             ->will($this->returnValue($exportedBillingAddress));
 
-        $exportedShippingAddress = $this->_getExportedAddressFixture($quote->getShippingAddress()->getData());
+        $exportedShippingAddress = $this->getExportedAddressFixture($quote->getShippingAddress()->getData(), $prefix);
         $this->api->expects($this->any())
             ->method('getExportedShippingAddress')
             ->will($this->returnValue($exportedShippingAddress));
@@ -269,7 +271,7 @@ public function testReturnFromPaypal()
         $this->checkoutModel->returnFromPaypal('token');
 
         $billingAddress = $quote->getBillingAddress();
-        $this->assertContains('exported', $billingAddress->getFirstname());
+        $this->assertContains($prefix, $billingAddress->getFirstname());
         $this->assertEquals('note', $billingAddress->getCustomerNote());
 
         $shippingAddress = $quote->getShippingAddress();
@@ -298,27 +300,25 @@ public function testReturnFromPaypal()
      */
     public function testReturnFromPaypalButton()
     {
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $this->prepareCheckoutModel($quote);
         $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 1);
 
         $this->checkoutModel->returnFromPaypal('token');
 
         $shippingAddress = $quote->getShippingAddress();
+        $prefix = '';
 
-        $prefix = 'exported';
         $this->assertEquals([$prefix . $this->getExportedData()['street']], $shippingAddress->getStreet());
         $this->assertEquals($prefix . $this->getExportedData()['firstname'], $shippingAddress->getFirstname());
         $this->assertEquals($prefix . $this->getExportedData()['city'], $shippingAddress->getCity());
         $this->assertEquals($prefix . $this->getExportedData()['telephone'], $shippingAddress->getTelephone());
-        // This fields not in exported keys list. Fields the same as quote shipping and billing address.
-        $this->assertNotEquals($prefix . $this->getExportedData()['region'], $shippingAddress->getRegion());
-        $this->assertNotEquals($prefix . $this->getExportedData()['email'], $shippingAddress->getEmail());
+        $this->assertEquals($prefix . $this->getExportedData()['email'], $shippingAddress->getEmail());
     }
 
     /**
      * The case when handling address data from the checkout.
-     * System's address fields are not replacing from export Paypal data.
+     * System's address fields are not replacing from export PayPal data.
      *
      * @magentoDataFixture Magento/Paypal/_files/quote_payment_express_with_customer.php
      * @magentoAppIsolation enabled
@@ -326,7 +326,7 @@ public function testReturnFromPaypalButton()
      */
     public function testReturnFromPaypalIfCheckout()
     {
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $this->prepareCheckoutModel($quote);
         $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 0);
 
@@ -342,6 +342,96 @@ public function testReturnFromPaypalIfCheckout()
         $this->assertNotEquals($prefix . $this->getExportedData()['telephone'], $shippingAddress->getTelephone());
     }
 
+    /**
+     * Test case when customer doesn't have either billing or shipping addresses.
+     * Customer add virtual product to quote and place order using PayPal Express method.
+     * After return from PayPal quote billing address have to be updated by PayPal Express address.
+     *
+     * @magentoDataFixture Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php
+     * @magentoConfigFixture current_store payment/paypal_express/active 1
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testReturnFromPayPalForCustomerWithEmptyAddresses(): void
+    {
+        $quote = $this->getFixtureQuote();
+        $this->prepareCheckoutModel($quote);
+        $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 0);
+
+        $this->checkoutModel->returnFromPaypal('token');
+
+        $billingAddress = $quote->getBillingAddress();
+
+        $this->performQuoteAddressAssertions($billingAddress, $this->getExportedData());
+    }
+
+    /**
+     * Test case when customer doesn't have either billing or shipping addresses.
+     * Customer add virtual product to quote and place order using PayPal Express method.
+     * Default store country is in PayPal Express allowed specific country list.
+     *
+     * @magentoDataFixture Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php
+     * @magentoConfigFixture current_store payment/paypal_express/active 1
+     * @magentoConfigFixture current_store payment/paypal_express/allowspecific 1
+     * @magentoConfigFixture current_store payment/paypal_express/specificcountry US,GB
+     * @magentoConfigFixture current_store general/country/default US
+     *
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testPaymentValidationWithAllowedSpecificCountry(): void
+    {
+        $quote = $this->getFixtureQuote();
+        $this->prepareCheckoutModel($quote);
+
+        $quote->getPayment()->getMethodInstance()->validate();
+    }
+
+    /**
+     * Test case when customer doesn't have either billing or shipping addresses.
+     * Customer add virtual product to quote and place order using PayPal Express method.
+     * PayPal Express allowed specific country list doesn't contain default store country.
+     *
+     * @magentoDataFixture Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php
+     * @magentoConfigFixture current_store payment/paypal_express/active 1
+     * @magentoConfigFixture current_store payment/paypal_express/allowspecific 1
+     * @magentoConfigFixture current_store payment/paypal_express/specificcountry US,GB
+     * @magentoConfigFixture current_store general/country/default CA
+     *
+     * @magentoDbIsolation enabled
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage You can't use the payment type you selected to make payments to the billing country.
+     *
+     * @return void
+     */
+    public function testPaymentValidationWithAllowedSpecificCountryNegative(): void
+    {
+        $quote = $this->getFixtureQuote();
+        $this->prepareCheckoutModel($quote);
+        $quote->getPayment()->getMethodInstance()->validate();
+    }
+
+    /**
+     * Performs quote address assertions.
+     *
+     * @param Address $address
+     * @param array $expected
+     * @return void
+     */
+    private function performQuoteAddressAssertions(Address $address, array $expected): void
+    {
+        foreach ($expected as $key => $item) {
+            $methodName = 'get' . ucfirst($key);
+            if ($key === 'street') {
+                $item = [$item];
+            }
+
+            $this->assertEquals($item, $address->$methodName(), 'The "'. $key . '" does not match.');
+        }
+    }
+
     /**
      * Initialize a checkout model mock.
      *
@@ -358,18 +448,15 @@ private function prepareCheckoutModel(Quote $quote)
             ]
         );
 
-        $exportedBillingAddress = $this->_getExportedAddressFixture($this->getExportedData());
-        $this->api->expects($this->any())
-            ->method('getExportedBillingAddress')
-            ->will($this->returnValue($exportedBillingAddress));
+        $exportedBillingAddress = $this->getExportedAddressFixture($this->getExportedData());
+        $this->api->method('getExportedBillingAddress')
+            ->willReturn($exportedBillingAddress);
 
-        $exportedShippingAddress = $this->_getExportedAddressFixture($this->getExportedData());
-        $this->api->expects($this->any())
-            ->method('getExportedShippingAddress')
-            ->will($this->returnValue($exportedShippingAddress));
+        $exportedShippingAddress = $this->getExportedAddressFixture($this->getExportedData());
+        $this->api->method('getExportedShippingAddress')
+            ->willReturn($exportedShippingAddress);
 
-        $this->paypalInfo->expects($this->once())
-            ->method('importToPayment')
+        $this->paypalInfo->method('importToPayment')
             ->with($this->api, $quote->getPayment());
     }
 
@@ -378,19 +465,20 @@ private function prepareCheckoutModel(Quote $quote)
      *
      * @return array
      */
-    private function getExportedData()
+    private function getExportedData(): array
     {
-        return
-            [
-                'company'    => 'Testcompany',
-                'email'      => 'buyeraccountmpi@gmail.com',
-                'firstname'  => 'testFirstName',
-                'country_id' => 'US',
-                'region'     => 'testRegion',
-                'city'       => 'testSity',
-                'street'     => 'testStreet',
-                'telephone'  => '223344',
-            ];
+        return [
+            'email'      => 'customer@example.com',
+            'firstname'  => 'John',
+            'lastname'   => 'Doe',
+            'country'    => 'US',
+            'region'     => 'Colorado',
+            'region_id'  => '13',
+            'city'       => 'Denver',
+            'street'     => '66 Pearl St',
+            'postcode'   => '80203',
+            'telephone'  => '555-555-555',
+        ];
     }
 
     /**
@@ -402,7 +490,7 @@ private function getExportedData()
      */
     public function testGuestReturnFromPaypal()
     {
-        $quote = $this->_getFixtureQuote();
+        $quote = $this->getFixtureQuote();
         $paypalConfig = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -439,12 +527,12 @@ public function testGuestReturnFromPaypal()
             ->method('create')
             ->will($this->returnValue($api));
 
-        $exportedBillingAddress = $this->_getExportedAddressFixture($quote->getBillingAddress()->getData());
+        $exportedBillingAddress = $this->getExportedAddressFixture($quote->getBillingAddress()->getData());
         $api->expects($this->any())
             ->method('getExportedBillingAddress')
             ->will($this->returnValue($exportedBillingAddress));
 
-        $exportedShippingAddress = $this->_getExportedAddressFixture($quote->getShippingAddress()->getData());
+        $exportedShippingAddress = $this->getExportedAddressFixture($quote->getShippingAddress()->getData());
         $api->expects($this->any())
             ->method('getExportedShippingAddress')
             ->will($this->returnValue($exportedShippingAddress));
@@ -464,15 +552,27 @@ public function testGuestReturnFromPaypal()
      * Prepare fixture for exported address.
      *
      * @param array $addressData
+     * @param string $prefix
      * @return \Magento\Framework\DataObject
      */
-    protected function _getExportedAddressFixture(array $addressData)
+    private function getExportedAddressFixture(array $addressData, string $prefix = ''): \Magento\Framework\DataObject
     {
-        $addressDataKeys = ['firstname', 'lastname', 'street', 'city', 'telephone'];
+        $addressDataKeys = [
+            'country',
+            'firstname',
+            'lastname',
+            'street',
+            'city',
+            'telephone',
+            'postcode',
+            'region',
+            'region_id',
+            'email',
+        ];
         $result = [];
         foreach ($addressDataKeys as $key) {
             if (isset($addressData[$key])) {
-                $result[$key] = 'exported' . $addressData[$key];
+                $result[$key] = $prefix . $addressData[$key];
             }
         }
 
@@ -488,7 +588,7 @@ protected function _getExportedAddressFixture(array $addressData)
      *
      * @return Quote
      */
-    protected function _getFixtureQuote()
+    private function getFixtureQuote(): Quote
     {
         /** @var Collection $quoteCollection */
         $quoteCollection = $this->objectManager->create(Collection::class);
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php
new file mode 100644
index 0000000000000..d0c16c2b41f09
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/virtual_quote_with_empty_billing_address.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../Customer/_files/customer.php';
+
+Bootstrap::getInstance()->loadArea('adminhtml');
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+$customer = $customerRepository->get('customer@example.com');
+
+/** @var $product Product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_VIRTUAL)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Virtual Product')
+    ->setSku('virtual-product-express')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+/** @var StockItemInterface $stockItem */
+$stockItem = $objectManager->create(StockItemInterface::class);
+$stockItem->setQty(100)
+    ->setIsInStock(true);
+$extensionAttributes = $product->getExtensionAttributes();
+$extensionAttributes->setStockItem($stockItem);
+
+/** @var $productRepository ProductRepositoryInterface */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$product = $productRepository->save($product);
+
+$billingAddress = $objectManager->create(Address::class);
+$billingAddress->setAddressType('billing');
+
+/** @var $quote Quote */
+$quote = $objectManager->create(Quote::class);
+$quote->setCustomerIsGuest(false)
+    ->setCustomerId($customer->getId())
+    ->setCustomer($customer)
+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+    ->setReservedOrderId('test02')
+    ->setBillingAddress($billingAddress);
+$item = $objectManager->create(Item::class);
+$item->setProduct($product)
+    ->setPrice($product->getPrice())
+    ->setQty(1);
+$quote->addItem($item);
+$quote->getPayment()->setMethod(\Magento\Paypal\Model\Config::METHOD_EXPRESS);
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->create(CartRepositoryInterface::class);
+$quoteRepository->save($quote);
+$quote = $quoteRepository->get($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/QuoteTest.php
deleted file mode 100644
index 3bd22ef29cb23..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/QuoteTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Quote\Model\ResourceModel;
-
-/**
- * Class QuoteTest to verify isOrderIncrementIdUsed method behaviour
- */
-class QuoteTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote
-     */
-    private $_resourceModel;
-
-    protected function setUp()
-    {
-        $this->_resourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Quote\Model\ResourceModel\Quote::class
-        );
-    }
-
-    /**
-     * Test to verify if isOrderIncrementIdUsed method works with numeric increment ids
-     *
-     * @magentoDataFixture Magento/Sales/_files/order.php
-     */
-    public function testIsOrderIncrementIdUsedNumericIncrementId()
-    {
-        $this->assertTrue($this->_resourceModel->isOrderIncrementIdUsed('100000001'));
-    }
-
-    /**
-     * Test to verify if isOrderIncrementIdUsed method works with alphanumeric increment ids
-     *
-     * @magentoDataFixture Magento/Sales/_files/order_alphanumeric_id.php
-     */
-    public function testIsOrderIncrementIdUsedAlphanumericIncrementId()
-    {
-        $this->assertTrue($this->_resourceModel->isOrderIncrementIdUsed('M00000001'));
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ItemRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ItemRepositoryTest.php
new file mode 100644
index 0000000000000..8f0c255a903b9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ItemRepositoryTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+class ItemRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Sales\Model\Order */
+    private $order;
+
+    /** @var \Magento\Sales\Api\OrderItemRepositoryInterface */
+    private $orderItemRepository;
+
+    /** @var \Magento\Framework\Api\SearchCriteriaBuilder */
+    private $searchCriteriaBuilder;
+
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->order = $objectManager->create(\Magento\Sales\Model\Order::class);
+        $this->orderItemRepository = $objectManager->create(\Magento\Sales\Api\OrderItemRepositoryInterface::class);
+        $this->searchCriteriaBuilder = $objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order_configurable_product.php
+     */
+    public function testAddOrderItemParent()
+    {
+        $this->order->load('100000001', 'increment_id');
+
+        foreach ($this->order->getItems() as $item) {
+            if ($item->getProductType() === \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) {
+                $orderItem = $this->orderItemRepository->get($item->getItemId());
+                $this->assertInstanceOf(\Magento\Sales\Api\Data\OrderItemInterface::class, $orderItem->getParentItem());
+            }
+        }
+
+        $itemList = $this->orderItemRepository->getList(
+            $this->searchCriteriaBuilder->addFilter('order_id', $this->order->getId())->create()
+        );
+
+        foreach ($itemList->getItems() as $item) {
+            if ($item->getProductType() === \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) {
+                $this->assertInstanceOf(\Magento\Sales\Api\Data\OrderItemInterface::class, $item->getParentItem());
+            }
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/OrderIncrementIdCheckerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/OrderIncrementIdCheckerTest.php
new file mode 100644
index 0000000000000..6111c73038f7c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/OrderIncrementIdCheckerTest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model;
+
+/**
+ * Class to verify isIncrementIdUsed method behaviour.
+ */
+class OrderIncrementIdCheckerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker
+     */
+    private $checker;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->checker = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Sales\Model\OrderIncrementIdChecker::class
+        );
+    }
+
+    /**
+     * Test to verify if isIncrementIdUsed method works with numeric increment ids.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @return void
+     */
+    public function testIsOrderIncrementIdUsedNumericIncrementId(): void
+    {
+        $this->assertTrue($this->checker->isIncrementIdUsed('100000001'));
+    }
+
+    /**
+     * Test to verify if isIncrementIdUsed method works with alphanumeric increment ids.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order_alphanumeric_id.php
+     * @return void
+     */
+    public function testIsOrderIncrementIdUsedAlphanumericIncrementId(): void
+    {
+        $this->assertTrue($this->checker->isIncrementIdUsed('M00000001'));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php
new file mode 100644
index 0000000000000..e601e2dd59232
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model\Rule\Action\Discount;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Api\GuestCartItemRepositoryInterface;
+use Magento\Quote\Api\GuestCartManagementInterface;
+use Magento\Quote\Api\GuestCartTotalRepositoryInterface;
+use Magento\Quote\Api\GuestCouponManagementInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Tests for Magento\SalesRule\Model\Rule\Action\Discount\CartFixed.
+ */
+class CartFixedTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GuestCartManagementInterface
+     */
+    private $cartManagement;
+
+    /**
+     * @var GuestCartItemRepositoryInterface
+     */
+    private $cartItemRepository;
+
+    /**
+     * @var GuestCouponManagementInterface
+     */
+    private $couponManagement;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->cartManagement = Bootstrap::getObjectManager()->create(GuestCartManagementInterface::class);
+        $this->couponManagement = Bootstrap::getObjectManager()->create(GuestCouponManagementInterface::class);
+        $this->cartItemRepository = Bootstrap::getObjectManager()->create(GuestCartItemRepositoryInterface::class);
+    }
+
+    /**
+     * Applies fixed discount amount on whole cart.
+     *
+     * @param array $productPrices
+     * @return void
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/SalesRule/_files/coupon_cart_fixed_discount.php
+     * @dataProvider applyFixedDiscountDataProvider
+     */
+    public function testApplyFixedDiscount(array $productPrices): void
+    {
+        $expectedDiscount = '-15.00';
+        $couponCode =  'CART_FIXED_DISCOUNT_15';
+        $cartId = $this->cartManagement->createEmptyCart();
+
+        foreach ($productPrices as $price) {
+            $product = $this->createProduct($price);
+
+            /** @var CartItemInterface $quoteItem */
+            $quoteItem = Bootstrap::getObjectManager()->create(CartItemInterface::class);
+            $quoteItem->setQuoteId($cartId);
+            $quoteItem->setProduct($product);
+            $quoteItem->setQty(1);
+            $this->cartItemRepository->save($quoteItem);
+        }
+
+        $this->couponManagement->set($cartId, $couponCode);
+
+        /** @var GuestCartTotalRepositoryInterface $cartTotalRepository */
+        $cartTotalRepository = Bootstrap::getObjectManager()->get(GuestCartTotalRepositoryInterface::class);
+        $total = $cartTotalRepository->get($cartId);
+
+        $this->assertEquals($expectedDiscount, $total->getBaseDiscountAmount());
+    }
+
+    /**
+     * @return array
+     */
+    public function applyFixedDiscountDataProvider(): array
+    {
+        return [
+            'prices when discount had wrong value 15.01' => [[22, 14, 43, 7.50, 0.00]],
+            'prices when discount had wrong value 14.99' => [[47, 33, 9.50, 42, 0.00]],
+        ];
+    }
+
+    /**
+     * Returns simple product with given price.
+     *
+     * @param float $price
+     * @return ProductInterface
+     */
+    private function createProduct(float $price): ProductInterface
+    {
+        $name = 'simple-' . $price;
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepository::class);
+        $product = Bootstrap::getObjectManager()->create(Product::class);
+        $product->setTypeId('simple')
+            ->setAttributeSetId($product->getDefaultAttributeSetId())
+            ->setWebsiteIds([1])
+            ->setName($name)
+            ->setSku(uniqid($name))
+            ->setPrice($price)
+            ->setMetaTitle('meta title')
+            ->setMetaKeyword('meta keyword')
+            ->setMetaDescription('meta description')
+            ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+            ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+            ->setStockData(['qty' => 1, 'is_in_stock' => 1])
+            ->setWeight(1);
+
+        return $productRepository->save($product);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php
new file mode 100644
index 0000000000000..08e3ffe6e046c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupon_cart_fixed_discount.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\GroupManagement;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Rule $salesRule */
+$salesRule = $objectManager->create(Rule::class);
+$salesRule->setData(
+    [
+        'name' => '15$ fixed discount on whole cart',
+        'is_active' => 1,
+        'customer_group_ids' => [GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => Rule::COUPON_TYPE_SPECIFIC,
+        'conditions' => [
+            [
+                'type' => \Magento\SalesRule\Model\Rule\Condition\Address::class,
+                'attribute' => 'base_subtotal',
+                'operator' => '>',
+                'value' => 45,
+            ],
+        ],
+        'simple_action' => Rule::CART_FIXED_ACTION,
+        'discount_amount' => 15,
+        'discount_step' => 0,
+        'stop_rules_processing' => 1,
+        'website_ids' => [
+            $objectManager->get(StoreManagerInterface::class)->getWebsite()->getId(),
+        ],
+    ]
+);
+$objectManager->get(\Magento\SalesRule\Model\ResourceModel\Rule::class)->save($salesRule);
+
+// Create coupon and assign "15$ fixed discount" rule to this coupon.
+$coupon = $objectManager->create(Coupon::class);
+$coupon->setRuleId($salesRule->getId())
+    ->setCode('CART_FIXED_DISCOUNT_15')
+    ->setType(0);
+$objectManager->get(CouponRepositoryInterface::class)->save($coupon);
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js
index a4767fb551ee3..5614a9a1bc6e1 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js
@@ -64,9 +64,17 @@ define([
             });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         afterAll(function (done) {
             tplElement.remove();
             registry.remove(component.integrationName);
+
             done();
         });
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
index 52739eec2782b..84db685c02987 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
@@ -56,6 +56,13 @@ define([
             });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         it('Check if payment code and message container are restored after onActiveChange call.', function () {
             var expectedMessageContainer = braintreeCcForm.messageContainer,
                 expectedCode = braintreeCcForm.code;
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
index a9987f5e01ba8..596017be9a33c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
@@ -64,6 +64,13 @@ define([
             });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         it('The PayPal::initAuthFlow throws an exception.', function () {
 
             spyOn(additionalValidator, 'validate').and.returnValue(true);
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/final-price.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/final-price.test.js
index 1e3e066998d09..13b68aa4d9ea7 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/final-price.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/final-price.test.js
@@ -28,6 +28,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/product/list/columns/final-price', function () {
         describe('"getPrice" method', function () {
             it('Check returned value', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/image.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/image.test.js
index 90ca32fcf8c23..776677ea04f11 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/image.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/base/js/product/list/columns/image.test.js
@@ -37,6 +37,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/product/list/columns/image', function () {
         var image = {
             url: 'url',
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js
index 6ef6bb5c52769..b0516af46bc6b 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js
@@ -48,6 +48,13 @@ define([
         );
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/product/breadcrumbs', function () {
         it('mixin is applied to Magento_Theme/js/view/breadcrumbs', function () {
             var breadcrumbMixins = defaultContext.config.config.mixins['Magento_Theme/js/view/breadcrumbs'];
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js
index 2ecfe41f29c13..fdd0b70997f35 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/data-storage.test.js
@@ -44,6 +44,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/product/storage/data-storage', function () {
         describe('"initCustomerDataInvalidateListener" method', function () {
             it('check returned value', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage-compare.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage-compare.test.js
index da162a2e9cf4f..aa68c498e0fea 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage-compare.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage-compare.test.js
@@ -28,6 +28,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/product/storage/ids-storage-compare', function () {
         describe('"providerDataHandler" method', function () {
             it('check calls "prepareData" and "add" method', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js
index e4d3bd62a862d..c394a2463f5e2 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/ids-storage.test.js
@@ -22,6 +22,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/product/storage/ids-storage', function () {
         describe('"getDataFromLocalStorage" method', function () {
             it('check calls localStorage get method', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js
index 5530666c7ed70..4ef1aa2a98976 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js
@@ -29,6 +29,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/product/storage/storage-service', function () {
         var config = {
                 namespace: 'namespace',
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/storage-manager.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/storage-manager.test.js
index 4514684edf116..571113f481bf3 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/storage-manager.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/storage-manager.test.js
@@ -36,6 +36,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Catalog/js/storage-manager', function () {
         describe('"initStorages" method', function () {
             beforeEach(function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js
index 8961d99170dcd..4b053b4322dea 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js
@@ -27,6 +27,13 @@ define([
             });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         it('Checks if loader is called before redirect to success page.', function () {
             spyOn(window.location, 'replace').and.returnValue(false);
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/cache.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/cache.test.js
index c796bd4f9f2ec..7f905a91048fa 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/cache.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/cache.test.js
@@ -30,6 +30,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/model/cart/cache', function () {
         describe('Check the "get" method', function () {
             it('Check default call with "cart-data" key', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js
index 216ad28cf496a..3d8325a3ecd54 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js
@@ -65,6 +65,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/model/cart/estimate-service', function () {
 
         it('test subscribe when billingAddress was changed for  virtual quote', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js
index 44f06279dcbef..47518bef19e56 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js
@@ -89,6 +89,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/model/cart/totals-processor/default', function () {
 
         it('estimateTotals if data was cached', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/cart/shipping-estimation.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/cart/shipping-estimation.test.js
index 5e6dbfa5c0372..c1853d228c104 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/cart/shipping-estimation.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/cart/shipping-estimation.test.js
@@ -53,6 +53,13 @@ define(['squire', 'ko'], function (Squire, ko) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/view/cart/shipping-estimation', function () {
         describe('"initElement" method', function () {
             it('Check for return value and element that initiated.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/minicart.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/minicart.test.js
index 570de61052309..4f3949bd8124e 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/minicart.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/minicart.test.js
@@ -41,6 +41,13 @@ define(['squire'], function (Squire) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/view/minicart', function () {
         describe('"getCartItems" method', function () {
             it('Check for return value.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
index 5f14bc28f7995..ff420c4830476 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
@@ -77,6 +77,13 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/view/shipping', function () {
         describe('"navigate" method', function () {
             it('Check for return value.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/summary/cart-items.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/summary/cart-items.test.js
index d1698b2fedac3..d64f07ab619ba 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/summary/cart-items.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/summary/cart-items.test.js
@@ -68,6 +68,13 @@ define(['squire'], function (Squire) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Checkout/js/view/summary/cart-items', function () {
         describe('"getItemsQty" method', function () {
             it('Check for return value.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/agreement-validator.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/agreement-validator.test.js
index afff4660cab41..ef33d49bf11d6 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/agreement-validator.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/agreement-validator.test.js
@@ -36,6 +36,11 @@ define(['squire', 'jquery'], function (Squire, $) {
 
     afterEach(function () {
         $('.payment-method._active').remove();
+
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
     });
 
     describe('Magento_CheckoutAgreements/js/model/agreement-validator', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js
index 545daf0a330c9..1e3cf3e0280b6 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js
@@ -34,6 +34,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_CheckoutAgreements/js/model/place-order-mixin', function () {
         it('mixin is applied to Magento_Checkout/js/action/place-order', function () {
             var placeOrderMixins = defaultContext.config.config.mixins['Magento_Checkout/js/action/place-order'];
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js
index ed525bfd96a6c..8ea07b78b02c9 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js
@@ -34,6 +34,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_CheckoutAgreements/js/model/set-payment-information-mixin', function () {
         it('mixin is applied to Magento_Checkout/js/action/set-payment-information', function () {
             var placeOrderMixins = defaultContext
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/invalidation-processor.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/invalidation-processor.test.js
index 9067eb5d7fc71..4646eca268ec1 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/invalidation-processor.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/invalidation-processor.test.js
@@ -29,6 +29,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Customer/js/invalidation-processor', function () {
 
         describe('"process" method', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js
index 3004d0266f5af..8a8216a820dd4 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js
@@ -44,6 +44,13 @@ define(['squire'], function (Squire) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Customer/js/view/authentication-popup', function () {
         describe('"isActive" method', function () {
             it('Check for return value.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js
index 979e0dd351ee6..b61742b55fa2f 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js
@@ -41,6 +41,11 @@ define([
 
         afterEach(function () {
             $('#product_addtocart_form').remove();
+
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
         });
 
         it('Check initialized data.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/in-context/express-checkout.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/in-context/express-checkout.test.js
index 7a425e479b93b..0420256e20ef5 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/in-context/express-checkout.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/in-context/express-checkout.test.js
@@ -51,6 +51,13 @@ define([
                 });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         describe('clientConfig.click method', function () {
 
             it('Check for properties defined ', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
index 8b942818168cb..395dd96822ea5 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
@@ -58,6 +58,13 @@ define([
                 });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         describe('"click" method checks', function () {
             it('check success request', function () {
                 mocks['Magento_Paypal/js/action/set-payment-method'].and.callFake(function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
index 47e3507ea1321..f05338ad1e7d2 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
@@ -72,6 +72,13 @@ define([
                 });
         });
 
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         it('showAcceptanceWindow is invoked when the anchor element of help link is clicked', function (done) {
             spyOn(paypalExpressAbstract, 'showAcceptanceWindow');
             setTimeout(function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.test.js
index 4c78bd840d63e..2174c4a913ad0 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.test.js
@@ -35,6 +35,13 @@ define(['squire', 'ko'], function (Squire, ko) {
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Tax/js/view/checkout/summary/grand-total', function () {
         describe('"getGrandTotalExclTax" method', function () {
             it('Check if totals object empty.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js
index 4f74905d1b3a3..9c7bbc161ac4a 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js
@@ -37,6 +37,11 @@ define([
 
         afterEach(function () {
             delete window.BASE_URL;
+
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
         });
 
         it('mixin is applied to Magento_Theme/js/view/breadcrumbs', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js
index 165cc1aff3ac5..d443784efe050 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js
@@ -45,6 +45,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Ui/js/form/element/multiselect', function () {
         describe('"setPrepareToSendData" method', function () {
             it('Check method call with empty array as parameter.', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js
index 12354713400df..c82ca680336b4 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/timeline/timeline.test.js
@@ -35,6 +35,13 @@ define([
         });
     });
 
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
     describe('Magento_Ui/js/timeline/timeline', function () {
 
         describe('isActive method', function () {
diff --git a/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js b/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js
index 834a6df75843f..396b62df0dfe9 100644
--- a/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js
+++ b/dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js
@@ -19,6 +19,14 @@ define([
                 done();
             });
         });
+
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
         describe('"sendPostponeRequest" method', function () {
             it('should insert "Error" notification if request failed', function (done) {
                 jQuery('<div class="page-main-actions"></div>').appendTo('body');
diff --git a/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js b/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js
index ff510046e5528..39fb5330a038a 100644
--- a/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js
+++ b/dev/tests/js/jasmine/tests/lib/mage/wysiwygAdapter.test.js
@@ -22,41 +22,120 @@ define([
         Constr.prototype = wysiwygAdapter;
 
         obj = new Constr();
-        obj.initialize('id', {
-            'directives_url': 'http://example.com/admin/cms/wysiwyg/directive/'
-        });
     });
 
-    describe('wysiwygAdapter', function () {
-        var decodedHtml = '<p>' +
-            '<img src="{{media url=&quot;wysiwyg/banana.jpg&quot;}}" alt="" width="612" height="459"></p>',
-            encodedHtml = '<p>' +
-            '<img src="http://example.com/admin/cms/wysiwyg/directive/' +
-            '___directive/e3ttZWRpYSB1cmw9Ind5c2l3eWcvYmFuYW5hLmpwZyJ9fQ%2C%2C" alt="" width="612" height="459">' +
-            '</p>',
-            encodedHtmlWithForwardSlashInImgSrc = encodedHtml.replace('%2C%2C', '%2C%2C/');
-
-        describe('"encodeDirectives" method', function () {
-            it('converts media directive img src to directive URL', function () {
-                expect(obj.encodeDirectives(decodedHtml)).toEqual(encodedHtml);
+    describe('wysiwygAdapter - encoding and decoding directives', function () {
+
+        /**
+         * Tests encoding and decoding directives
+         *
+         * @param {String} decodedHtml
+         * @param {String} encodedHtml
+         */
+        function runTests(decodedHtml, encodedHtml) {
+            var encodedHtmlWithForwardSlashInImgSrc = encodedHtml.replace(/src="((?:(?!"|\\\?).)*)/, 'src="$1/');
+
+            describe('"encodeDirectives" method', function () {
+                it('converts media directive img src to directive URL', function () {
+                    expect(obj.encodeDirectives(decodedHtml)).toEqual(encodedHtml);
+                });
             });
+
+            describe('"decodeDirectives" method', function () {
+                it(
+                    'converts directive URL img src without a trailing forward slash ' +
+                    'to media url without a trailing forward slash',
+                    function () {
+                        expect(obj.decodeDirectives(encodedHtml)).toEqual(decodedHtml);
+                    }
+                );
+
+                it('converts directive URL img src with a trailing forward slash ' +
+                    'to media url without a trailing forward slash',
+                    function () {
+                        expect(encodedHtmlWithForwardSlashInImgSrc).not.toEqual(encodedHtml);
+                        expect(obj.decodeDirectives(encodedHtmlWithForwardSlashInImgSrc)).toEqual(decodedHtml);
+                    }
+                );
+            });
+        }
+
+        describe('without SID in directive query string without secret key', function () {
+            var decodedHtml = '<p>' +
+                '<img src="{{media url=&quot;wysiwyg/banana.jpg&quot;}}" alt="" width="612" height="459"></p>',
+                encodedHtml = '<p>' +
+                    '<img src="http://example.com/admin/cms/wysiwyg/directive/___directive' +
+                    '/e3ttZWRpYSB1cmw9Ind5c2l3eWcvYmFuYW5hLmpwZyJ9fQ%2C%2C" alt="" width="612" height="459">' +
+                    '</p>';
+
+            beforeEach(function () {
+                obj.initialize('id', {
+                    'directives_url': 'http://example.com/admin/cms/wysiwyg/directive/'
+                });
+            });
+
+            runTests(decodedHtml, encodedHtml);
         });
 
-        describe('"decodeDirectives" method', function () {
-            it(
-                'converts directive URL img src without a trailing forward slash ' +
-                'to media url without a trailing forward slash',
-                function () {
-                    expect(obj.decodeDirectives(encodedHtml)).toEqual(decodedHtml);
-                }
-            );
-
-            it('converts directive URL img src with a trailing forward slash ' +
-                'to media url without a trailing forward slash',
-                function () {
-                    expect(obj.decodeDirectives(encodedHtmlWithForwardSlashInImgSrc)).toEqual(decodedHtml);
-                }
-            );
+        describe('without SID in directive query string with secret key', function () {
+            var decodedHtml = '<p>' +
+                '<img src="{{media url=&quot;wysiwyg/banana.jpg&quot;}}" alt="" width="612" height="459"></p>',
+                encodedHtml = '<p>' +
+                    '<img src="http://example.com/admin/cms/wysiwyg/directive/___directive' +
+                    '/e3ttZWRpYSB1cmw9Ind5c2l3eWcvYmFuYW5hLmpwZyJ9fQ%2C%2C/key/' +
+                    '5552655d13a141099d27f5d5b0c58869423fd265687167da12cad2bb39aa9a58" ' +
+                    'alt="" width="612" height="459">' +
+                    '</p>',
+                directiveUrl = 'http://example.com/admin/cms/wysiwyg/directive/key/' +
+                    '5552655d13a141099d27f5d5b0c58869423fd265687167da12cad2bb39aa9a58/';
+
+            beforeEach(function () {
+                obj.initialize('id', {
+                    'directives_url': directiveUrl
+                });
+            });
+
+            runTests(decodedHtml, encodedHtml);
+        });
+
+        describe('with SID in directive query string without secret key', function () {
+            var decodedHtml = '<p>' +
+                '<img src="{{media url=&quot;wysiwyg/banana.jpg&quot;}}" alt="" width="612" height="459"></p>',
+                encodedHtml = '<p>' +
+                    '<img src="http://example.com/admin/cms/wysiwyg/directive/___directive' +
+                    '/e3ttZWRpYSB1cmw9Ind5c2l3eWcvYmFuYW5hLmpwZyJ9fQ%2C%2C?SID=something" ' +
+                    'alt="" width="612" height="459">' +
+                    '</p>',
+                directiveUrl = 'http://example.com/admin/cms/wysiwyg/directive?SID=something';
+
+            beforeEach(function () {
+                obj.initialize('id', {
+                    'directives_url': directiveUrl
+                });
+            });
+
+            runTests(decodedHtml, encodedHtml);
+        });
+
+        describe('with SID in directive query string with secret key', function () {
+            var decodedHtml = '<p>' +
+                '<img src="{{media url=&quot;wysiwyg/banana.jpg&quot;}}" alt="" width="612" height="459"></p>',
+                encodedHtml = '<p>' +
+                    '<img src="http://example.com/admin/cms/wysiwyg/directive/___directive' +
+                    '/e3ttZWRpYSB1cmw9Ind5c2l3eWcvYmFuYW5hLmpwZyJ9fQ%2C%2C/key/' +
+                    '5552655d13a141099d27f5d5b0c58869423fd265687167da12cad2bb39aa9a58?SID=something" ' +
+                    'alt="" width="612" height="459">' +
+                    '</p>',
+                directiveUrl = 'http://example.com/admin/cms/wysiwyg/directive/key/' +
+                    '5552655d13a141099d27f5d5b0c58869423fd265687167da12cad2bb39aa9a58?SID=something';
+
+            beforeEach(function () {
+                obj.initialize('id', {
+                    'directives_url': directiveUrl
+                });
+            });
+
+            runTests(decodedHtml, encodedHtml);
         });
     });
 });
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index ee91c34002f6c..8b811cc6b3fc0 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -6,7 +6,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreStart
+// @codingStandardsIgnoreFile
 
 return [
     ['__get', 'Magento\Framework\DataObject'],
@@ -2567,4 +2567,5 @@
             'configure',
             'Magento\Framework\MessageQueue\ConsumerInterface'
         ],
+    ['isOrderIncrementIdUsed', 'Magento\Quote\Model\ResourceModel\Quote', 'Magento\Sales\Model\OrderIncrementIdChecker::isIncrementIdUsed'],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt
index 4e4fbefd7871d..60f6f9b105ee2 100644
--- a/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt
@@ -1,2 +1,2 @@
-theme * /
-library * /
\ No newline at end of file
+# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
+* * /
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/SortingProcessorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/SortingProcessorTest.php
index 01b272a9e911a..d8d4e48047404 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/SortingProcessorTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/SortingProcessorTest.php
@@ -76,15 +76,25 @@ public function testProcess()
             ->method('getDirection')
             ->willReturn($orderThreeDirection);
 
+        /** @var SortOrder|\PHPUnit_Framework_MockObject_MockObject $sortOrderThreeMock */
+        $sortOrderFourMock = $this->getMockBuilder(SortOrder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $sortOrderFourMock->expects($this->once())
+            ->method('getField')
+            ->willReturn(null);
+        $sortOrderFourMock->expects($this->never())
+            ->method('getDirection');
+
         /** @var SearchCriteriaInterface|\PHPUnit_Framework_MockObject_MockObject $searchCriteriaMock */
         $searchCriteriaMock = $this->getMockBuilder(SearchCriteriaInterface::class)
             ->getMock();
 
         $searchCriteriaMock->expects($this->exactly(2))
             ->method('getSortOrders')
-            ->willReturn([$sortOrderOneMock, $sortOrderTwoMock, $sortOrderThreeMock]);
+            ->willReturn([$sortOrderOneMock, $sortOrderTwoMock, $sortOrderThreeMock, $sortOrderFourMock]);
 
-        /** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $searchCriteriarMock */
+        /** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
         $collectionMock = $this->getMockBuilder(AbstractDb::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -130,7 +140,7 @@ public function testProcessWithDefaults()
             ->method('getSortOrders')
             ->willReturn([]);
 
-        /** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $searchCriteriarMock */
+        /** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
         $collectionMock = $this->getMockBuilder(AbstractDb::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php
new file mode 100644
index 0000000000000..1154749a75b94
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Feed.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+use Zend\Feed\Writer\FeedFactory;
+
+/**
+ * Default XML feed class
+ */
+class Feed implements FeedInterface
+{
+    /**
+     * @var array
+     */
+    private $feeds;
+
+    /**
+     * Feed constructor.
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        $this->feeds = $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormattedContent() : string
+    {
+        return FeedFactory::factory($this->feeds)->export(FeedFactoryInterface::FORMAT_RSS);
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php
new file mode 100644
index 0000000000000..c80ece29f6143
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/FeedFactory.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+use Magento\Framework\ObjectManagerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Feed factory
+ */
+class FeedFactory implements FeedFactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var array
+     */
+    private $formats;
+
+    /**
+     * @param ObjectManagerInterface $objectManger
+     * @param LoggerInterface $logger
+     * @param array $formats
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManger,
+        LoggerInterface $logger,
+        array $formats
+    ) {
+        $this->objectManager = $objectManger;
+        $this->logger = $logger;
+        $this->formats = $formats;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data, string $format = FeedFactoryInterface::FORMAT_RSS) : FeedInterface
+    {
+        if (!isset($this->formats[$format])) {
+            throw new \Magento\Framework\Exception\InputException(
+                new \Magento\Framework\Phrase('The format is not supported')
+            );
+        }
+
+        if (!is_subclass_of($this->formats[$format], \Magento\Framework\App\FeedInterface::class)) {
+            throw new \Magento\Framework\Exception\InputException(
+                new \Magento\Framework\Phrase('Wrong format handler type')
+            );
+        }
+
+        try {
+            return $this->objectManager->create(
+                $this->formats[$format],
+                ['data' => $data]
+            );
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+            throw new \Magento\Framework\Exception\RuntimeException(
+                new \Magento\Framework\Phrase('There has been an error with import'),
+                $e
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php
new file mode 100644
index 0000000000000..ac53a366bd127
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+/**
+ * Feed factory interface
+ */
+interface FeedFactoryInterface
+{
+    /**
+     * RSS feed input format
+     */
+    const FORMAT_RSS = 'rss';
+
+    /**
+     * Returns FeedInterface object from a custom array
+     *
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\RuntimeException
+     * @param array $data
+     * @param string $format
+     * @return FeedInterface
+     */
+    public function create(array $data, string $format = self::FORMAT_RSS) : FeedInterface;
+}
diff --git a/lib/internal/Magento/Framework/App/FeedInterface.php b/lib/internal/Magento/Framework/App/FeedInterface.php
new file mode 100644
index 0000000000000..7d6346e107cfd
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/FeedInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+/**
+ * Feed interface
+ */
+interface FeedInterface
+{
+    /**
+     * Returns the formatted feed content
+     *
+     * @return string
+     */
+    public function getFormattedContent() : string;
+}
diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
index 0fb3825d240a1..31243f6ad98f9 100644
--- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
@@ -37,8 +37,10 @@ public function __construct(NamespaceResolver $namespaceResolver = null)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited = false)
-    {
+    public function getConstructorArgumentTypes(
+        \ReflectionClass $class,
+        $inherited = false
+    ) {
         $output = [null];
         if (!$class->getFileName() || false == $class->hasMethod(
             '__construct'
@@ -46,49 +48,37 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited
         ) {
             return $output;
         }
-        $reflectionConstructor = $class->getConstructor();
-        $fileContent = file($class->getFileName());
-        $availableNamespaces = $this->namespaceResolver->getImportedNamespaces($fileContent);
-        $availableNamespaces[0] = $class->getNamespaceName();
-        $constructorStartLine = $reflectionConstructor->getStartLine() - 1;
-        $constructorEndLine = $reflectionConstructor->getEndLine();
-        $fileContent = array_slice($fileContent, $constructorStartLine, $constructorEndLine - $constructorStartLine);
-        $source = '<?php ' . trim(implode('', $fileContent));
-
-        // Remove parameter default value.
-        $source = preg_replace("/ = (.*)/", ',)', $source);
 
-        $methodTokenized = token_get_all($source);
-        $argumentsStart = array_search('(', $methodTokenized) + 1;
-        $argumentsEnd = array_search(')', $methodTokenized);
-        $arguments = array_slice($methodTokenized, $argumentsStart, $argumentsEnd - $argumentsStart);
-        foreach ($arguments as &$argument) {
-            is_array($argument) ?: $argument = [1 => $argument];
-        }
-        unset($argument);
-        $arguments = array_filter($arguments, function ($token) {
-            $blacklist = [T_VARIABLE, T_WHITESPACE];
-            if (isset($token[0]) && in_array($token[0], $blacklist)) {
-                return false;
+        //Reading parameters' types.
+        $params = $class->getConstructor()->getParameters();
+        /** @var string[] $types */
+        $types = [];
+        foreach ($params as $param) {
+            //For the sake of backward compatibility.
+            $typeName = '';
+            if ($param->isArray()) {
+                //For the sake of backward compatibility.
+                $typeName = 'array';
+            } else {
+                try {
+                    $paramClass = $param->getClass();
+                    if ($paramClass) {
+                        $typeName = '\\' .$paramClass->getName();
+                    }
+                } catch (\ReflectionException $exception) {
+                    //If there's a problem loading a class then ignore it and
+                    //just return it's name.
+                    $typeName = '\\' .$param->getType()->getName();
+                }
             }
-            return true;
-        });
-        $arguments = array_map(function ($element) {
-            return $element[1];
-        }, $arguments);
-        $arguments = array_values($arguments);
-        $arguments = implode('', $arguments);
-        if (empty($arguments)) {
-            return $output;
+            $types[] = $typeName;
         }
-        $arguments = explode(',', $arguments);
-        foreach ($arguments as $key => &$argument) {
-            $argument = $this->removeToken($argument, '=');
-            $argument = $this->removeToken($argument, '&');
-            $argument = $this->namespaceResolver->resolveNamespace($argument, $availableNamespaces);
+        if (!$types) {
+            //For the sake of backward compatibility.
+            $types = [null];
         }
-        unset($argument);
-        return $arguments;
+
+        return $types;
     }
 
     /**
@@ -98,7 +88,7 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited
      * @param array $availableNamespaces
      * @return string
      * @deprecated 100.2.0
-     * @see \Magento\Framework\Code\Reader\NamespaceResolver::resolveNamespace
+     * @see getConstructorArgumentTypes
      */
     protected function resolveNamespaces($argument, $availableNamespaces)
     {
@@ -111,6 +101,8 @@ protected function resolveNamespaces($argument, $availableNamespaces)
      * @param string $argument
      * @param string $token
      * @return string
+     *
+     * @deprecated Not used anymore.
      */
     protected function removeToken($argument, $token)
     {
@@ -127,7 +119,7 @@ protected function removeToken($argument, $token)
      * @param array $file
      * @return array
      * @deprecated 100.2.0
-     * @see \Magento\Framework\Code\Reader\NamespaceResolver::getImportedNamespaces
+     * @see getConstructorArgumentTypes
      */
     protected function getImportedNamespaces(array $file)
     {
diff --git a/lib/internal/Magento/Framework/Config/Converter.php b/lib/internal/Magento/Framework/Config/Converter.php
index 0401471f27ea5..3e66f641b8697 100644
--- a/lib/internal/Magento/Framework/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Config/Converter.php
@@ -103,7 +103,9 @@ protected function parseVarElement(\DOMElement $node)
             }
         }
         if (!count($result)) {
-            $result = $node->nodeValue;
+            $result = (strtolower($node->nodeValue) !== 'true' && strtolower($node->nodeValue) !== 'false')
+                ? $node->nodeValue
+                : filter_var($node->nodeValue, FILTER_VALIDATE_BOOLEAN);
         }
         return $result;
     }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index 8db84c27980ad..a8451e43ade20 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -353,8 +353,13 @@ public function getElementHtml()
             $html .= '<label class="addbefore" for="' . $htmlId . '">' . $beforeElementHtml . '</label>';
         }
 
-        $html .= '<input id="' . $htmlId . '" name="' . $this->getName() . '" ' . $this->_getUiId() . ' value="' .
-            $this->getEscapedValue() . '" ' . $this->serialize($this->getHtmlAttributes()) . '/>';
+        if (is_array($this->getValue())) {
+            foreach ($this->getValue() as $value) {
+                $html .= $this->getHtmlForInputByValue($this->_escape($value));
+            }
+        } else {
+            $html .= $this->getHtmlForInputByValue($this->getEscapedValue());
+        }
 
         $afterElementJs = $this->getAfterElementJs();
         if ($afterElementJs) {
@@ -574,4 +579,17 @@ public function isLocked()
     {
         return $this->getData($this->lockHtmlAttribute) == 1;
     }
+
+    /**
+     * Get input html by sting value.
+     *
+     * @param string|null $value
+     *
+     * @return string
+     */
+    private function getHtmlForInputByValue($value)
+    {
+        return '<input id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" ' . $this->_getUiId()
+            . ' value="' . $value . '" ' . $this->serialize($this->getHtmlAttributes()) . '/>';
+    }
 }
diff --git a/lib/internal/Magento/Framework/Encryption/Crypt.php b/lib/internal/Magento/Framework/Encryption/Crypt.php
index c304cdb23f85e..5f368f0d5b790 100644
--- a/lib/internal/Magento/Framework/Encryption/Crypt.php
+++ b/lib/internal/Magento/Framework/Encryption/Crypt.php
@@ -75,7 +75,7 @@ public function __construct(
                 $abc = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
                 $initVector = '';
                 for ($i = 0; $i < $initVectorSize; $i++) {
-                    $initVector .= $abc[rand(0, strlen($abc) - 1)];
+                    $initVector .= $abc[random_int(0, strlen($abc) - 1)];
                 }
             } elseif (false === $initVector) {
                 /* Set vector to zero bytes to not use it */
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/Alias.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/Alias.php
deleted file mode 100644
index 9b7e2f3dde9b7..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/Alias.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\Framework\MultiDimensionalIndexer;
-
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Phrase;
-
-/**
- * Index Alias object
- *
- * @api
- */
-class Alias
-{
-    /**
-     * Replica index alias
-     */
-    const ALIAS_REPLICA = 'replica';
-
-    /**
-     * Main index alias
-     */
-    const ALIAS_MAIN = 'main';
-
-    /**
-     * One of self::ALIAS_*
-     *
-     * @var string
-     */
-    private $value;
-
-    /**
-     * @param string $value One of self::ALIAS_*
-     * @throws LocalizedException
-     */
-    public function __construct(string $value)
-    {
-        if ($value !== self::ALIAS_REPLICA && $value !== self::ALIAS_MAIN) {
-            throw new LocalizedException(new Phrase('Wrong value %value for alias', ['value' => $value]));
-        }
-        $this->value = $value;
-    }
-
-    /**
-     * @return string One of self::ALIAS_*
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/AliasFactory.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/AliasFactory.php
deleted file mode 100644
index aa65736bca817..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/AliasFactory.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Alias Factory
- *
- * @api
- */
-class AliasFactory
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     */
-    public function __construct(ObjectManagerInterface $objectManager)
-    {
-        $this->objectManager = $objectManager;
-    }
-
-    /**
-     * @param array $arguments
-     * @return Alias
-     */
-    public function create(array $arguments = []): Alias
-    {
-        return $this->objectManager->create(Alias::class, $arguments);
-    }
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/Dimension.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/Dimension.php
deleted file mode 100644
index 7cfafcf8c704b..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/Dimension.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-use Magento\Framework\Search\AbstractKeyValuePair;
-
-/**
- * Index Dimension object
- *
- * @api
- */
-class Dimension extends AbstractKeyValuePair
-{
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/DimensionFactory.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/DimensionFactory.php
deleted file mode 100644
index 4085341108ab9..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/DimensionFactory.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Dimension Factory
- *
- * @api
- */
-class DimensionFactory
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     */
-    public function __construct(ObjectManagerInterface $objectManager)
-    {
-        $this->objectManager = $objectManager;
-    }
-
-    /**
-     * @param array $arguments
-     * @return Dimension
-     */
-    public function create(array $arguments = []): Dimension
-    {
-        return $this->objectManager->create(Dimension::class, $arguments);
-    }
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexHandlerInterface.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexHandlerInterface.php
deleted file mode 100644
index 8a0eb364d2003..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexHandlerInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-/**
- * Represents manipulation with index data
- *
- * @api
- */
-interface IndexHandlerInterface
-{
-    /**
-     * Add data to index
-     *
-     * @param IndexName $indexName
-     * @param \Traversable $documents
-     * @param string $connectionName
-     * @return void
-     */
-    public function saveIndex(IndexName $indexName, \Traversable $documents, string $connectionName);
-
-    /**
-     * Remove given documents from Index
-     *
-     * @param IndexName $indexName
-     * @param \Traversable $documents
-     * @param string $connectionName
-     * @return void
-     */
-    public function cleanIndex(IndexName $indexName, \Traversable $documents, string $connectionName);
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexName.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexName.php
deleted file mode 100644
index 2af1f09b81e40..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexName.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Phrase;
-
-/**
- * Index Name object
- *
- * @api
- */
-class IndexName
-{
-    /**
-     * @var string
-     */
-    private $indexId;
-
-    /**
-     * @var Dimension[]
-     */
-    private $dimensions;
-
-    /**
-     * @var Alias
-     */
-    private $alias;
-
-    /**
-     * @param string $indexId
-     * @param Dimension[] $dimensions
-     * @param Alias $alias
-     *
-     * @throws LocalizedException
-     */
-    public function __construct(string $indexId, array $dimensions, Alias $alias)
-    {
-        foreach ($dimensions as $dimension) {
-            if (!$dimension instanceof Dimension) {
-                throw new LocalizedException(
-                    new Phrase('Dimension have to be instance of Dimension class.')
-                );
-            }
-        }
-
-        $this->indexId = $indexId;
-        $this->dimensions = $dimensions;
-        $this->alias = $alias;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIndexId(): string
-    {
-        return $this->indexId;
-    }
-
-    /**
-     * @return Dimension[]
-     */
-    public function getDimensions(): array
-    {
-        return $this->dimensions;
-    }
-
-    /**
-     * @return Alias
-     */
-    public function getAlias(): Alias
-    {
-        return $this->alias;
-    }
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameBuilder.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameBuilder.php
deleted file mode 100644
index 901b3d51d3737..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameBuilder.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Index Name builder. It is Facade for simplifying IndexName object creation
- *
- * @api
- */
-class IndexNameBuilder
-{
-    /**
-     * Index id parameter name. Used internally in this object
-     */
-    private static $indexId = 'indexId';
-
-    /**
-     * Dimensions parameter name. Used internally in this object
-     */
-    private static $dimensions = 'dimensions';
-
-    /**
-     * Alias parameter name. Used internally in this object
-     */
-    private static $alias = 'alias';
-
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @var DimensionFactory
-     */
-    private $dimensionFactory;
-
-    /**
-     * @var AliasFactory
-     */
-    private $aliasFactory;
-
-    /**
-     * @var array
-     */
-    private $data = [];
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     * @param DimensionFactory $dimensionFactory
-     * @param AliasFactory $aliasFactory
-     */
-    public function __construct(
-        ObjectManagerInterface $objectManager,
-        DimensionFactory $dimensionFactory,
-        AliasFactory $aliasFactory
-    ) {
-        $this->objectManager = $objectManager;
-        $this->dimensionFactory = $dimensionFactory;
-        $this->aliasFactory = $aliasFactory;
-    }
-
-    /**
-     * @param string $indexId
-     * @return self
-     */
-    public function setIndexId(string $indexId): self
-    {
-        $this->data[self::$indexId] = $indexId;
-        return $this;
-    }
-
-    /**
-     * @param string $name
-     * @param string $value
-     * @return self
-     */
-    public function addDimension(string $name, string $value): self
-    {
-        $this->data[self::$dimensions][] = $this->dimensionFactory->create([
-            'name' => $name,
-            'value' => $value,
-        ]);
-        return $this;
-    }
-
-    /**
-     * @param string $alias
-     * @return self
-     */
-    public function setAlias(string $alias): self
-    {
-        $this->data[self::$alias] = $this->aliasFactory->create(['value' => $alias]);
-        return $this;
-    }
-
-    /**
-     * @return IndexName
-     */
-    public function build(): IndexName
-    {
-        $indexName = $this->objectManager->create(IndexName::class, $this->data);
-        $this->data = [];
-        return $indexName;
-    }
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolver.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolver.php
deleted file mode 100644
index c96c78b976517..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolver.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-use Magento\Framework\Search\Request\IndexScopeResolverInterface;
-
-/**
- * @inheritdoc
- */
-class IndexNameResolver implements IndexNameResolverInterface
-{
-    /**
-     * Suffix for replica index table
-     *
-     * @var string
-     */
-    private $additionalTableSuffix = '_replica';
-
-    /**
-     * @var IndexScopeResolverInterface
-     */
-    private $indexScopeResolver;
-
-    /**
-     * @param IndexScopeResolverInterface $indexScopeResolver
-     */
-    public function __construct(
-        IndexScopeResolverInterface $indexScopeResolver
-    ) {
-        $this->indexScopeResolver = $indexScopeResolver;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function resolveName(IndexName $indexName): string
-    {
-        $tableName = $this->indexScopeResolver->resolve($indexName->getIndexId(), $indexName->getDimensions());
-
-        if ($indexName->getAlias()->getValue() === Alias::ALIAS_REPLICA) {
-            $tableName = $this->getAdditionalTableName($tableName);
-        }
-        return $tableName;
-    }
-
-    /**
-     * @param string $tableName
-     * @return string
-     */
-    public function getAdditionalTableName(string $tableName): string
-    {
-        return $tableName . $this->additionalTableSuffix;
-    }
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolverInterface.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolverInterface.php
deleted file mode 100644
index 9068acd3373f6..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolverInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-/**
- * Resolve index name by IndexName object
- *
- * @api
- */
-interface IndexNameResolverInterface
-{
-    /**
-     * @param IndexName $indexName
-     * @return string
-     */
-    public function resolveName(IndexName $indexName): string;
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexStructureInterface.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexStructureInterface.php
deleted file mode 100644
index f76e6c86c7719..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexStructureInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-/**
- * Represent manipulation with index structure
- *
- * @api
- */
-interface IndexStructureInterface
-{
-    /**
-     * Create the Index Structure
-     *
-     * @param IndexName $indexName
-     * @param string $connectionName
-     * @throws \Magento\Framework\Exception\StateException
-     * @return void
-     */
-    public function create(IndexName $indexName, string $connectionName);
-
-    /**
-     * Delete the given Index
-     *
-     * @param IndexName $indexName
-     * @param string $connectionName
-     * @return void
-     */
-    public function delete(IndexName $indexName, string $connectionName);
-
-    /**
-     * Checks whether the Index exits
-     *
-     * @param IndexName $indexName
-     * @param string $connectionName
-     * @return bool
-     */
-    public function isExist(IndexName $indexName, string $connectionName): bool;
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcher.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcher.php
deleted file mode 100644
index ed67adce69099..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcher.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-
-/**
- * @inheritdoc
- */
-class IndexTableSwitcher implements IndexTableSwitcherInterface
-{
-    /**
-     * Suffix for replica index table
-     *
-     * @var string
-     */
-    private $replicaTableSuffix = '_replica';
-
-    /**
-     * Suffix for outdated index table
-     *
-     * @var string
-     */
-    private $outdatedTableSuffix = '_outdated';
-
-    /**
-     * @var ResourceConnection
-     */
-    private $resourceConnection;
-
-    /**
-     * @var IndexNameResolverInterface
-     */
-    private $indexNameResolver;
-
-    /**
-     * @param ResourceConnection $resourceConnection
-     * @param IndexNameResolverInterface $indexNameResolver
-     */
-    public function __construct(
-        ResourceConnection $resourceConnection,
-        IndexNameResolverInterface $indexNameResolver
-    ) {
-        $this->resourceConnection = $resourceConnection;
-        $this->indexNameResolver = $indexNameResolver;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function switch(IndexName $indexName, string $connectionName)
-    {
-        $connection = $this->resourceConnection->getConnection($connectionName);
-        $tableName = $this->indexNameResolver->resolveName($indexName);
-
-        $this->switchTable($connection, [$tableName]);
-    }
-
-    /**
-     * Switch index tables from replica to active
-     *
-     * @param AdapterInterface $connection
-     * @param array $tableNames
-     * @return void
-     */
-    private function switchTable(AdapterInterface $connection, array $tableNames)
-    {
-        $toRename = [];
-        foreach ($tableNames as $tableName) {
-            $outdatedTableName = $tableName . $this->outdatedTableSuffix;
-            $replicaTableName = $tableName . $this->replicaTableSuffix;
-
-            $renameBatch = [
-                [
-                    'oldName' => $tableName,
-                    'newName' => $outdatedTableName,
-                ],
-                [
-                    'oldName' => $replicaTableName,
-                    'newName' => $tableName,
-                ],
-                [
-                    'oldName' => $outdatedTableName,
-                    'newName' => $replicaTableName,
-                ]
-            ];
-            $toRename = array_merge($toRename, $renameBatch);
-        }
-
-        if (!empty($toRename)) {
-            $connection->renameTablesBatch($toRename);
-        }
-    }
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcherInterface.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcherInterface.php
deleted file mode 100644
index 6f067dbf6a44b..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcherInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\MultiDimensionalIndexer;
-
-/**
- * Logic for switching active and replica index tables by IndexName object
- *
- * @api
- */
-interface IndexTableSwitcherInterface
-{
-    /**
-     * @param IndexName $indexName
-     * @param string $connectionName
-     * @return void
-     */
-    public function switch(IndexName $indexName, string $connectionName);
-}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/README.md b/lib/internal/Magento/Framework/MultiDimensionalIndexer/README.md
deleted file mode 100644
index fcaaba0ce6d1d..0000000000000
--- a/lib/internal/Magento/Framework/MultiDimensionalIndexer/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-MultiDimensionalIndexer
-=======
-The **\Magento\Framework\MultiDimensionalIndexer** library provides functionality of multi-dimension index creation and
-handling.
-
-Library introduces a set of extension points which split monolithic index by specified Dimension (Scope), creating 
-independent index (i.e. dedicated MySQL table) per each Dimension. Along with that library provides index name 
-resolving mechanism based on provided scope. The Multi-Dimension indexes introduced for the sake of data scalability
-and ability to reindex data in the scope of particular Dimension only.
-
-Aliasing mechanism guarantees zero downtime to make Front-End responsive while Full Reindex being processed.
diff --git a/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php b/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
index ae123e15da23c..224f2024ba959 100644
--- a/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
+++ b/lib/internal/Magento/Framework/Setup/BackendFrontnameGenerator.php
@@ -29,6 +29,6 @@ class BackendFrontnameGenerator
     public static function generate()
     {
         return self::ADMIN_AREA_PATH_PREFIX
-            . substr(base_convert(rand(0, PHP_INT_MAX), 10, 36), 0, self::ADMIN_AREA_PATH_RANDOM_PART_LENGTH);
+            . substr(base_convert(random_int(0, PHP_INT_MAX), 10, 36), 0, self::ADMIN_AREA_PATH_RANDOM_PART_LENGTH);
     }
 }
diff --git a/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php b/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
new file mode 100644
index 0000000000000..023070d4d69d6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
@@ -0,0 +1,55 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Test\Unit\Data\Form\Element;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Test for \Magento\Framework\Data\Form\Element\Hidden.
+ */
+class HiddenTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Data\Form\Element\Hidden
+     */
+    private $element;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->element = $objectManager->getObject(\Magento\Framework\Data\Form\Element\Hidden::class);
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @dataProvider getElementHtmlDataProvider
+     */
+    public function testGetElementHtml($value)
+    {
+        $form = $this->createMock(\Magento\Framework\Data\Form::class);
+        $this->element->setForm($form);
+        $this->element->setValue($value);
+        $html = $this->element->getElementHtml();
+
+        if (is_array($value)) {
+            foreach ($value as $item) {
+                $this->assertContains($item, $html);
+            }
+            return;
+        }
+        $this->assertContains($value, $html);
+    }
+
+    public function getElementHtmlDataProvider()
+    {
+        return [
+            ['some_value'],
+            ['store_ids[]' => ['1', '2']],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/MultiDimensionalIndexer/IndexTableSwitcherTest.php b/lib/internal/Magento/Framework/Test/Unit/MultiDimensionalIndexer/IndexTableSwitcherTest.php
deleted file mode 100644
index 3a4e59275d1bf..0000000000000
--- a/lib/internal/Magento/Framework/Test/Unit/MultiDimensionalIndexer/IndexTableSwitcherTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Test\Unit\MultiDimensionalIndexer;
-
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\MultiDimensionalIndexer\IndexName;
-use Magento\Framework\MultiDimensionalIndexer\IndexNameResolverInterface;
-use Magento\Framework\MultiDimensionalIndexer\IndexTableSwitcher;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test for @see IndexTableSwitcher.
- */
-class IndexTableSwitcherTest extends TestCase
-{
-    /**
-     * @var IndexTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $indexTableSwitcher;
-
-    /**
-     * @var IndexName|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $indexName;
-
-    /**
-     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $resourceConnection;
-
-    /**
-     * @var IndexNameResolverInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $indexNameResolver;
-
-    /**
-     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $adapter;
-
-    /**
-     * @inheritdoc
-     */
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $objectManager = new ObjectManager($this);
-        $this->indexName = $this->createMock(IndexName::class);
-        $this->resourceConnection = $this->createMock(ResourceConnection::class);
-        $this->indexNameResolver = $this->createMock(IndexNameResolverInterface::class);
-        $this->adapter = $this->createMock(AdapterInterface::class);
-
-        $this->indexTableSwitcher = $objectManager->getObject(
-            IndexTableSwitcher::class,
-            [
-                'resourceConnection' => $this->resourceConnection,
-                'indexNameResolver' => $this->indexNameResolver,
-            ]
-        );
-    }
-
-    public function testSwitch()
-    {
-        $connectionName = 'testConnection';
-        $tableName = 'some_table_name';
-        $toRename =
-            [
-                [
-                    'oldName' => $tableName,
-                    'newName' => $tableName . '_outdated',
-                ],
-                [
-                    'oldName' => $tableName . '_replica',
-                    'newName' => $tableName,
-                ],
-                [
-                    'oldName' => $tableName . '_outdated',
-                    'newName' => $tableName . '_replica',
-                ],
-            ];
-
-        $this->resourceConnection->expects($this->once())->method('getConnection')
-            ->with($connectionName)->willReturn($this->adapter);
-        $this->indexNameResolver->expects($this->once())->method('resolveName')
-            ->with($this->indexName)->willReturn($tableName);
-        $this->adapter->expects($this->once())->method('renameTablesBatch')
-            ->with($toRename);
-
-        $this->indexTableSwitcher->switch($this->indexName, $connectionName);
-    }
-}
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
index e7cbc5000d337..f683e248aec91 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
@@ -62,6 +62,16 @@ function ($column) use ($alias) {
         return $columns;
     }
 
+    /**
+     * Escape against value
+     * @param string $value
+     * @return string
+     */
+    private function escapeAgainstValue(string $value): string
+    {
+        return preg_replace('/([+\-><\(\)~*\"@]+)/', ' ', $value);
+    }
+
     /**
      * Apply fulltext filters
      *
@@ -86,7 +96,7 @@ public function apply(Collection $collection, Filter $filter)
         $collection->getSelect()
             ->where(
                 'MATCH(' . implode(',', $columns) . ') AGAINST(?)',
-                $filter->getValue()
+                $this->escapeAgainstValue($filter->getValue())
             );
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd b/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd
index f830f41b53255..e50b8a9cf2808 100644
--- a/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd
@@ -62,4 +62,10 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd b/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd
index 397b71fe70825..09ad246b3a64d 100644
--- a/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd
@@ -32,4 +32,10 @@
             <xs:field xpath="@name"/>
         </xs:unique>
     </xs:element>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>
diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
index 0655bfda0bbc0..b124c417148d4 100644
--- a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
@@ -317,7 +317,7 @@ public function apiShutdownFunction()
     protected function _saveFatalErrorReport($reportData)
     {
         $this->directoryWrite->create('report/api');
-        $reportId = abs(intval(microtime(true) * rand(100, 1000)));
+        $reportId = abs(intval(microtime(true) * random_int(100, 1000)));
         $this->directoryWrite->writeFile('report/api/' . $reportId, $this->serializer->serialize($reportData));
         return $reportId;
     }
diff --git a/lib/web/css/docs/source/_buttons.less b/lib/web/css/docs/source/_buttons.less
index a81599c517ff8..a071eed85ef9e 100644
--- a/lib/web/css/docs/source/_buttons.less
+++ b/lib/web/css/docs/source/_buttons.less
@@ -397,7 +397,7 @@ button {
 
 //  # Button with an icon on the left or right side of the text
 //
-//  <code>@_button-icon-font-position</code> variable is used to set up the icon postiton
+//  <code>@_button-icon-font-position</code> variable is used to set up the icon position
 //
 //  Use <code>before</code> to set up button icon position on the left:
 //  ```css
@@ -818,7 +818,7 @@ button {
 
 //  # Link as a button
 //
-//  The <code>.lib-link-as-button()</code> mixin is used to reset link styles (text-decoration and display inline). Then to make it look like a button, you need to add the <code>.lib-button()</code> mixin with appropriate paremeters.
+//  The <code>.lib-link-as-button()</code> mixin is used to reset link styles (text-decoration and display inline). Then to make it look like a button, you need to add the <code>.lib-button()</code> mixin with appropriate parameters.
 //
 //  ```html
 //  <a href="#" class="example-button-9"><span>Button</span></a>
diff --git a/lib/web/css/docs/source/_layout.less b/lib/web/css/docs/source/_layout.less
index 37598197142f6..799f940b44c02 100644
--- a/lib/web/css/docs/source/_layout.less
+++ b/lib/web/css/docs/source/_layout.less
@@ -91,7 +91,7 @@ footer.footer {
 //            <th>@gutter-width</th>
 //            <td class="vars_value">0</td>
 //            <td class="vars_value">'' | false | value</td>
-//            <td>Distanse between columns</td>
+//            <td>Distance between columns</td>
 //        </tr>
 //        <tr>
 //            <th colspan="4" class="vars_section">Variables for layout columns</th>
@@ -361,7 +361,7 @@ footer.footer {
 
 //  # Layout width
 //
-//  The <code>.lib-layout-width()</code> mixin is used to set default page width of the element the mixin is applyed to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
+//  The <code>.lib-layout-width()</code> mixin is used to set default page width of the element the mixin is applied to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
 
 //  # Layout width variables
 //
diff --git a/lib/web/css/docs/source/_typography.less b/lib/web/css/docs/source/_typography.less
index 294f6446fdf13..b360c672a6d7c 100644
--- a/lib/web/css/docs/source/_typography.less
+++ b/lib/web/css/docs/source/_typography.less
@@ -3,7 +3,7 @@
 //  * See COPYING.txt for license details.
 //  */
 
-//  # Typogrphy
+//  # Typography
 //
 //  Magento UI library provides mixins for typography styling. To configure typography, global variables from **_variables.less** file are used.
 //
@@ -978,7 +978,7 @@
 
 //  # Text hide
 //
-//  The <code>.lib-text-hide()</code> mixin hides a text of the element the mixin is applyed to.
+//  The <code>.lib-text-hide()</code> mixin hides a text of the element the mixin is applied to.
 //
 //  ```html
 //  <p class="example-text-hide">
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
index 443ca40862ca4..8f20243383db8 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
@@ -575,7 +575,9 @@ define([
          * @param {String} directive
          */
         makeDirectiveUrl: function (directive) {
-            return this.config['directives_url'].replace(/directive.*/, 'directive/___directive/' + directive);
+            return this.config['directives_url']
+                .replace(/directive/, 'directive/___directive/' + directive)
+                .replace(/\/$/, '');
         },
 
         /**
@@ -606,11 +608,17 @@ define([
          * @return {*}
          */
         decodeDirectives: function (content) {
-            // escape special chars in directives url to use it in regular expression
-            var url = this.makeDirectiveUrl('%directive%').replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'),
-                reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9,_-]+(?:%2[A-Z]|)+\/?)'));
-
-            return content.gsub(reg, function (match) { //eslint-disable-line no-extra-bind
+            var directiveUrl = this.makeDirectiveUrl('%directive%').split('?')[0], // remove query string from directive
+                // escape special chars in directives url to use in regular expression
+                regexEscapedDirectiveUrl = directiveUrl.replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'),
+                regexDirectiveUrl = regexEscapedDirectiveUrl
+                    .replace(
+                        '%directive%',
+                        '([a-zA-Z0-9,_-]+(?:%2[A-Z]|)+\/?)(?:(?!").)*'
+                    ) + '/?(\\\\?[^"]*)?', // allow optional query string
+                reg = new RegExp(regexDirectiveUrl);
+
+            return content.gsub(reg, function (match) {
                 return Base64.mageDecode(decodeURIComponent(match[1]).replace(/\/$/, '')).replace(/"/g, '&quot;');
             });
         },
diff --git a/lib/web/mage/requirejs/resolver.js b/lib/web/mage/requirejs/resolver.js
index f3d4b79216adb..5088206dd31d9 100644
--- a/lib/web/mage/requirejs/resolver.js
+++ b/lib/web/mage/requirejs/resolver.js
@@ -27,6 +27,16 @@ define([
         return !!_.findWhere(callbacks, callback);
     }
 
+    /**
+     * Checks if provided module is rejected during load.
+     *
+     * @param {Object} module - Module to be checked.
+     * @return {Boolean}
+     */
+    function isRejected(module) {
+        return registry[module.id] && registry[module.id].error;
+    }
+
     /**
      * Checks if provided module has unresolved dependencies.
      *
@@ -34,7 +44,11 @@ define([
      * @returns {Boolean}
      */
     function isPending(module) {
-        return !!module.depCount;
+        if (!module.depCount) {
+            return false;
+        }
+
+        return module.depCount > _.filter(module.depMaps, isRejected).length;
     }
 
     /**
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
index 896538853485e..7240707f642c2 100644
--- a/pub/errors/processor.php
+++ b/pub/errors/processor.php
@@ -463,7 +463,7 @@ protected function _setReportData($reportData)
     public function saveReport($reportData)
     {
         $this->reportData = $reportData;
-        $this->reportId   = abs(intval(microtime(true) * rand(100, 1000)));
+        $this->reportId   = abs(intval(microtime(true) * random_int(100, 1000)));
         $this->_reportFile = $this->_reportDir . '/' . $this->reportId;
         $this->_setReportData($reportData);
 
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 5dc1199c0e9da..2155f774b1e9a 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -38545,100 +38545,446 @@ adminUserList.add(vars.get("admin_user"));
       </hashTree>
     </hashTree>
   
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Search Bundle Product" enabled="true">
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-                <collectionProp name="Arguments.arguments">
-                    <elementProp name="searchCriteria[filter_groups][0][filters][0][field]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">sku</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">searchCriteria[filter_groups][0][filters][0][field]</stringProp>
-                    </elementProp>
-                    <elementProp name="searchCriteria[filter_groups][0][filters][0][value]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">bundle%</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">searchCriteria[filter_groups][0][filters][0][value]</stringProp>
-                    </elementProp>
-                    <elementProp name="searchCriteria[filter_groups][0][filters][0][condition_type]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">like</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">searchCriteria[filter_groups][0][filters][0][condition_type]</stringProp>
-                    </elementProp>
-                    <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
-                    </elementProp>
-                    <elementProp name="searchCriteria[page_size]" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">1</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                        <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                        <stringProp name="Argument.name">searchCriteria[page_size]</stringProp>
-                    </elementProp>
-                </collectionProp>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain"/>
-            <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
-            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-            <stringProp name="HTTPSampler.contentEncoding"/>
-            <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</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/api/get_bundle_product.jmx</stringProp></HTTPSamplerProxy>
+        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create bundle product" enabled="true">
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_bundle_product_with_extensible_data_objects.jmx</stringProp>
+        </OnceOnlyController>
         <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 bundle product id" enabled="true">
-                <stringProp name="VAR">bundle_product_id</stringProp>
-                <stringProp name="JSONPATH">$.items[0].id</stringProp>
-                <stringProp name="DEFAULT"/>
-                <stringProp name="VARIABLE"/>
-                <stringProp name="SUBJECT">BODY</stringProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-            <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 product sku" enabled="true">
-                <stringProp name="VAR">bundle_product_sku</stringProp>
-                <stringProp name="JSONPATH">$.items[0].sku</stringProp>
-                <stringProp name="DEFAULT"/>
-                <stringProp name="VARIABLE"/>
-                <stringProp name="SUBJECT">BODY</stringProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-            <hashTree/>
-            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
-                <collectionProp name="Asserion.test_strings">
-                    <stringProp name="89649215">^\d+$</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">bundle_product_id</stringProp>
-            </ResponseAssertion>
-            <hashTree/>
-            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
-                <collectionProp name="Asserion.test_strings">
-                    <stringProp name="1775152809">^[a-zA-Z_0-9- ]+$</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">bundle_product_sku</stringProp>
-            </ResponseAssertion>
-            <hashTree/>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create bundle product with extensible data objects" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "product": {&#xD;
+                                "sku": "bundle-apsku-test-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "name": "Bundle Extensible_Product_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "visibility": "4",&#xD;
+                                "type_id": "bundle",&#xD;
+                                "price": "99",&#xD;
+                                "status": "1",&#xD;
+                                "attribute_set_id": "4",&#xD;
+                                "custom_attributes": [&#xD;
+                                {&#xD;
+                                "attribute_code": "price_view",&#xD;
+                                "value": "0"&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "price_type",&#xD;
+                                "value": "0"&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "weight_type",&#xD;
+                                "value": "0"&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "cost",&#xD;
+                                "value": ""&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "description",&#xD;
+                                "value": "Description"&#xD;
+                                }&#xD;
+                                ],&#xD;
+                                "extension_attributes":{&#xD;
+                                "stock_item":{&#xD;
+                                "manage_stock": 1,    &#xD;
+                                "is_in_stock": 1,&#xD;
+                                "qty":"100"&#xD;
+                                }&#xD;
+                                }        ,&#xD;
+                                "media_gallery_entries":&#xD;
+                                [{&#xD;
+                                "id": null,&#xD;
+                                "label":"bundle_test_label_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "position":1,&#xD;
+                                "disabled":false,&#xD;
+                                "media_type":"image",&#xD;
+                                "types":["image"],&#xD;
+                                "content":{&#xD;
+                                "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                "type": "image/jpeg",&#xD;
+                                "name": "bundle_test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
+                                }&#xD;
+                                }&#xD;
+                                ]&#xD;
+                                }&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</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"/>
+            </HTTPSamplerProxy>
+            <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 bundle product id" enabled="true">
+                    <stringProp name="VAR">bundle_product_id</stringProp>
+                    <stringProp name="JSONPATH">$.id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <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 product sku" enabled="true">
+                    <stringProp name="VAR">bundle_product_sku</stringProp>
+                    <stringProp name="JSONPATH">$.sku</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</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">bundle_product_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="484395188">^[a-z0-9-]+$</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">bundle_product_sku</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create child product child simple 1" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "product": {&#xD;
+                                "sku": "apsku-test-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "name": "Extensible_Product_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "visibility": "1",&#xD;
+                                "type_id": "simple",&#xD;
+                                "price": "3.62",&#xD;
+                                "status": "1",&#xD;
+                                "attribute_set_id": "4",&#xD;
+                                "custom_attributes": [&#xD;
+                                {&#xD;
+                                "attribute_code": "cost",&#xD;
+                                "value": ""&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "description",&#xD;
+                                "value": "Description"&#xD;
+                                }&#xD;
+                                ],&#xD;
+                                "extension_attributes":{&#xD;
+                                "stock_item":{&#xD;
+                                "manage_stock": 1,    &#xD;
+                                "is_in_stock": 1,&#xD;
+                                "qty":"100"&#xD;
+                                }&#xD;
+                                }        ,&#xD;
+                                "media_gallery_entries":&#xD;
+                                [{&#xD;
+                                "id": null,&#xD;
+                                "label":"test_label_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "position":1,&#xD;
+                                "disabled":false,&#xD;
+                                "media_type":"image",&#xD;
+                                "types":["image"],&#xD;
+                                "content":{&#xD;
+                                "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                "type": "image/jpeg",&#xD;
+                                "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
+                                }&#xD;
+                                }&#xD;
+                                ]&#xD;
+                                }&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</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"/>
+            </HTTPSamplerProxy>
+            <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 product id" enabled="true">
+                    <stringProp name="VAR">bundle_child_1_product_id</stringProp>
+                    <stringProp name="JSONPATH">$.id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <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 product sku" enabled="true">
+                    <stringProp name="VAR">bundle_child_1_product_sku</stringProp>
+                    <stringProp name="JSONPATH">$.sku</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <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 stock item id" enabled="true">
+                    <stringProp name="VAR">bundle_child_1_product_stock_item_id</stringProp>
+                    <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</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">bundle_child_1_product_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="-425311000">^[A-Za-z0-9-]+$</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">bundle_child_1_product_sku</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</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">bundle_child_1_product_stock_item_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create child product child simple 2" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "product": {&#xD;
+                                "sku": "apsku-test-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "name": "Extensible_Product_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "visibility": "1",&#xD;
+                                "type_id": "simple",&#xD;
+                                "price": "3.62",&#xD;
+                                "status": "1",&#xD;
+                                "attribute_set_id": "4",&#xD;
+                                "custom_attributes": [&#xD;
+                                {&#xD;
+                                "attribute_code": "cost",&#xD;
+                                "value": ""&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "attribute_code": "description",&#xD;
+                                "value": "Description"&#xD;
+                                }&#xD;
+                                ],&#xD;
+                                "extension_attributes":{&#xD;
+                                "stock_item":{&#xD;
+                                "manage_stock": 1,    &#xD;
+                                "is_in_stock": 1,&#xD;
+                                "qty":"100"&#xD;
+                                }&#xD;
+                                }        ,&#xD;
+                                "media_gallery_entries":&#xD;
+                                [{&#xD;
+                                "id": null,&#xD;
+                                "label":"test_label_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "position":1,&#xD;
+                                "disabled":false,&#xD;
+                                "media_type":"image",&#xD;
+                                "types":["image"],&#xD;
+                                "content":{&#xD;
+                                "base64_encoded_data": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABgAGADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iioLy8t9Ps5bu7lWKCIZd26KKaTbshpX0RPRXN/8J/4V/6DVv8Ak3+FH/Cf+Ff+g1b/AJN/hXR9SxP/AD7l9zNPYVf5X9x0lFc3/wAJ/wCFf+g1b/k3+FH/AAn/AIV/6DVv+Tf4UfUsT/z7l9zD2FX+V/cdJRXN/wDCf+Ff+g1b/k3+FH/Cf+Ff+g1b/k3+FH1LE/8APuX3MPYVf5X9x0lFc3/wn/hX/oNW/wCTf4Uf8J/4V/6DVv8Ak3+FH1LE/wDPuX3MPYVf5X9x0lFVdP1G01WyS8sZ1nt3JCyL0ODg/qKtVzyi4u0lZmbTTswrm/H3/Iiav/1x/wDZhXSVzfj7/kRNX/64/wDswrowf+80/wDEvzNKH8WPqj5voorB1zS7OLT7m7SHE5YNu3HqWGeM471+kYutOhSdSEU7Jt3dtF20f6H1FacqcHJK9vO36M3qKzTa6foqPdxwlWxswrFi2T0AJ9aRdVmjkT7XYSW8TsFEm8MAT0yB0qfrcafu1tJeV2l2u7K3zsL2yjpPR+V3+NjTorPn1GVbt7a1s2uJIwDJ84ULnpyaik1SWTTrp47Z0uIQRJGzAFOPvZ70Sx1GLau9L9H03SdrNrsgdeCuu3k+hq0VR0ma4msImuIih2LtYvuLjA+b2zV6uijUVWmprqaQkpxUl1PoP4Xf8iBYf78v/oxq7GuO+F3/ACIFh/vy/wDoxq7GvzTMf98q/wCJ/mfLYn+NP1YVzfj7/kRNX/64/wDswrpK5vx9/wAiJq//AFx/9mFRg/8Aeaf+JfmTQ/ix9UfN9ZniD/kB3H/Af/QhWnTZI45kKSIroeqsMg1+l4mk61GdNfaTX3o+pqw54Sj3Rma/GXsI3BcLFMruU+8F5yR+dUZ4tOeNFOq3tx5jACNZg5J+mK6PrUMdrbxPvjgiR/7yoAa48TgPa1HNW1STvfp2s1+JjVw/PJy017mbe/YTqTB7iWzuQgPmhtocfjwajiupbjTtTieUXCxRsqTKMb8qePwrYlghnAE0UcgHQOoP86ckaRoERFVR/CowKbwU3UclJJO+19brqr203vvoHsJczd7J3/H8PmVNJnhm063WOVHZIkDhTkqcd/yNXajighg3eTFHHu67FAz+VSV2UIShTjGe67G9NOMUpbn0H8Lv+RAsP9+X/wBGNXY1x3wu/wCRAsP9+X/0Y1djX5tmP++Vf8T/ADPl8T/Gn6sK5vx9/wAiJq//AFx/9mFdJXN+Pv8AkRNX/wCuP/swqMH/ALzT/wAS/Mmh/Fj6o+b6KKK/Uj60KKKKACiiigAooooA+g/hd/yIFh/vy/8Aoxq7GuO+F3/IgWH+/L/6Mauxr8wzH/fKv+J/mfKYn+NP1YVzfj7/AJETV/8Arj/7MK6Sub8ff8iJq/8A1x/9mFRg/wDeaf8AiX5k0P4sfVHzfRRRX6kfWhRRRQAUUUUAFFFFAH0H8Lv+RAsP9+X/ANGNXY1x3wu/5ECw/wB+X/0Y1djX5hmP++Vf8T/M+UxP8afqwqC8s7fULOW0u4llglGHRujCp6K5E2ndGKdtUc3/AMIB4V/6Atv+bf40f8IB4V/6Atv+bf410lFdH13E/wDPyX3s09vV/mf3nN/8IB4V/wCgLb/m3+NH/CAeFf8AoC2/5t/jXSUUfXcT/wA/Jfew9vV/mf3nN/8ACAeFf+gLb/m3+NH/AAgHhX/oC2/5t/jXSUUfXcT/AM/Jfew9vV/mf3nN/wDCAeFf+gLb/m3+NH/CAeFf+gLb/m3+NdJRR9dxP/PyX3sPb1f5n95V0/TrTSrJLOxgWC3QkrGvQZOT+pq1RRXPKTk7yd2Zttu7P//Z",&#xD;
+                                "type": "image/jpeg",&#xD;
+                                "name": "test_image_${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}.jpeg"&#xD;
+                                }&#xD;
+                                }&#xD;
+                                ]&#xD;
+                                }&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/products</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"/>
+            </HTTPSamplerProxy>
+            <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 product id" enabled="true">
+                    <stringProp name="VAR">bundle_child_2_product_id</stringProp>
+                    <stringProp name="JSONPATH">$.id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <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 product sku" enabled="true">
+                    <stringProp name="VAR">bundle_child_2_product_sku</stringProp>
+                    <stringProp name="JSONPATH">$.sku</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <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 stock item id" enabled="true">
+                    <stringProp name="VAR">bundle_child_2_product_stock_item_id</stringProp>
+                    <stringProp name="JSONPATH">$.extension_attributes.stock_item.item_id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</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">bundle_child_2_product_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert product sku not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="-425311000">^[A-Za-z0-9-]+$</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">bundle_child_2_product_sku</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert stock item id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</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">bundle_child_2_product_stock_item_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="API - Create option and values for bundle product" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "option": {&#xD;
+                                "title": "option-${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "required": 1,&#xD;
+                                "type": "select",&#xD;
+                                "position": 0,&#xD;
+                                "sku": "${bundle_product_sku}",&#xD;
+                                "product_links": [&#xD;
+                                {&#xD;
+                                "sku": "${bundle_child_1_product_sku}",&#xD;
+                                "qty": 1,&#xD;
+                                "position": 0,&#xD;
+                                "is_default": 1,&#xD;
+                                "can_change_quantity": 0&#xD;
+                                },&#xD;
+                                {&#xD;
+                                "sku": "${bundle_child_2_product_sku}",&#xD;
+                                "qty": 1,&#xD;
+                                "position": 0,&#xD;
+                                "is_default": 0,&#xD;
+                                "can_change_quantity": 0&#xD;
+                                }&#xD;
+                                ]&#xD;
+                                }&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/bundle-products/options/add</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"/>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert option id" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="1865724479">^\"\d+\"$</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="Scope.variable"/>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
         </hashTree>
     
         <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Create downloadable product" enabled="true">
@@ -39511,7 +39857,7 @@ adminUserList.add(vars.get("admin_user"));
                 <collectionProp name="Arguments.arguments">
                     <elementProp name="" elementType="HTTPArgument">
                         <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">{"query":"{\n  products(\n    filter: {\n         price: {gt: \"10\"}\n         or: {\n            sku:{like:\"%Product%\"}\n            name:{like:\"%Configurable Product%\"}\n          }\n        }\n    pageSize: 200\n    currentPage: 1\n    sort: {\n      price: ASC\n      name:DESC\n    }\n  ) {\n    total_count\n    items {\n        attribute_set_id\n        country_of_manufacture\n        created_at\n                custom_layout\n        custom_layout_update\n        description\n        gift_message_available\n        image\n        image_label\n        meta_description\n        meta_keyword\n        meta_title\n        name\n        new_from_date\n        new_to_date\n        options_container\n        ... on CustomizableProductInterface {\n            options\n            {\n                title\n                required\n                sort_order\n            }\n        }\n        \n        price {\n            minimalPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n            maximalPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n            regularPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n        }\n        short_description\n        sku\n        small_image\n        small_image_label\n        special_from_date\n        special_price\n        special_to_date\n        swatch_image\n        tax_class_id\n        thumbnail\n        thumbnail_label\n        tier_price\n        type_id\n        updated_at\n        url_key\n        url_path\n        websites { id name code sort_order default_group_id is_default }\n      \t... on PhysicalProductInterface {\n        \tweight\n      \t}\n    }\n    page_info {\n      page_size\n      current_page\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.value">{"query":"{\n  products(\n    filter: {\n         price: {gt: \"10\"}\n         or: {\n            sku:{like:\"%Product%\"}\n            name:{like:\"%Configurable Product%\"}\n          }\n        }\n    pageSize: 200\n    currentPage: 1\n    sort: {\n      price: ASC\n      name:DESC\n    }\n  ) {\n    total_count\n    items {\n        attribute_set_id\n        country_of_manufacture\n        created_at\n        description\n        gift_message_available\n        image\n        image_label\n        meta_description\n        meta_keyword\n        meta_title\n        name\n        new_from_date\n        new_to_date\n        options_container\n        ... on CustomizableProductInterface {\n            options\n            {\n                title\n                required\n                sort_order\n            }\n        }\n        \n        price {\n            minimalPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n            maximalPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n            regularPrice {\n                amount {\n                    value\n                    currency\n                }\n                adjustments {\n                    amount {\n                        value\n                        currency\n                    }\n                    code\n                    description\n                }\n            }\n        }\n        short_description\n        sku\n        small_image\n        small_image_label\n        special_from_date\n        special_price\n        special_to_date\n        swatch_image\n        tax_class_id\n        thumbnail\n        thumbnail_label\n        tier_price\n        type_id\n        updated_at\n        url_key\n        url_path\n        websites { id name code sort_order default_group_id is_default }\n      \t... on PhysicalProductInterface {\n        \tweight\n      \t}\n    }\n    page_info {\n      page_size\n      current_page\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
                         <stringProp name="Argument.metadata">=</stringProp>
                     </elementProp>
                 </collectionProp>
@@ -39568,7 +39914,7 @@ adminUserList.add(vars.get("admin_user"));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${simple_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            category_ids\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n                        custom_layout\n            custom_layout_update\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${simple_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -39644,7 +39990,7 @@ if (totalCount == null) {
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: {eq:\"${configurable_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\n            attribute_set_id\n            category_ids\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n                        custom_layout\n            custom_layout_update\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        category_ids\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                                                custom_layout\n                        custom_layout_update\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: {eq:\"${configurable_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -39713,7 +40059,7 @@ if (totalCount == null) {
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(\n        search: \"configurable\"\n        filter: {price: {gteq: \"1\"} }\n    ) {\n        total_count\n        items {\n            attribute_set_id\n            category_ids\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n                        custom_layout\n            custom_layout_update\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t\t}\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        category_ids\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                                                custom_layout\n                        custom_layout_update\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(\n        search: \"configurable\"\n        filter: {price: {gteq: \"1\"} }\n    ) {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t\t}\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -39773,7 +40119,7 @@ if (totalCount == null) {
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(search: \"configurable\") {\n        total_count\n        items {\n            attribute_set_id\n            category_ids\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n                        custom_layout\n            custom_layout_update\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t\t}\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        category_ids\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                                                custom_layout\n                        custom_layout_update\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(search: \"configurable\") {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t\t}\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -39833,7 +40179,7 @@ if (totalCount == null) {
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(search: \"color\") {\n        filters {\n            name\n            filter_items_count\n            request_var\n            filter_items {\n                label\n                value_string\n                items_count\n                ... on SwatchLayerFilterItemInterface {\n                    swatch_data {\n                        type\n                        value\n                    }\n                }\n            }\n        }\n        total_count\n        items {\n            attribute_set_id\n            category_ids\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n                        custom_layout\n            custom_layout_update\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n                    weight\n                  }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        category_ids\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                                                custom_layout\n                        custom_layout_update\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(search: \"color\") {\n        filters {\n            name\n            filter_items_count\n            request_var\n            filter_items {\n                label\n                value_string\n                items_count\n                ... on SwatchLayerFilterItemInterface {\n                    swatch_data {\n                        type\n                        value\n                    }\n                }\n            }\n        }\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n                    weight\n                  }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -39887,13 +40233,13 @@ if (totalCount == null) {
       <hashTree/>
     </hashTree>
   
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query bundle product" enabled="false">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query bundle product" enabled="true">
             <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
             <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
                 <collectionProp name="Arguments.arguments">
                     <elementProp name="" elementType="HTTPArgument">
                         <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${bundle_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\n            attribute_set_id\n            category_ids\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n                        custom_layout\n            custom_layout_update\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on BundleProduct {\n                weight\n                price_view\n                dynamic_price\n                dynamic_sku\n                ship_bundle_items\n                dynamic_weight\n                items {\n                  option_id\n                  title\n                  required\n                  type\n                  position\n                  sku\n                  options {\n                        id\n                        qty\n                        position\n                        is_default\n                        price\n                        price_type\n                        can_change_quantity\n                    product {\n                        attribute_set_id\n                        category_ids\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                                                custom_layout\n                        custom_layout_update\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                                    swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n                    }\n                  }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${bundle_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on BundleProduct {\n                weight\n                price_view\n                dynamic_price\n                dynamic_sku\n                ship_bundle_items\n                dynamic_weight\n                items {\n                  option_id\n                  title\n                  required\n                  type\n                  position\n                  sku\n                  options {\n                        id\n                        qty\n                        position\n                        is_default\n                        price\n                        price_type\n                        can_change_quantity\n                    product {\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                                    swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n                    }\n                  }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
                         <stringProp name="Argument.metadata">=</stringProp>
                     </elementProp>
                 </collectionProp>
@@ -39962,7 +40308,7 @@ if (totalCount == null) {
                 <collectionProp name="Arguments.arguments">
                     <elementProp name="" elementType="HTTPArgument">
                         <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${downloadable_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            category_ids\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n                        custom_layout\n            custom_layout_update\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n              ... on DownloadableProduct {\n                links_purchased_separately\n                links_title\n                downloadable_product_samples {\n                  id\n                  title\n                  sort_order\n                  sample_type\n                  sample_file\n                  sample_url\n                }\n                downloadable_product_links {\n                        id\n                        title\n                        sort_order\n                        is_shareable\n                        price\n                        number_of_downloads\n                        link_type\n                        sample_type\n                        sample_file\n                            sample_url\n                }\n              }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${downloadable_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n              ... on DownloadableProduct {\n                links_purchased_separately\n                links_title\n                downloadable_product_samples {\n                  id\n                  title\n                  sort_order\n                  sample_type\n                  sample_file\n                  sample_url\n                }\n                downloadable_product_links {\n                        id\n                        title\n                        sort_order\n                        is_shareable\n                        price\n                        number_of_downloads\n                        link_type\n                        sample_type\n                        sample_file\n                            sample_url\n                }\n              }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
                         <stringProp name="Argument.metadata">=</stringProp>
                     </elementProp>
                 </collectionProp>
@@ -40049,7 +40395,7 @@ if (totalCount == null) {
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${virtual_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            category_ids\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n                        custom_layout\n            custom_layout_update\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${virtual_product_sku}\" } })\n    {\n       total_count\n       items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n           price {\n               minimalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               maximalPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n               regularPrice {\n                   amount {\n                       value\n                       currency\n                   }\n                   adjustments {\n                       amount {\n                           value\n                           currency\n                       }\n                       code\n                       description\n                   }\n               }\n           }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -40116,7 +40462,7 @@ if (totalCount == null) {
                 <collectionProp name="Arguments.arguments">
                     <elementProp name="" elementType="HTTPArgument">
                         <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${grouped_product_sku}\"} }) {\n        total_count\n        items {\n            attribute_set_id\n            category_ids\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n                        custom_layout\n            custom_layout_update\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on GroupedProduct {\n                weight\n                items {\n                  qty\n                  position\n                  product {\n                        attribute_set_id\n                        category_ids\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                                                custom_layout\n                        custom_layout_update\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                                    swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n                  }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${grouped_product_sku}\"} }) {\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description\n            gift_message_available\n            id\n            image\n            image_label\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description\n            sku\n            small_image\n            small_image_label\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            tax_class_id\n            thumbnail\n            thumbnail_label\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on GroupedProduct {\n                weight\n                items {\n                  qty\n                  position\n                  product {\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description\n                        gift_message_available\n                        id\n                        image\n                        image_label\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description\n                        sku\n                        small_image\n                        small_image_label\n                        special_from_date\n                        special_price\n                        special_to_date\n                                    swatch_image\n                        tax_class_id\n                        thumbnail\n                        thumbnail_label\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n                  }\n                }\n            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
                         <stringProp name="Argument.metadata">=</stringProp>
                     </elementProp>
                 </collectionProp>
@@ -40374,7 +40720,7 @@ if (totalCount == null) {
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  categories(filter: {root_category_id: 4}) {\n    category_tree {\n      id\n      level\n      is_active\n      description\n      all_children\n      path\n      path_in_store\n      product_count\n      url_key\n      url_path\n      children {\n        id\n        is_active\n        description\n        available_sort_by\n        default_sort_by\n        image\n        level\n        children {\n          id\n          is_active\n          filter_price_range\n          description\n          image\n          meta_keywords\n          level\n          is_anchor\n          children {\n            level\n            id\n            children {\n              id\n            }\n          }\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n  category(id: 1) {\n      name\n      id\n      level\n      description\n      path\n      path_in_store\n      url_key\n      url_path\n      children {\n        id\n        description\n        default_sort_by\n        children {\n          id\n          description\n          level\n          children {\n            level\n            id\n            children {\n              id\n            }\n          }\n        }\n      }\n  }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -40397,12 +40743,32 @@ if (totalCount == null) {
     </HTTPSamplerProxy>
     <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_count" enabled="true">
-        <stringProp name="VAR">graphql_category_query_category_tree</stringProp>
-        <stringProp name="JSONPATH">$.data.categories.category_tree</stringProp>
+        <stringProp name="VAR">graphql_category_query_name</stringProp>
+        <stringProp name="JSONPATH">$.data.category.name</stringProp>
         <stringProp name="DEFAULT"/>
         <stringProp name="VARIABLE"/>
         <stringProp name="SUBJECT">BODY</stringProp>
       </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String name = vars.get("graphql_category_query_name");
+if (name == null) {
+	Failure = true;
+	FailureMessage = "Not Expected \"children\" to be null";
+} else {
+	if (!name.equals("Root Catalog")) {
+		Failure = true;
+		FailureMessage = "Expected \"name\" to equal \"Root Catalog\", Actual: " + name;
+	} else {
+		Failure = false;
+	}
+}
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
     </hashTree>
   </hashTree>
   </hashTree>
diff --git a/setup/pub/magento/setup/select-version.js b/setup/pub/magento/setup/select-version.js
index d9d4f7518ad1f..32210d29dcbfe 100644
--- a/setup/pub/magento/setup/select-version.js
+++ b/setup/pub/magento/setup/select-version.js
@@ -13,6 +13,7 @@ angular.module('select-version', ['ngStorage'])
         $scope.upgradeReadyForNext = false;
         $scope.upgradeProcessed = false;
         $scope.upgradeProcessError = false;
+        $scope.upgradeAlreadyLatestVersion = false;
         $scope.upgradeProcessErrorMessage = '';
         $scope.componentsReadyForNext = true;
         $scope.componentsProcessed = false;
@@ -39,6 +40,7 @@ angular.module('select-version', ['ngStorage'])
 
                     if ($scope.upgradeProcessError) {
                         $scope.upgradeProcessErrorMessage = "You're already using the latest version, there's nothing for us to do.";
+                        $scope.upgradeAlreadyLatestVersion = true;
                     } else {
                         $scope.selectedOption = [];
                         $scope.versions = [];
diff --git a/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php b/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
index 2d450a4374c5e..1bbd152f2ba4e 100644
--- a/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
+++ b/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
@@ -18,7 +18,7 @@ class AddressDataGenerator
     public function generateAddress()
     {
         return [
-            'postcode' => mt_rand(10000, 99999)
+            'postcode' => random_int(10000, 99999)
         ];
     }
 }
diff --git a/setup/src/Magento/Setup/Model/DataGenerator.php b/setup/src/Magento/Setup/Model/DataGenerator.php
index 7a039388180a1..540433e5aa3ec 100644
--- a/setup/src/Magento/Setup/Model/DataGenerator.php
+++ b/setup/src/Magento/Setup/Model/DataGenerator.php
@@ -67,12 +67,12 @@ protected function readData()
      */
     public function generate($minAmountOfWords, $maxAmountOfWords, $key = null)
     {
-        $numberOfWords = mt_rand($minAmountOfWords, $maxAmountOfWords);
+        $numberOfWords = random_int($minAmountOfWords, $maxAmountOfWords);
         $result = '';
 
         if ($key === null || !array_key_exists($key, $this->generatedValues)) {
             for ($i = 0; $i < $numberOfWords; $i++) {
-                $result .= ' ' . $this->dictionaryData[mt_rand(0, count($this->dictionaryData) - 1)];
+                $result .= ' ' . $this->dictionaryData[random_int(0, count($this->dictionaryData) - 1)];
             }
             $result = trim($result);
 
diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
index 807e1fde7d90d..a790bfdbe608d 100644
--- a/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
+++ b/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
@@ -63,7 +63,7 @@ public function generate()
      */
     private function generateRawDescription()
     {
-        $paragraphsCount = mt_rand(
+        $paragraphsCount = random_int(
             $this->descriptionConfig['paragraphs']['count-min'],
             $this->descriptionConfig['paragraphs']['count-max']
         );
diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php
index 50544e6ea9726..57ece1f9558c3 100644
--- a/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php
+++ b/setup/src/Magento/Setup/Model/Description/DescriptionParagraphGenerator.php
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function generate()
     {
-        $sentencesCount = mt_rand(
+        $sentencesCount = random_int(
             $this->paragraphConfig['sentences']['count-min'],
             $this->paragraphConfig['sentences']['count-max']
         );
diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php
index 299b4b50bed0f..10b07e7e1c7a2 100644
--- a/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php
+++ b/setup/src/Magento/Setup/Model/Description/DescriptionSentenceGenerator.php
@@ -39,7 +39,7 @@ public function __construct(
      */
     public function generate()
     {
-        $sentenceWordsCount = mt_rand(
+        $sentenceWordsCount = random_int(
             $this->sentenceConfig['words']['count-min'],
             $this->sentenceConfig['words']['count-max']
         );
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php
index db208adc67de8..927759c4bfa7c 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/BoldMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
         return $this->wordWrapper->wrapWords(
             $text,
-            $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
             '<b>%s</b>'
         );
     }
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php b/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php
index 0598db218728f..c7efcc7f12e0f 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/Helper/RandomWordSelector.php
@@ -27,7 +27,7 @@ public function getRandomWords($source, $count)
         $randWords = [];
         $wordsSize = count($words);
         while ($count) {
-            $randWords[] = $words[mt_rand(0, $wordsSize - 1)];
+            $randWords[] = $words[random_int(0, $wordsSize - 1)];
             $count--;
         }
 
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php
index 87e033be330cf..7621bccf08773 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/ItalicMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
         return $this->wordWrapper->wrapWords(
             $text,
-            $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
             '<i>%s</i>'
         );
     }
diff --git a/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php b/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php
index ed5a836129460..fe53ebef535a8 100644
--- a/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php
+++ b/setup/src/Magento/Setup/Model/Description/Mixin/SpanMixin.php
@@ -48,7 +48,7 @@ public function apply($text)
 
         return $this->wordWrapper->wrapWords(
             $text,
-            $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, random_int(5, 8)),
             '<span>%s</span>'
         );
     }
diff --git a/setup/src/Magento/Setup/Model/Dictionary.php b/setup/src/Magento/Setup/Model/Dictionary.php
index 630d35092d0fc..52f7cc1bb5148 100644
--- a/setup/src/Magento/Setup/Model/Dictionary.php
+++ b/setup/src/Magento/Setup/Model/Dictionary.php
@@ -40,7 +40,7 @@ public function getRandWord()
             $this->readDictionary();
         }
 
-        $randIndex = mt_rand(0, count($this->dictionary) - 1);
+        $randIndex = random_int(0, count($this->dictionary) - 1);
         return trim($this->dictionary[$randIndex]);
     }
 
diff --git a/setup/view/magento/setup/select-version.phtml b/setup/view/magento/setup/select-version.phtml
index 4c61837d975a0..920ab86252514 100644
--- a/setup/view/magento/setup/select-version.phtml
+++ b/setup/view/magento/setup/select-version.phtml
@@ -38,7 +38,10 @@
         </span>
         <span class="message-text">Checking for a new version...</span>
     </div>
-    <div class="message message-error" ng-show="upgradeProcessError">
+    <div
+        class="message"
+        ng-class="upgradeAlreadyLatestVersion ? 'message-success' : 'message-error'"
+        ng-show="upgradeProcessError">
             <span class="message-text" ng-bind-html="upgradeProcessErrorMessage"></span>
     </div>
     <div class="message" ng-show="upgradeProcessed && !upgradeProcessError && currentVersion">