diff --git a/.travis.yml b/.travis.yml
index dcd00f39bb8..5b1147c4413 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ addons:
   firefox: "46.0"
   hosts:
       - magento2.travis
+services:
+  - rabbitmq
 language: php
 php:
   - 7.0
diff --git a/README.md b/README.md
index c72357db26d..0fe25bb6029 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
+[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
diff --git a/app/code/Magento/AdminNotification/etc/db_schema.xml b/app/code/Magento/AdminNotification/etc/db_schema.xml
index 6d969b3f009..35e6045b607 100644
--- a/app/code/Magento/AdminNotification/etc/db_schema.xml
+++ b/app/code/Magento/AdminNotification/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
         <column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Notification id"/>
diff --git a/app/code/Magento/Amqp/Model/Config.php b/app/code/Magento/Amqp/Model/Config.php
new file mode 100644
index 00000000000..9ec9780317a
--- /dev/null
+++ b/app/code/Magento/Amqp/Model/Config.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+/**
+ * {@inheritdoc}
+ *
+ * @deprecated 100.2.0
+ */
+class Config extends \Magento\Framework\Amqp\Config
+{
+
+}
diff --git a/app/code/Magento/Amqp/Model/Exchange.php b/app/code/Magento/Amqp/Model/Exchange.php
new file mode 100644
index 00000000000..d7ad09e7260
--- /dev/null
+++ b/app/code/Magento/Amqp/Model/Exchange.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+
+/**
+ * {@inheritdoc}
+ *
+ * @deprecated 100.2.0
+ */
+class Exchange extends \Magento\Framework\Amqp\Exchange
+{
+    /**
+     * Initialize dependencies.
+     *
+     * @param Config $amqpConfig
+     * @param QueueConfig $queueConfig
+     * @param CommunicationConfigInterface $communicationConfig
+     * @param int $rpcConnectionTimeout
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        Config $amqpConfig,
+        QueueConfig $queueConfig,
+        CommunicationConfigInterface $communicationConfig,
+        $rpcConnectionTimeout = self::RPC_CONNECTION_TIMEOUT
+    ) {
+        parent::__construct(
+            $amqpConfig,
+            $this->getPublisherConfig(),
+            $this->getResponseQueueNameBuilder(),
+            $communicationConfig,
+            $rpcConnectionTimeout
+        );
+    }
+
+    /**
+     * Get publisher config.
+     *
+     * @return PublisherConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getPublisherConfig()
+    {
+        return \Magento\Framework\App\ObjectManager::getInstance()->get(PublisherConfig::class);
+    }
+
+    /**
+     * Get response queue name builder.
+     *
+     * @return ResponseQueueNameBuilder
+     *
+     * @deprecated 100.2.0
+     */
+    private function getResponseQueueNameBuilder()
+    {
+        return \Magento\Framework\App\ObjectManager::getInstance()->get(ResponseQueueNameBuilder::class);
+    }
+}
diff --git a/app/code/Magento/Amqp/Model/Queue.php b/app/code/Magento/Amqp/Model/Queue.php
new file mode 100644
index 00000000000..ffef398352b
--- /dev/null
+++ b/app/code/Magento/Amqp/Model/Queue.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+/**
+ * {@inheritdoc}
+ *
+ * @deprecated 100.2.0
+ */
+class Queue extends \Magento\Framework\Amqp\Queue
+{
+
+}
diff --git a/app/code/Magento/Amqp/Model/Topology.php b/app/code/Magento/Amqp/Model/Topology.php
new file mode 100644
index 00000000000..fa22cb1633a
--- /dev/null
+++ b/app/code/Magento/Amqp/Model/Topology.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+use Magento\Framework\Amqp\Topology\ExchangeInstaller;
+use Magento\Framework\Amqp\Topology\QueueInstaller;
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Topology\ConfigInterface as TopologyConfig;
+use Magento\Framework\Amqp\ConfigPool;
+use Magento\Framework\Amqp\ConnectionTypeResolver;
+use Magento\Framework\Amqp\TopologyInstaller;
+
+/**
+ * Class Topology creates topology for Amqp messaging
+ *
+ * @deprecated 100.2.0
+ */
+class Topology extends TopologyInstaller
+{
+    /**
+     * Type of exchange
+     *
+     * @deprecated
+     */
+    const TOPIC_EXCHANGE = 'topic';
+
+    /**
+     * Amqp connection
+     */
+    const AMQP_CONNECTION = 'amqp';
+
+    /**
+     * Durability for exchange and queue
+     *
+     * @deprecated
+     */
+    const IS_DURABLE = true;
+
+    /**
+     * Initialize dependencies
+     *
+     * @param Config $amqpConfig
+     * @param QueueConfig $queueConfig
+     * @param CommunicationConfig $communicationConfig
+     * @param \Psr\Log\LoggerInterface $logger
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        Config $amqpConfig,
+        QueueConfig $queueConfig,
+        CommunicationConfig $communicationConfig,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        parent::__construct(
+            \Magento\Framework\App\ObjectManager::getInstance()->get(TopologyConfig::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ExchangeInstaller::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ConfigPool::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(QueueInstaller::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ConnectionTypeResolver::class),
+            $logger
+        );
+    }
+}
diff --git a/app/code/Magento/Amqp/README.md b/app/code/Magento/Amqp/README.md
new file mode 100644
index 00000000000..a21624031d6
--- /dev/null
+++ b/app/code/Magento/Amqp/README.md
@@ -0,0 +1,3 @@
+# Amqp
+
+**Amqp** provides functionality to publish/consume messages with Amqp.
diff --git a/app/code/Magento/Amqp/Setup/ConfigOptionsList.php b/app/code/Magento/Amqp/Setup/ConfigOptionsList.php
new file mode 100644
index 00000000000..e4126f148d6
--- /dev/null
+++ b/app/code/Magento/Amqp/Setup/ConfigOptionsList.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Setup;
+
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\ConfigOptionsListInterface;
+use Magento\Framework\Setup\Option\TextConfigOption;
+use Magento\Framework\App\DeploymentConfig;
+
+/**
+ * Deployment configuration options needed for Setup application
+ */
+class ConfigOptionsList implements ConfigOptionsListInterface
+{
+    /**
+     * Input key for the options
+     */
+    const INPUT_KEY_QUEUE_AMQP_HOST = 'amqp-host';
+    const INPUT_KEY_QUEUE_AMQP_PORT = 'amqp-port';
+    const INPUT_KEY_QUEUE_AMQP_USER = 'amqp-user';
+    const INPUT_KEY_QUEUE_AMQP_PASSWORD = 'amqp-password';
+    const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost';
+    const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl';
+
+    /**
+     * Path to the values in the deployment config
+     */
+    const CONFIG_PATH_QUEUE_AMQP_HOST = 'queue/amqp/host';
+    const CONFIG_PATH_QUEUE_AMQP_PORT = 'queue/amqp/port';
+    const CONFIG_PATH_QUEUE_AMQP_USER = 'queue/amqp/user';
+    const CONFIG_PATH_QUEUE_AMQP_PASSWORD = 'queue/amqp/password';
+    const CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST = 'queue/amqp/virtualhost';
+    const CONFIG_PATH_QUEUE_AMQP_SSL = 'queue/amqp/ssl';
+
+    /**
+     * Default values
+     */
+    const DEFAULT_AMQP_HOST = '';
+    const DEFAULT_AMQP_PORT = '5672';
+    const DEFAULT_AMQP_USER = '';
+    const DEFAULT_AMQP_PASSWORD = '';
+    const DEFAULT_AMQP_VIRTUAL_HOST = '/';
+    const DEFAULT_AMQP_SSL = '';
+
+    /**
+     * @var ConnectionValidator
+     */
+    private $connectionValidator;
+
+    /**
+     * Constructor
+     *
+     * @param ConnectionValidator $connectionValidator
+     */
+    public function __construct(ConnectionValidator $connectionValidator)
+    {
+        $this->connectionValidator = $connectionValidator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOptions()
+    {
+        return [
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_HOST,
+                'Amqp server host',
+                self::DEFAULT_AMQP_HOST
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_PORT,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_PORT,
+                'Amqp server port',
+                self::DEFAULT_AMQP_PORT
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_USER,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_USER,
+                'Amqp server username',
+                self::DEFAULT_AMQP_USER
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_PASSWORD,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_PASSWORD,
+                'Amqp server password',
+                self::DEFAULT_AMQP_PASSWORD
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST,
+                'Amqp virtualhost',
+                self::DEFAULT_AMQP_VIRTUAL_HOST
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_SSL,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_AMQP_SSL,
+                'Amqp SSL',
+                self::DEFAULT_AMQP_SSL
+            ),
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function createConfig(array $data, DeploymentConfig $deploymentConfig)
+    {
+        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+
+        if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_HOST)) {
+            $configData->set(self::CONFIG_PATH_QUEUE_AMQP_HOST, $data[self::INPUT_KEY_QUEUE_AMQP_HOST]);
+            if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_PORT)) {
+                $configData->set(self::CONFIG_PATH_QUEUE_AMQP_PORT, $data[self::INPUT_KEY_QUEUE_AMQP_PORT]);
+            }
+            if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_USER)) {
+                $configData->set(self::CONFIG_PATH_QUEUE_AMQP_USER, $data[self::INPUT_KEY_QUEUE_AMQP_USER]);
+            }
+            if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_PASSWORD)) {
+                $configData->set(self::CONFIG_PATH_QUEUE_AMQP_PASSWORD, $data[self::INPUT_KEY_QUEUE_AMQP_PASSWORD]);
+            }
+            if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST)) {
+                $configData->set(
+                    self::CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST,
+                    $data[self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST]
+                );
+            }
+            if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_SSL)) {
+                $configData->set(self::CONFIG_PATH_QUEUE_AMQP_SSL, $data[self::INPUT_KEY_QUEUE_AMQP_SSL]);
+            }
+        }
+
+        return [$configData];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validate(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $errors = [];
+
+        if (isset($options[self::INPUT_KEY_QUEUE_AMQP_HOST])
+            && $options[self::INPUT_KEY_QUEUE_AMQP_HOST] !== '') {
+            $result = $this->connectionValidator->isConnectionValid(
+                $options[self::INPUT_KEY_QUEUE_AMQP_HOST],
+                $options[self::INPUT_KEY_QUEUE_AMQP_PORT],
+                $options[self::INPUT_KEY_QUEUE_AMQP_USER],
+                $options[self::INPUT_KEY_QUEUE_AMQP_PASSWORD],
+                $options[self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST]
+            );
+
+            if (!$result) {
+                $errors[] = "Could not connect to the Amqp Server.";
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Check if data ($data) with key ($key) is empty
+     *
+     * @param array $data
+     * @param string $key
+     * @return bool
+     */
+    private function isDataEmpty(array $data, $key)
+    {
+        if (isset($data[$key]) && $data[$key] !== '') {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Amqp/Setup/ConnectionValidator.php b/app/code/Magento/Amqp/Setup/ConnectionValidator.php
new file mode 100644
index 00000000000..eb17b3517f0
--- /dev/null
+++ b/app/code/Magento/Amqp/Setup/ConnectionValidator.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Setup;
+
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+
+/**
+ * Class ConnectionValidator - validates Amqp related settings
+ */
+class ConnectionValidator
+{
+    /**
+     * Checks Amqp Connection
+     *
+     * @param string $host
+     * @param string $port
+     * @param string $user
+     * @param string $password
+     * @param string $virtualHost
+     * @return bool true if the connection succeeded, false otherwise
+     */
+    public function isConnectionValid($host, $port, $user, $password = '', $virtualHost = '')
+    {
+        try {
+            $connection = new AMQPStreamConnection(
+                $host,
+                $port,
+                $user,
+                $password,
+                $virtualHost
+            );
+
+            $connection->close();
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Amqp/Setup/Recurring.php b/app/code/Magento/Amqp/Setup/Recurring.php
new file mode 100644
index 00000000000..cc1951d84e3
--- /dev/null
+++ b/app/code/Magento/Amqp/Setup/Recurring.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Setup;
+
+use Magento\Framework\Amqp\TopologyInstaller;
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * Class Recurring
+ */
+class Recurring implements InstallSchemaInterface
+{
+    /**
+     * @var TopologyInstaller
+     */
+    protected $topologyInstaller;
+
+    /**
+     * @param TopologyInstaller $topologyInstaller
+     */
+    public function __construct(TopologyInstaller $topologyInstaller)
+    {
+        $this->topologyInstaller = $topologyInstaller;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $this->topologyInstaller->install();
+    }
+}
diff --git a/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php b/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php
new file mode 100644
index 00000000000..974be6dbff4
--- /dev/null
+++ b/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Amqp\Test\Unit\Setup;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Amqp\Setup\ConfigOptionsList;
+use Magento\Framework\Setup\Option\TextConfigOption;
+use Magento\Framework\App\DeploymentConfig;
+
+class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ConfigOptionsList
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Amqp\Setup\ConnectionValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionValidatorMock;
+
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var array
+     */
+    private $options;
+
+    protected function setUp()
+    {
+        $this->options = [
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST => 'host',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PORT => 'port',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_USER => 'user',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host',
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl',
+
+        ];
+
+        $this->objectManager = new ObjectManager($this);
+        $this->connectionValidatorMock = $this->getMockBuilder(\Magento\Amqp\Setup\ConnectionValidator::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->model = $this->objectManager->getObject(
+            \Magento\Amqp\Setup\ConfigOptionsList::class,
+            [
+                'connectionValidator' => $this->connectionValidatorMock,
+            ]
+        );
+    }
+
+    public function testGetOptions()
+    {
+        $expectedOptions = [
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_HOST,
+                'Amqp server host',
+                ConfigOptionsList::DEFAULT_AMQP_HOST
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PORT,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_PORT,
+                'Amqp server port',
+                ConfigOptionsList::DEFAULT_AMQP_PORT
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_USER,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_USER,
+                'Amqp server username',
+                ConfigOptionsList::DEFAULT_AMQP_USER
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_PASSWORD,
+                'Amqp server password',
+                ConfigOptionsList::DEFAULT_AMQP_PASSWORD
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST,
+                'Amqp virtualhost',
+                ConfigOptionsList::DEFAULT_AMQP_VIRTUAL_HOST
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_SSL,
+                'Amqp SSL',
+                ConfigOptionsList::DEFAULT_AMQP_SSL
+            )
+        ];
+        $this->assertEquals($expectedOptions, $this->model->getOptions());
+    }
+
+    /**
+     * @param array $options
+     * @param array $expectedConfigData
+     * @dataProvider getCreateConfigDataProvider
+     */
+    public function testCreateConfig($options, $expectedConfigData)
+    {
+        $result = $this->model->createConfig($options, $this->deploymentConfigMock);
+        $this->assertInternalType('array', $result);
+        $this->assertNotEmpty($result);
+        /** @var \Magento\Framework\Config\Data\ConfigData $configData */
+        $configData = $result[0];
+        $this->assertInstanceOf(\Magento\Framework\Config\Data\ConfigData::class, $configData);
+        $this->assertEquals($expectedConfigData, $configData->getData());
+    }
+
+    public function testValidateInvalidConnection()
+    {
+        $expectedResult = ['Could not connect to the Amqp Server.'];
+        $this->connectionValidatorMock->expects($this->once())->method('isConnectionValid')->willReturn(false);
+        $this->assertEquals($expectedResult, $this->model->validate($this->options, $this->deploymentConfigMock));
+    }
+
+    public function testValidateValidConnection()
+    {
+        $expectedResult = [];
+        $this->connectionValidatorMock->expects($this->once())->method('isConnectionValid')->willReturn(true);
+        $this->assertEquals($expectedResult, $this->model->validate($this->options, $this->deploymentConfigMock));
+    }
+
+    public function testValidateNoOptions()
+    {
+        $expectedResult = [];
+        $options = [];
+        $this->connectionValidatorMock->expects($this->never())->method('isConnectionValid');
+        $this->assertEquals($expectedResult, $this->model->validate($options, $this->deploymentConfigMock));
+    }
+
+    public function getCreateConfigDataProvider()
+    {
+        return [
+            [
+                [
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST => 'host',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PORT => 'port',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_USER => 'user',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl',
+                ],
+                ['queue' =>
+                    ['amqp' =>
+                        [
+                            'host' => 'host',
+                            'port' => 'port',
+                            'user' => 'user',
+                            'password' => 'password',
+                            'virtualhost' => 'virtual host',
+                            'ssl' => 'ssl',
+                         ]
+                    ]
+                ],
+            ],
+            [
+                [
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST => 'host',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PORT => ConfigOptionsList::DEFAULT_AMQP_PORT,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_USER => 'user',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl',
+                ],
+                ['queue' =>
+                    ['amqp' =>
+                        [
+                            'host' => 'host',
+                            'port' => ConfigOptionsList::DEFAULT_AMQP_PORT,
+                            'user' => 'user',
+                            'password' => 'password',
+                            'virtualhost' => 'virtual host',
+                            'ssl' => 'ssl',
+                         ]
+                    ]
+                ],
+            ],
+            [
+                [
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST => ConfigOptionsList::DEFAULT_AMQP_HOST,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PORT => ConfigOptionsList::DEFAULT_AMQP_PORT,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_USER => ConfigOptionsList::DEFAULT_AMQP_USER,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => ConfigOptionsList::DEFAULT_AMQP_PASSWORD,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST =>
+                        ConfigOptionsList::DEFAULT_AMQP_VIRTUAL_HOST,
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => ConfigOptionsList::DEFAULT_AMQP_SSL,
+                ],
+                [],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
new file mode 100644
index 00000000000..255fa5d55d9
--- /dev/null
+++ b/app/code/Magento/Amqp/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-amqp",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "100.3.*",
+        "magento/framework-amqp": "100.1.*",
+        "magento/framework-message-queue": "100.3.*",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "type": "magento2-module",
+    "version": "100.3.0-dev",
+    "license": [
+        "proprietary"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\Amqp\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/Amqp/etc/di.xml b/app/code/Magento/Amqp/etc/di.xml
new file mode 100644
index 00000000000..920bb72261e
--- /dev/null
+++ b/app/code/Magento/Amqp/etc/di.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\MessageQueue\Consumer\Config\CompositeReader">
+        <plugin name="queueConfigPlugin" type="Magento\Framework\MessageQueue\Config\Consumer\ConfigReaderPlugin" />
+    </type>
+    <type name="Magento\Framework\MessageQueue\Publisher\Config\CompositeReader">
+        <plugin name="queueConfigPlugin" type="Magento\Framework\MessageQueue\Config\Publisher\ConfigReaderPlugin" />
+    </type>
+    <type name="Magento\Framework\MessageQueue\Topology\Config\CompositeReader">
+        <plugin name="queueConfigPlugin" type="Magento\Framework\MessageQueue\Config\Topology\ConfigReaderPlugin" />
+    </type>
+    <type name="Magento\Framework\MessageQueue\PublisherPool">
+        <arguments>
+            <argument name="publishers" xsi:type="array">
+                <item name="async" xsi:type="array">
+                    <item name="amqp" xsi:type="object">Magento\Framework\MessageQueue\Publisher</item>
+                </item>
+                <item name="sync" xsi:type="array">
+                    <item name="amqp" xsi:type="object">Magento\Framework\MessageQueue\Rpc\Publisher</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Bulk\PublisherPool">
+        <arguments>
+            <argument name="publishers" xsi:type="array">
+                <item name="async" xsi:type="array">
+                    <item name="amqp" xsi:type="object">Magento\Framework\MessageQueue\Bulk\Publisher</item>
+                </item>
+                <item name="sync" xsi:type="array">
+                    <item name="amqp" xsi:type="object">Magento\Framework\MessageQueue\Bulk\Rpc\Publisher</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\ConnectionTypeResolver">
+        <arguments>
+            <argument name="resolvers" xsi:type="array">
+                <item name="amqp" xsi:type="object">Magento\Framework\Amqp\ConnectionTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\ExchangeFactory">
+        <arguments>
+            <argument name="exchangeFactories" xsi:type="array">
+                <item name="amqp" xsi:type="object">Magento\Framework\Amqp\ExchangeFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Bulk\ExchangeFactory">
+        <arguments>
+            <argument name="exchangeFactories" xsi:type="array">
+                <item name="amqp" xsi:type="object">Magento\Framework\Amqp\Bulk\ExchangeFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\QueueFactory">
+        <arguments>
+            <argument name="queueFactories" xsi:type="array">
+                <item name="amqp" xsi:type="object">Magento\Framework\Amqp\QueueFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Framework\Amqp\Bulk\ExchangeFactory" type="Magento\Framework\Amqp\ExchangeFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">\Magento\Framework\Amqp\Bulk\Exchange</argument>
+        </arguments>
+    </virtualType>
+</config>
diff --git a/app/code/Magento/Amqp/etc/module.xml b/app/code/Magento/Amqp/etc/module.xml
new file mode 100644
index 00000000000..1768a9b121c
--- /dev/null
+++ b/app/code/Magento/Amqp/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_Amqp" />
+</config>
diff --git a/app/code/Magento/Amqp/registration.php b/app/code/Magento/Amqp/registration.php
new file mode 100644
index 00000000000..17d8382c698
--- /dev/null
+++ b/app/code/Magento/Amqp/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Amqp', __DIR__);
diff --git a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
index c4118792255..34f2b7d53d9 100644
--- a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
+++ b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
@@ -5,13 +5,35 @@
  */
 namespace Magento\Analytics\Block\Adminhtml\System\Config;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Provides label with default Time Zone
  */
 class CollectionTimeLabel extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
-     * Add default time zone to comment
+     * @var \Magento\Framework\Locale\ResolverInterface
+     */
+    private $localeResolver;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param array $data
+     * @param \Magento\Framework\Locale\ResolverInterface|null $localeResolver
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        array $data = [],
+        \Magento\Framework\Locale\ResolverInterface $localeResolver = null
+    ) {
+        $this->localeResolver = $localeResolver ?:
+            ObjectManager::getInstance()->get(\Magento\Framework\Locale\ResolverInterface::class);
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Add current time zone to comment, properly translated according to locale
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
@@ -19,7 +41,9 @@ class CollectionTimeLabel extends \Magento\Config\Block\System\Config\Form\Field
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
         $timeZoneCode = $this->_localeDate->getConfigTimezone();
-        $getLongTimeZoneName = \IntlTimeZone::createTimeZone($timeZoneCode)->getDisplayName();
+        $locale = $this->localeResolver->getLocale();
+        $getLongTimeZoneName = \IntlTimeZone::createTimeZone($timeZoneCode)
+            ->getDisplayName(false, \IntlTimeZone::DISPLAY_LONG, $locale);
         $element->setData(
             'comment',
             sprintf("%s (%s)", $getLongTimeZoneName, $timeZoneCode)
diff --git a/app/code/Magento/Analytics/Setup/Patch/Data/PrepareInitialConfig.php b/app/code/Magento/Analytics/Setup/Patch/Data/PrepareInitialConfig.php
index 609dadc5114..a352854a8b7 100644
--- a/app/code/Magento/Analytics/Setup/Patch/Data/PrepareInitialConfig.php
+++ b/app/code/Magento/Analytics/Setup/Patch/Data/PrepareInitialConfig.php
@@ -7,10 +7,9 @@
 namespace Magento\Analytics\Setup\Patch\Data;
 
 use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Initial patch.
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
index a652cf6b3d5..462b3c909a7 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -9,6 +9,7 @@
 use Magento\Backend\Block\Template\Context;
 use Magento\Framework\Data\Form;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
@@ -34,6 +35,11 @@ class CollectionTimeLabelTest extends \PHPUnit\Framework\TestCase
      */
     private $abstractElementMock;
 
+    /**
+     * @var ResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeResolver;
+
     protected function setUp()
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
@@ -53,12 +59,17 @@ protected function setUp()
         $this->contextMock->expects($this->any())
             ->method('getLocaleDate')
             ->willReturn($this->timeZoneMock);
+        $this->localeResolver = $this->getMockBuilder(ResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLocale'])
+            ->getMockForAbstractClass();
 
         $objectManager = new ObjectManager($this);
         $this->collectionTimeLabel = $objectManager->getObject(
             CollectionTimeLabel::class,
             [
-                'context' => $this->contextMock
+                'context' => $this->contextMock,
+                'localeResolver' => $this->localeResolver
             ]
         );
     }
@@ -73,6 +84,9 @@ public function testRender()
         $this->abstractElementMock->expects($this->any())
             ->method('getComment')
             ->willReturn('Eastern Standard Time (America/New_York)');
+        $this->localeResolver->expects($this->once())
+            ->method('getLocale')
+            ->willReturn('en_US');
         $this->assertRegexp(
             "/Eastern Standard Time \(America\/New_York\)/",
             $this->collectionTimeLabel->render($this->abstractElementMock)
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php
new file mode 100644
index 00000000000..f5dd5bb13ea
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * Interface BulkSummaryInterface
+ * @api
+ * @since 100.2.0
+ */
+interface BulkSummaryInterface extends \Magento\Framework\Bulk\BulkSummaryInterface
+{
+    /**
+     * Retrieve existing extension attributes object.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface|null
+     * @since 100.2.0
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $extensionAttributes
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setExtensionAttributes(
+        \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $extensionAttributes
+    );
+}
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/OperationInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/OperationInterface.php
new file mode 100644
index 00000000000..95366a96a87
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/OperationInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * Class OperationInterface
+ * @api
+ * @since 100.2.0
+ */
+interface OperationInterface extends \Magento\Framework\Bulk\OperationInterface
+{
+    /**
+     * Retrieve existing extension attributes object.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface|null
+     * @since 100.2.0
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface $extensionAttributes
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setExtensionAttributes(
+        \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface $extensionAttributes
+    );
+}
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/OperationListInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/OperationListInterface.php
new file mode 100644
index 00000000000..474ca6b9488
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/OperationListInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * List of bulk operations. Used for mass save of operations via entity manager.
+ * @api
+ * @since 100.2.0
+ */
+interface OperationListInterface
+{
+    /**
+     * Get list of operations.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
+     * @since 100.2.0
+     */
+    public function getItems();
+}
diff --git a/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/BackButton.php b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/BackButton.php
new file mode 100644
index 00000000000..c2591987da0
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/BackButton.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\Framework\UrlInterface;
+
+/**
+ * Back button configuration provider
+ */
+class BackButton implements ButtonProviderInterface
+{
+    /**
+     * URL builder
+     *
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @param UrlInterface $urlBuilder
+     */
+    public function __construct(
+        UrlInterface $urlBuilder
+    ) {
+        $this->urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * Retrieve button data
+     *
+     * @return array button configuration
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Back'),
+            'on_click' => sprintf("location.href = '%s';", $this->urlBuilder->getUrl('*/')),
+            'class' => 'back',
+            'sort_order' => 10
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/DoneButton.php b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/DoneButton.php
new file mode 100644
index 00000000000..5e30c20fd2f
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/DoneButton.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\Framework\Bulk\OperationInterface;
+
+/**
+ * Back button configuration provider
+ */
+class DoneButton implements ButtonProviderInterface
+{
+    /**
+     * @var \Magento\Framework\Bulk\BulkStatusInterface
+     */
+    private $bulkStatus;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus
+     * @param \Magento\Framework\App\RequestInterface $request
+     */
+    public function __construct(
+        \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus,
+        \Magento\Framework\App\RequestInterface $request
+    ) {
+        $this->bulkStatus = $bulkStatus;
+        $this->request = $request;
+    }
+
+    /**
+     * Retrieve button data
+     *
+     * @return array button configuration
+     */
+    public function getButtonData()
+    {
+        $uuid = $this->request->getParam('uuid');
+        $operationsCount = $this->bulkStatus->getOperationsCountByBulkIdAndStatus(
+            $uuid,
+            OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+        );
+        $button = [];
+
+        if ($this->request->getParam('buttons') && $operationsCount === 0) {
+            $button = [
+                'label' => __('Done'),
+                'class' => 'primary',
+                'sort_order' => 10,
+                'on_click' => '',
+                'data_attribute' => [
+                    'mage-init' => [
+                        'Magento_Ui/js/form/button-adapter' => [
+                            'actions' => [
+                                [
+                                    'targetName' => 'notification_area.notification_area.modalContainer.modal',
+                                    'actionName' => 'closeModal'
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ];
+        }
+
+        return $button;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/RetryButton.php b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/RetryButton.php
new file mode 100644
index 00000000000..9051f1ab9d4
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Block/Adminhtml/Bulk/Details/RetryButton.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * Retry button configuration provider
+ */
+class RetryButton implements ButtonProviderInterface
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\Operation\Details
+     */
+    private $details;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var string
+     */
+    private $targetName;
+
+    /**
+     * RetryButton constructor.
+     *
+     * @param \Magento\AsynchronousOperations\Model\Operation\Details $details
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param string $targetName
+     */
+    public function __construct(
+        \Magento\AsynchronousOperations\Model\Operation\Details $details,
+        \Magento\Framework\App\RequestInterface $request,
+        $targetName = 'bulk_details_form.bulk_details_form'
+    ) {
+        $this->details = $details;
+        $this->request = $request;
+        $this->targetName = $targetName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getButtonData()
+    {
+        $uuid = $this->request->getParam('uuid');
+        $details = $this->details->getDetails($uuid);
+        if ($details['failed_retriable'] === 0) {
+            return [];
+        }
+        return [
+            'label' => __('Retry'),
+            'class' => 'retry primary',
+            'data_attribute' => [
+                'mage-init' => ['button' => ['event' => 'save']],
+                'form-role' => 'save',
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
new file mode 100644
index 00000000000..9e9dbd3dd67
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Controller\Adminhtml\Bulk;
+
+/**
+ * Class View Opertion Details Controller
+ */
+class Details extends \Magento\Backend\App\Action
+{
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    private $resultPageFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\AccessValidator
+     */
+    private $accessValidator;
+
+    /**
+     * @var string
+     */
+    private $menuId;
+
+    /**
+     * Details constructor.
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\AsynchronousOperations\Model\AccessValidator $accessValidator
+     * @param string $menuId
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\AsynchronousOperations\Model\AccessValidator $accessValidator,
+        $menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations'
+    ) {
+        $this->resultPageFactory = $resultPageFactory;
+        $this->accessValidator = $accessValidator;
+        $this->menuId = $menuId;
+        parent::__construct($context);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Logging::system_magento_logging_bulk_operations')
+            && $this->accessValidator->isAllowed($this->getRequest()->getParam('uuid'));
+    }
+    
+    /**
+     * Bulk details action
+     *
+     * @return \Magento\Framework\View\Result\Page
+     */
+    public function execute()
+    {
+        $bulkId = $this->getRequest()->getParam('uuid');
+        $resultPage = $this->resultPageFactory->create();
+        $resultPage->initLayout();
+        $this->_setActiveMenu($this->menuId);
+        $resultPage->getConfig()->getTitle()->prepend(__('Action Details - #' . $bulkId));
+
+        return $resultPage;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Retry.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Retry.php
new file mode 100644
index 00000000000..62e6b9ba455
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Retry.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Controller\Adminhtml\Bulk;
+
+use Magento\AsynchronousOperations\Model\BulkManagement;
+use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Backend\App\Action;
+use Magento\AsynchronousOperations\Model\AccessValidator;
+use Magento\Framework\Controller\ResultFactory;
+
+/**
+ * Class Bulk Retry Controller
+ */
+class Retry extends Action
+{
+    /**
+     * @var BulkManagement
+     */
+    private $bulkManagement;
+
+    /**
+     * @var BulkNotificationManagement
+     */
+    private $notificationManagement;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\AccessValidator
+     */
+    private $accessValidator;
+
+    /**
+     * Retry constructor.
+     * @param Context $context
+     * @param BulkManagement $bulkManagement
+     * @param BulkNotificationManagement $notificationManagement
+     * @param AccessValidator $accessValidator
+     */
+    public function __construct(
+        Context $context,
+        BulkManagement $bulkManagement,
+        BulkNotificationManagement $notificationManagement,
+        AccessValidator $accessValidator
+    ) {
+        parent::__construct($context);
+        $this->bulkManagement = $bulkManagement;
+        $this->notificationManagement = $notificationManagement;
+        $this->accessValidator = $accessValidator;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Logging::system_magento_logging_bulk_operations')
+            && $this->accessValidator->isAllowed($this->getRequest()->getParam('uuid'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute()
+    {
+        $bulkUuid = $this->getRequest()->getParam('uuid');
+        $isAjax = $this->getRequest()->getParam('isAjax');
+        $operationsToRetry = (array)$this->getRequest()->getParam('operations_to_retry', []);
+        $errorCodes = [];
+        foreach ($operationsToRetry as $operationData) {
+            if (isset($operationData['error_code'])) {
+                $errorCodes[] = (int)$operationData['error_code'];
+            }
+        }
+
+        $affectedOperations = $this->bulkManagement->retryBulk($bulkUuid, $errorCodes);
+        $this->notificationManagement->ignoreBulks([$bulkUuid]);
+        if (!$isAjax) {
+            $this->messageManager->addSuccessMessage(
+                __('%1 item(s) have been scheduled for update."', $affectedOperations)
+            );
+            /** @var Redirect $result */
+            $result = $this->resultRedirectFactory->create();
+            $result->setPath('bulk/index');
+        } else {
+            /** @var \Magento\Framework\Controller\Result\Json $result */
+            $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+            $result->setHttpResponseCode(200);
+            $response = new \Magento\Framework\DataObject();
+            $response->setError(0);
+
+            $result->setData($response);
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php
new file mode 100644
index 00000000000..5a2b9c0a34e
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Controller\Adminhtml\Index;
+
+class Index extends \Magento\Backend\App\Action
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Logging::system_magento_logging_bulk_operations';
+
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    private $resultPageFactory;
+
+    /**
+     * @var string
+     */
+    private $menuId;
+
+    /**
+     * Details constructor.
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param string $menuId
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        $menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations'
+    ) {
+        $this->resultPageFactory = $resultPageFactory;
+        $this->menuId = $menuId;
+        parent::__construct($context);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        return parent::_isAllowed();
+    }
+
+    /**
+     * Bulk list action
+     *
+     * @return \Magento\Framework\View\Result\Page
+     */
+    public function execute()
+    {
+        $resultPage = $this->resultPageFactory->create();
+        $resultPage->initLayout();
+        $this->_setActiveMenu($this->menuId);
+        $resultPage->getConfig()->getTitle()->prepend(__('Bulk Actions Log'));
+        return $resultPage;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Notification/Dismiss.php b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Notification/Dismiss.php
new file mode 100644
index 00000000000..0a71c130fb2
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Notification/Dismiss.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Controller\Adminhtml\Notification;
+
+use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\App\Action;
+use Magento\Framework\Controller\ResultFactory;
+
+/**
+ * Class Bulk Notification Dismiss Controller
+ */
+class Dismiss extends Action
+{
+    /**
+     * @var BulkNotificationManagement
+     */
+    private $notificationManagement;
+
+    /**
+     * Class constructor.
+     *
+     * @param Context $context
+     * @param BulkNotificationManagement $notificationManagement
+     */
+    public function __construct(
+        Context $context,
+        BulkNotificationManagement $notificationManagement
+    ) {
+        parent::__construct($context);
+        $this->notificationManagement = $notificationManagement;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Logging::system_magento_logging_bulk_operations');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute()
+    {
+        $bulkUuids = [];
+        foreach ((array)$this->getRequest()->getParam('uuid', []) as $bulkUuid) {
+            $bulkUuids[] = (string)$bulkUuid;
+        }
+
+        $isAcknowledged = $this->notificationManagement->acknowledgeBulks($bulkUuids);
+
+        /** @var \Magento\Framework\Controller\Result\Json $result */
+        $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        if (!$isAcknowledged) {
+            $result->setHttpResponseCode(400);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Cron/BulkCleanup.php b/app/code/Magento/AsynchronousOperations/Cron/BulkCleanup.php
new file mode 100644
index 00000000000..7c8da3c1c42
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Cron/BulkCleanup.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Cron;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+class BulkCleanup
+{
+    /**
+     * @var DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $date;
+
+    /**
+     * BulkCleanup constructor.
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resourceConnection
+     * @param DateTime $dateTime
+     * @param ScopeConfigInterface $scopeConfig
+     * @param DateTime\DateTime $time
+     */
+    public function __construct(
+        MetadataPool $metadataPool,
+        ResourceConnection $resourceConnection,
+        DateTime $dateTime,
+        ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\Stdlib\DateTime\DateTime $time
+    ) {
+        $this->metadataPool = $metadataPool;
+        $this->resourceConnection = $resourceConnection;
+        $this->dateTime = $dateTime;
+        $this->scopeConfig = $scopeConfig;
+        $this->date = $time;
+    }
+
+    /**
+     * Remove all expired bulks and corresponding operations
+     *
+     * @return void
+     */
+    public function execute()
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+
+        $bulkLifetime = 3600 * 24 * (int)$this->scopeConfig->getValue('system/bulk/lifetime');
+        $maxBulkStartTime = $this->dateTime->formatDate($this->date->gmtTimestamp() - $bulkLifetime);
+        $connection->delete($metadata->getEntityTable(), ['start_time <= ?' => $maxBulkStartTime]);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/AccessValidator.php b/app/code/Magento/AsynchronousOperations/Model/AccessValidator.php
new file mode 100644
index 00000000000..a14ec254cf8
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/AccessValidator.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+/**
+ * Class AccessValidator
+ */
+class AccessValidator
+{
+    /**
+     * @var \Magento\Authorization\Model\UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var \Magento\Framework\EntityManager\EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory
+     */
+    private $bulkSummaryFactory;
+
+    /**
+     * AccessValidator constructor.
+     * @param \Magento\Authorization\Model\UserContextInterface $userContext
+     * @param \Magento\Framework\EntityManager\EntityManager $entityManager
+     * @param \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory $bulkSummaryFactory
+     */
+    public function __construct(
+        \Magento\Authorization\Model\UserContextInterface $userContext,
+        \Magento\Framework\EntityManager\EntityManager $entityManager,
+        \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory $bulkSummaryFactory
+    ) {
+        $this->userContext = $userContext;
+        $this->entityManager = $entityManager;
+        $this->bulkSummaryFactory = $bulkSummaryFactory;
+    }
+
+    /**
+     * Check if content allowed for current user
+     *
+     * @param int $bulkUuid
+     * @return bool
+     */
+    public function isAllowed($bulkUuid)
+    {
+        /** @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface $bulkSummary */
+        $bulkSummary = $this->entityManager->load(
+            $this->bulkSummaryFactory->create(),
+            $bulkUuid
+        );
+        return $bulkSummary->getUserId() === $this->userContext->getUserId();
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkDescription/Options.php b/app/code/Magento/AsynchronousOperations/Model/BulkDescription/Options.php
new file mode 100644
index 00000000000..08e1a863b25
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkDescription/Options.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\BulkDescription;
+
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+/**
+ * Class for grid options
+ */
+class Options implements \Magento\Framework\Data\OptionSourceInterface
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory
+     */
+    private $bulkCollectionFactory;
+
+    /**
+     * @var \Magento\Authorization\Model\UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * Options constructor.
+     * @param \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollection
+     * @param \Magento\Authorization\Model\UserContextInterface $userContext
+     */
+    public function __construct(
+        \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollection,
+        \Magento\Authorization\Model\UserContextInterface $userContext
+    ) {
+        $this->bulkCollectionFactory = $bulkCollection;
+        $this->userContext = $userContext;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray()
+    {
+        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection $collection */
+        $collection = $this->bulkCollectionFactory->create();
+
+        /** @var \Magento\Framework\DB\Select $select */
+        $select = $collection->getSelect();
+        $select->reset();
+        $select->distinct(true);
+        $select->from($collection->getMainTable(), ['description']);
+        $select->where('user_id = ?', $this->userContext->getUserId());
+
+        $options = [];
+
+        /** @var BulkSummaryInterface $item */
+        foreach ($collection->getItems() as $item) {
+            $options[] = [
+                'value' => $item->getDescription(),
+                'label' => $item->getDescription()
+            ];
+        }
+        return $options;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php b/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php
new file mode 100644
index 00000000000..4f086ce8ac2
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\MessageQueue\BulkPublisherInterface;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
+
+/**
+ * Class BulkManagement
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BulkManagement implements \Magento\Framework\Bulk\BulkManagementInterface
+{
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var BulkSummaryInterfaceFactory
+     */
+    private $bulkSummaryFactory;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $operationCollectionFactory;
+
+    /**
+     * @var BulkPublisherInterface
+     */
+    private $publisher;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * BulkManagement constructor.
+     * @param EntityManager $entityManager
+     * @param BulkSummaryInterfaceFactory $bulkSummaryFactory
+     * @param CollectionFactory $operationCollectionFactory
+     * @param BulkPublisherInterface $publisher
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resourceConnection
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        EntityManager $entityManager,
+        BulkSummaryInterfaceFactory $bulkSummaryFactory,
+        CollectionFactory $operationCollectionFactory,
+        BulkPublisherInterface $publisher,
+        MetadataPool $metadataPool,
+        ResourceConnection $resourceConnection,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        $this->entityManager = $entityManager;
+        $this->bulkSummaryFactory= $bulkSummaryFactory;
+        $this->operationCollectionFactory = $operationCollectionFactory;
+        $this->metadataPool = $metadataPool;
+        $this->resourceConnection = $resourceConnection;
+        $this->publisher = $publisher;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function scheduleBulk($bulkUuid, array $operations, $description, $userId = null)
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+        // save bulk summary and related operations
+        $connection->beginTransaction();
+        try {
+            /** @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface $bulkSummary */
+            $bulkSummary = $this->bulkSummaryFactory->create();
+            $this->entityManager->load($bulkSummary, $bulkUuid);
+            $bulkSummary->setBulkId($bulkUuid);
+            $bulkSummary->setDescription($description);
+            $bulkSummary->setUserId($userId);
+            $bulkSummary->setOperationCount((int)$bulkSummary->getOperationCount() + count($operations));
+
+            $this->entityManager->save($bulkSummary);
+
+            $connection->commit();
+        } catch (\Exception $exception) {
+            $connection->rollBack();
+            $this->logger->critical($exception->getMessage());
+            return false;
+        }
+        $this->publishOperations($operations);
+
+        return true;
+    }
+
+    /**
+     * Retry bulk operations that failed due to given errors.
+     *
+     * @param string $bulkUuid target bulk UUID
+     * @param array $errorCodes list of corresponding error codes
+     * @return int number of affected bulk operations
+     */
+    public function retryBulk($bulkUuid, array $errorCodes)
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+
+        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation[] $retriablyFailedOperations */
+        $retriablyFailedOperations = $this->operationCollectionFactory->create()
+            ->addFieldToFilter('error_code', ['in' => $errorCodes])
+            ->addFieldToFilter('bulk_uuid', ['eq' => $bulkUuid])
+            ->getItems();
+
+        // remove corresponding operations from database (i.e. move them to 'open' status)
+        $connection->beginTransaction();
+        try {
+            $operationIds = [];
+            $currentBatchSize = 0;
+            $maxBatchSize = 10000;
+            /** @var OperationInterface $operation */
+            foreach ($retriablyFailedOperations as $operation) {
+                if ($currentBatchSize === $maxBatchSize) {
+                    $connection->delete(
+                        $this->resourceConnection->getTableName('magento_operation'),
+                        $connection->quoteInto('id IN (?)', $operationIds)
+                    );
+                    $operationIds = [];
+                    $currentBatchSize = 0;
+                }
+                $currentBatchSize++;
+                $operationIds[] = $operation->getId();
+                // Rescheduled operations must be put in queue in 'open' state (i.e. without ID)
+                $operation->setId(null);
+            }
+            // remove operations from the last batch
+            if (!empty($operationIds)) {
+                $connection->delete(
+                    $this->resourceConnection->getTableName('magento_operation'),
+                    $connection->quoteInto('id IN (?)', $operationIds)
+                );
+            }
+
+            $connection->commit();
+        } catch (\Exception $exception) {
+            $connection->rollBack();
+            $this->logger->critical($exception->getMessage());
+            return 0;
+        }
+        $this->publishOperations($retriablyFailedOperations);
+
+        return count($retriablyFailedOperations);
+    }
+
+    /**
+     * Publish list of operations to the corresponding message queues.
+     *
+     * @param array $operations
+     * @return void
+     */
+    private function publishOperations(array $operations)
+    {
+        $operationsByTopics = [];
+        foreach ($operations as $operation) {
+            $operationsByTopics[$operation->getTopicName()][] = $operation;
+        }
+        foreach ($operationsByTopics as $topicName => $operations) {
+            $this->publisher->publish($topicName, $operations);
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function deleteBulk($bulkId)
+    {
+        return $this->entityManager->delete(
+            $this->entityManager->load(
+                $this->bulkSummaryFactory->create(),
+                $bulkId
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkNotificationManagement.php b/app/code/Magento/AsynchronousOperations/Model/BulkNotificationManagement.php
new file mode 100644
index 00000000000..2ba7f7fe5e3
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkNotificationManagement.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory as BulkCollectionFactory;
+use Magento\Framework\Data\Collection;
+
+/**
+ * Class for bulk notification manager
+ */
+class BulkNotificationManagement
+{
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var BulkCollectionFactory
+     */
+    private $bulkCollectionFactory;
+
+    /**
+     * BulkManagement constructor.
+     *
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resourceConnection
+     * @param BulkCollectionFactory $bulkCollectionFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        MetadataPool $metadataPool,
+        ResourceConnection $resourceConnection,
+        BulkCollectionFactory $bulkCollectionFactory,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        $this->metadataPool = $metadataPool;
+        $this->resourceConnection = $resourceConnection;
+        $this->bulkCollectionFactory = $bulkCollectionFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Mark given bulks as acknowledged.
+     * Notifications related to these bulks will not appear in notification area.
+     *
+     * @param array $bulkUuids
+     * @return bool true on success or false on failure
+     */
+    public function acknowledgeBulks(array $bulkUuids)
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+
+        try {
+            $connection->insertArray(
+                $this->resourceConnection->getTableName('magento_acknowledged_bulk'),
+                ['bulk_uuid'],
+                $bulkUuids
+            );
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception->getMessage());
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Remove given bulks from acknowledged list.
+     * Notifications related to these bulks will appear again in notification area.
+     *
+     * @param array $bulkUuids
+     * @return bool true on success or false on failure
+     */
+    public function ignoreBulks(array $bulkUuids)
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+
+        try {
+            $connection->delete(
+                $this->resourceConnection->getTableName('magento_acknowledged_bulk'),
+                ['bulk_uuid IN(?)' => $bulkUuids]
+            );
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception->getMessage());
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Retrieve all bulks that were acknowledged by given user.
+     *
+     * @param int $userId
+     * @return BulkSummaryInterface[]
+     */
+    public function getAcknowledgedBulksByUser($userId)
+    {
+        $bulks = $this->bulkCollectionFactory->create()
+            ->join(
+                ['acknowledged_bulk' => $this->resourceConnection->getTableName('magento_acknowledged_bulk')],
+                'main_table.uuid = acknowledged_bulk.bulk_uuid',
+                []
+            )->addFieldToFilter('user_id', $userId)
+            ->addOrder('start_time', Collection::SORT_ORDER_DESC)
+            ->getItems();
+
+        return $bulks;
+    }
+
+    /**
+     * Retrieve all bulks that were not acknowledged by given user.
+     *
+     * @param int $userId
+     * @return BulkSummaryInterface[]
+     */
+    public function getIgnoredBulksByUser($userId)
+    {
+        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection $bulkCollection */
+        $bulkCollection = $this->bulkCollectionFactory->create();
+        $bulkCollection->getSelect()->joinLeft(
+            ['acknowledged_bulk' => $this->resourceConnection->getTableName('magento_acknowledged_bulk')],
+            'main_table.uuid = acknowledged_bulk.bulk_uuid',
+            ['acknowledged_bulk.bulk_uuid']
+        );
+        $bulks = $bulkCollection->addFieldToFilter('user_id', $userId)
+            ->addFieldToFilter('acknowledged_bulk.bulk_uuid', ['null' => true])
+            ->addOrder('start_time', Collection::SORT_ORDER_DESC)
+            ->getItems();
+
+        return $bulks;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkStatus.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus.php
new file mode 100644
index 00000000000..c37ae0d23dd
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkStatus.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql;
+use Magento\Framework\EntityManager\MetadataPool;
+
+/**
+ * Class BulkStatus
+ */
+class BulkStatus implements \Magento\Framework\Bulk\BulkStatusInterface
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory
+     */
+    private $bulkCollectionFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory
+     */
+    private $operationCollectionFactory;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var CalculatedStatusSql
+     */
+    private $calculatedStatusSql;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * BulkStatus constructor.
+     * @param ResourceModel\Bulk\CollectionFactory $bulkCollection
+     * @param ResourceModel\Operation\CollectionFactory $operationCollection
+     * @param ResourceConnection $resourceConnection
+     * @param CalculatedStatusSql $calculatedStatusSql
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(
+        \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollection,
+        \Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory $operationCollection,
+        ResourceConnection $resourceConnection,
+        CalculatedStatusSql $calculatedStatusSql,
+        MetadataPool $metadataPool
+    ) {
+        $this->operationCollectionFactory = $operationCollection;
+        $this->bulkCollectionFactory = $bulkCollection;
+        $this->resourceConnection = $resourceConnection;
+        $this->calculatedStatusSql = $calculatedStatusSql;
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFailedOperationsByBulkId($bulkUuid, $failureType = null)
+    {
+        $failureCodes = $failureType
+            ? [$failureType]
+            : [
+                OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+                OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED
+            ];
+        $operations = $this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->addFieldToFilter('status', $failureCodes)
+            ->getItems();
+        return $operations;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status)
+    {
+        if ($status === OperationInterface::STATUS_TYPE_OPEN) {
+            /**
+             * Total number of operations that has been scheduled within the given bulk
+             */
+            $allOperationsQty = $this->getOperationCount($bulkUuid);
+
+            /**
+             * Number of operations that has been processed (i.e. operations with any status but 'open')
+             */
+            $allProcessedOperationsQty = (int)$this->operationCollectionFactory->create()
+                ->addFieldToFilter('bulk_uuid', $bulkUuid)
+                ->getSize();
+
+            return $allOperationsQty - $allProcessedOperationsQty;
+        }
+
+        /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection $collection */
+        $collection = $this->operationCollectionFactory->create();
+        return $collection->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->addFieldToFilter('status', $status)
+            ->getSize();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBulksByUser($userId)
+    {
+        /** @var ResourceModel\Bulk\Collection $collection */
+        $collection = $this->bulkCollectionFactory->create();
+        $operationTableName = $this->resourceConnection->getTableName('magento_operation');
+        $statusesArray = [
+            OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+            OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+            BulkSummaryInterface::NOT_STARTED,
+            OperationInterface::STATUS_TYPE_OPEN,
+            OperationInterface::STATUS_TYPE_COMPLETE
+        ];
+        $select = $collection->getSelect();
+        $select->columns(['status' => $this->calculatedStatusSql->get($operationTableName)])
+            ->order(new \Zend_Db_Expr('FIELD(status, ' . implode(',', $statusesArray) . ')'));
+        $collection->addFieldToFilter('user_id', $userId)
+            ->addOrder('start_time');
+
+        return $collection->getItems();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBulkStatus($bulkUuid)
+    {
+        /**
+         * Number of operations that has been processed (i.e. operations with any status but 'open')
+         */
+        $allProcessedOperationsQty = (int)$this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)
+            ->getSize();
+
+        if ($allProcessedOperationsQty == 0) {
+            return BulkSummaryInterface::NOT_STARTED;
+        }
+
+        /**
+         * Total number of operations that has been scheduled within the given bulk
+         */
+        $allOperationsQty = $this->getOperationCount($bulkUuid);
+
+        /**
+         * Number of operations that has not been started yet (i.e. operations with status 'open')
+         */
+        $allOpenOperationsQty = $allOperationsQty - $allProcessedOperationsQty;
+
+        /**
+         * Number of operations that has been completed successfully
+         */
+        $allCompleteOperationsQty = $this->operationCollectionFactory->create()
+            ->addFieldToFilter('bulk_uuid', $bulkUuid)->addFieldToFilter(
+                'status',
+                OperationInterface::STATUS_TYPE_COMPLETE
+            )->getSize();
+
+        if ($allCompleteOperationsQty == $allOperationsQty) {
+            return BulkSummaryInterface::FINISHED_SUCCESSFULLY;
+        }
+
+        if ($allOpenOperationsQty > 0 && $allOpenOperationsQty !== $allOperationsQty) {
+            return BulkSummaryInterface::IN_PROGRESS;
+        }
+
+        return BulkSummaryInterface::FINISHED_WITH_FAILURE;
+    }
+
+    /**
+     * Get total number of operations that has been scheduled within the given bulk.
+     *
+     * @param string $bulkUuid
+     * @return int
+     */
+    private function getOperationCount($bulkUuid)
+    {
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+
+        return (int)$connection->fetchOne(
+            $connection->select()
+                ->from($metadata->getEntityTable(), 'operation_count')
+                ->where('uuid = ?', $bulkUuid)
+        );
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkStatus/CalculatedStatusSql.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/CalculatedStatusSql.php
new file mode 100644
index 00000000000..dda3ed3b673
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/CalculatedStatusSql.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model\BulkStatus;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+
+class CalculatedStatusSql
+{
+    /**
+     * Get sql to calculate bulk status
+     *
+     * @param string $operationTableName
+     * @return \Zend_Db_Expr
+     */
+    public function get($operationTableName)
+    {
+        return new \Zend_Db_Expr(
+            '(IF(
+                (SELECT count(*)
+                    FROM ' . $operationTableName . '
+                    WHERE bulk_uuid = main_table.uuid
+                ) = 0,
+                ' . BulkSummaryInterface::NOT_STARTED . ',
+                (SELECT MAX(status) FROM ' . $operationTableName . ' WHERE bulk_uuid = main_table.uuid)
+            ))'
+        );
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Options.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Options.php
new file mode 100644
index 00000000000..47c317138ec
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Options.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\BulkStatus;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+
+/**
+ * Class Options
+ */
+class Options implements \Magento\Framework\Data\OptionSourceInterface
+{
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => BulkSummaryInterface::NOT_STARTED,
+                'label' => 'Not Started'
+            ],
+            [
+                'value' => BulkSummaryInterface::IN_PROGRESS,
+                'label' => 'In Progress'
+            ],
+            [
+                'value' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+                'label' => 'Finished Successfully'
+            ],
+            [
+                'value' => BulkSummaryInterface::FINISHED_WITH_FAILURE,
+                'label' => 'Finished with Failure'
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkSummary.php b/app/code/Magento/AsynchronousOperations/Model/BulkSummary.php
new file mode 100644
index 00000000000..e99233d0769
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkSummary.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\Framework\DataObject;
+
+/**
+ * Class BulkSummary
+ */
+class BulkSummary extends DataObject implements BulkSummaryInterface, \Magento\Framework\Api\ExtensibleDataInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getBulkId()
+    {
+        return $this->getData(self::BULK_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setBulkId($bulkUuid)
+    {
+        return $this->setData(self::BULK_ID, $bulkUuid);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDescription()
+    {
+        return $this->getData(self::DESCRIPTION);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setDescription($description)
+    {
+        return $this->setData(self::DESCRIPTION, $description);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getStartTime()
+    {
+        return $this->getData(self::START_TIME);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setStartTime($timestamp)
+    {
+        return $this->setData(self::START_TIME, $timestamp);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUserId()
+    {
+        return $this->getData(self::USER_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setUserId($userId)
+    {
+        return $this->setData(self::USER_ID, $userId);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOperationCount()
+    {
+        return $this->getData(self::OPERATION_COUNT);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setOperationCount($operationCount)
+    {
+        return $this->setData(self::OPERATION_COUNT, $operationCount);
+    }
+
+    /**
+     * Retrieve existing extension attributes object.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->getData(self::EXTENSION_ATTRIBUTES_KEY);
+    }
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $extensionAttributes
+    ) {
+        return $this->setData(self::EXTENSION_ATTRIBUTES_KEY, $extensionAttributes);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/Entity/BulkSummaryMapper.php b/app/code/Magento/AsynchronousOperations/Model/Entity/BulkSummaryMapper.php
new file mode 100644
index 00000000000..94ebbdca445
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/Entity/BulkSummaryMapper.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\Entity;
+
+use Magento\Framework\EntityManager\MapperInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+
+/**
+ * @deprecated 100.2.0
+ */
+class BulkSummaryMapper implements MapperInterface
+{
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        MetadataPool $metadataPool,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->metadataPool = $metadataPool;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function entityToDatabase($entityType, $data)
+    {
+        // workaround for delete/update operations that are currently using only primary key as identifier
+        if (!empty($data['uuid'])) {
+            $metadata = $this->metadataPool->getMetadata($entityType);
+            $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+            $select = $connection->select()->from($metadata->getEntityTable(), 'id')->where("uuid = ?", $data['uuid']);
+            $identifier = $connection->fetchOne($select);
+            if ($identifier !== false) {
+                $data['id'] = $identifier;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @codeCoverageIgnore
+     */
+    public function databaseToEntity($entityType, $data)
+    {
+        return $data;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/Operation.php b/app/code/Magento/AsynchronousOperations/Model/Operation.php
new file mode 100644
index 00000000000..dbfce3ccd8b
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/Operation.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Api\ExtensibleDataInterface;
+
+/**
+ * Class Operation
+ */
+class Operation extends DataObject implements OperationInterface, ExtensibleDataInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getId()
+    {
+        return $this->getData(self::ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setId($id)
+    {
+        return $this->setData(self::ID, $id);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBulkUuid()
+    {
+        return $this->getData(self::BULK_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setBulkUuid($bulkId)
+    {
+        return $this->setData(self::BULK_ID, $bulkId);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTopicName()
+    {
+        return $this->getData(self::TOPIC_NAME);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setTopicName($topic)
+    {
+        return $this->setData(self::TOPIC_NAME, $topic);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSerializedData()
+    {
+        return $this->getData(self::SERIALIZED_DATA);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setSerializedData($serializedData)
+    {
+        return $this->setData(self::SERIALIZED_DATA, $serializedData);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getStatus()
+    {
+        return $this->getData(self::STATUS);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setStatus($status)
+    {
+        return $this->setData(self::STATUS, $status);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getResultMessage()
+    {
+        return $this->getData(self::RESULT_MESSAGE);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setResultMessage($resultMessage)
+    {
+        return $this->setData(self::RESULT_MESSAGE, $resultMessage);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getErrorCode()
+    {
+        return $this->getData(self::ERROR_CODE);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setErrorCode($errorCode)
+    {
+        return $this->setData(self::ERROR_CODE, $errorCode);
+    }
+
+    /**
+     * Retrieve existing extension attributes object.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->getData(self::EXTENSION_ATTRIBUTES_KEY);
+    }
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface $extensionAttributes
+    ) {
+        return $this->setData(self::EXTENSION_ATTRIBUTES_KEY, $extensionAttributes);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/Operation/Details.php b/app/code/Magento/AsynchronousOperations/Model/Operation/Details.php
new file mode 100644
index 00000000000..398934f0933
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/Operation/Details.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\Operation;
+
+use Magento\Framework\Bulk\OperationInterface;
+
+class Details
+{
+    /**
+     * @var array
+     */
+    private $operationCache = [];
+
+    /**
+     * @var \Magento\Framework\Bulk\BulkStatusInterface
+     */
+    private $bulkStatus;
+
+    /**
+     * Map between status codes and human readable indexes
+     * @var array
+     */
+    private $statusMap = [
+        OperationInterface::STATUS_TYPE_COMPLETE => 'operations_successful',
+        OperationInterface::STATUS_TYPE_RETRIABLY_FAILED => 'failed_retriable',
+        OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED => 'failed_not_retriable',
+    ];
+
+    /**
+     * @param \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus
+     */
+    public function __construct(
+        \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus
+    ) {
+        $this->bulkStatus = $bulkStatus;
+    }
+
+    /**
+     * Collect operations statistics for the bulk
+     *
+     * @param string $bulkUuid
+     * @return array
+     */
+    public function getDetails($bulkUuid)
+    {
+        $details = [
+            'operations_total' => 0,
+            'operations_successful' => 0,
+            'operations_failed' => 0,
+            'failed_retriable' => 0,
+            'failed_not_retriable' => 0,
+        ];
+
+        if (array_key_exists($bulkUuid, $this->operationCache)) {
+            return $this->operationCache[$bulkUuid];
+        }
+
+        foreach ($this->statusMap as $statusCode => $readableKey) {
+            $details[$readableKey] = $this->bulkStatus->getOperationsCountByBulkIdAndStatus(
+                $bulkUuid,
+                $statusCode
+            );
+        }
+
+        // total is sum of successful, retriable, not retriable and open operations
+        $details['operations_total'] = array_sum($details) + $this->bulkStatus->getOperationsCountByBulkIdAndStatus(
+            $bulkUuid,
+            OperationInterface::STATUS_TYPE_OPEN
+        );
+        $details['operations_failed'] = $details['failed_retriable'] + $details['failed_not_retriable'];
+        $this->operationCache[$bulkUuid] = $details;
+        return $details;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationList.php b/app/code/Magento/AsynchronousOperations/Model/OperationList.php
new file mode 100644
index 00000000000..7de62107415
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationList.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+/**
+ * List of bulk operations.
+ */
+class OperationList implements \Magento\AsynchronousOperations\Api\Data\OperationListInterface
+{
+    /**
+     * @var array
+     */
+    private $items;
+
+    /**
+     * @param array $items [optional]
+     */
+    public function __construct(array $items = [])
+    {
+        $this->items = $items;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getItems()
+    {
+        return $this->items;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php b/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php
new file mode 100644
index 00000000000..54b8a767584
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+use Magento\Framework\EntityManager\EntityManager;
+
+/**
+ * Class OperationManagement
+ */
+class OperationManagement implements \Magento\Framework\Bulk\OperationManagementInterface
+{
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var OperationInterfaceFactory
+     */
+    private $operationFactory;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * OperationManagement constructor.
+     *
+     * @param EntityManager $entityManager
+     * @param OperationInterfaceFactory $operationFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        EntityManager $entityManager,
+        OperationInterfaceFactory $operationFactory,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        $this->entityManager = $entityManager;
+        $this->operationFactory= $operationFactory;
+        $this->logger = $logger;
+    }
+    
+    /**
+     * @inheritDoc
+     */
+    public function changeOperationStatus($operationId, $status, $errorCode = null, $message = null, $data = null)
+    {
+        try {
+            $operationEntity = $this->operationFactory->create();
+            $this->entityManager->load($operationEntity, $operationId);
+            $operationEntity->setErrorCode($errorCode);
+            $operationEntity->setStatus($status);
+            $operationEntity->setResultMessage($message);
+            $operationEntity->setSerializedData($data);
+            $this->entityManager->save($operationEntity);
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception->getMessage());
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk.php
new file mode 100644
index 00000000000..d56d54359ee
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model\ResourceModel;
+
+/**
+ * Class Bulk
+ */
+class Bulk extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Initialize banner sales rule resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('magento_bulk', 'uuid');
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk/Collection.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk/Collection.php
new file mode 100644
index 00000000000..6dd997c5333
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Bulk/Collection.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\ResourceModel\Bulk;
+
+/**
+ * Class Collection
+ * @codeCoverageIgnore
+ */
+class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+{
+    /**
+     * Define collection item type and corresponding table
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Magento\AsynchronousOperations\Model\BulkSummary::class,
+            \Magento\AsynchronousOperations\Model\ResourceModel\Bulk::class
+        );
+        $this->setMainTable('magento_bulk');
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php
new file mode 100644
index 00000000000..061d0917e7a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model\ResourceModel;
+
+/**
+ * Class Operation
+ */
+class Operation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Initialize banner sales rule resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('magento_operation', 'id');
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/CheckIfExists.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/CheckIfExists.php
new file mode 100644
index 00000000000..46c4e4bc1c2
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/CheckIfExists.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\ResourceModel\Operation;
+
+use Magento\Framework\EntityManager\Operation\CheckIfExistsInterface;
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * CheckIfExists operation for list of bulk operations.
+ */
+class CheckIfExists implements CheckIfExistsInterface
+{
+    /**
+     * Always returns false because all operations will be saved using insertOnDuplicate query.
+     *
+     * @param object $entity
+     * @param array $arguments
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute($entity, $arguments = [])
+    {
+        return false;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Collection.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Collection.php
new file mode 100644
index 00000000000..18c5f09794c
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Collection.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\ResourceModel\Operation;
+
+/**
+ * Class Collection
+ * @codeCoverageIgnore
+ */
+class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+{
+    /**
+     * Define collection item type and corresponding table
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Magento\AsynchronousOperations\Model\Operation::class,
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation::class
+        );
+        $this->setMainTable('magento_operation');
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Create.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Create.php
new file mode 100644
index 00000000000..ce2357c6b2b
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/Create.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\ResourceModel\Operation;
+
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\EntityManager\TypeResolver;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Phrase;
+
+/**
+ * Create operation for list of bulk operations.
+ */
+class Create implements \Magento\Framework\EntityManager\Operation\CreateInterface
+{
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var TypeResolver
+     */
+    private $typeResolver;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param MetadataPool $metadataPool
+     * @param TypeResolver $typeResolver
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        MetadataPool $metadataPool,
+        TypeResolver $typeResolver,
+        ResourceConnection $resourceConnection
+    ) {
+        $this->metadataPool = $metadataPool;
+        $this->typeResolver = $typeResolver;
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Save all operations from the list in one query.
+     *
+     * @param object $entity
+     * @param array $arguments
+     * @return object
+     * @throws \Exception
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute($entity, $arguments = [])
+    {
+        $entityType = $this->typeResolver->resolve($entity);
+        $metadata = $this->metadataPool->getMetadata($entityType);
+        $connection = $this->resourceConnection->getConnection($metadata->getEntityConnectionName());
+        try {
+            $connection->beginTransaction();
+            $data = [];
+            foreach ($entity->getItems() as $operation) {
+                $data[] = $operation->getData();
+            }
+            $connection->insertOnDuplicate(
+                $metadata->getEntityTable(),
+                $data,
+                [
+                    'status',
+                    'error_code',
+                    'result_message',
+                ]
+            );
+            $connection->commit();
+        } catch (\Exception $e) {
+            $connection->rollBack();
+            throw $e;
+        }
+        return $entity;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php
new file mode 100644
index 00000000000..76c7820fa99
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model\ResourceModel\System\Message\Collection\Synchronized;
+
+/**
+ * Class Plugin to add bulks related notification messages to Synchronized Collection
+ */
+class Plugin
+{
+    /**
+     * @var \Magento\AdminNotification\Model\System\MessageFactory
+     */
+    private $messageFactory;
+
+    /**
+     * @var \Magento\Framework\Bulk\BulkStatusInterface
+     */
+    private $bulkStatus;
+
+    /**
+     * @var \Magento\Authorization\Model\UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\Operation\Details
+     */
+    private $operationDetails;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkNotificationManagement
+     */
+    private $bulkNotificationManagement;
+
+    /**
+     * @var \Magento\Framework\AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\StatusMapper
+     */
+    private $statusMapper;
+
+    /**
+     * Plugin constructor.
+     *
+     * @param \Magento\AdminNotification\Model\System\MessageFactory $messageFactory
+     * @param \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus
+     * @param \Magento\AsynchronousOperations\Model\BulkNotificationManagement $bulkNotificationManagement
+     * @param \Magento\Authorization\Model\UserContextInterface $userContext
+     * @param \Magento\AsynchronousOperations\Model\Operation\Details $operationDetails
+     * @param \Magento\Framework\AuthorizationInterface $authorization
+     * @param \Magento\AsynchronousOperations\Model\StatusMapper $statusMapper
+     */
+    public function __construct(
+        \Magento\AdminNotification\Model\System\MessageFactory $messageFactory,
+        \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus,
+        \Magento\AsynchronousOperations\Model\BulkNotificationManagement $bulkNotificationManagement,
+        \Magento\Authorization\Model\UserContextInterface $userContext,
+        \Magento\AsynchronousOperations\Model\Operation\Details $operationDetails,
+        \Magento\Framework\AuthorizationInterface $authorization,
+        \Magento\AsynchronousOperations\Model\StatusMapper $statusMapper
+    ) {
+        $this->messageFactory = $messageFactory;
+        $this->bulkStatus = $bulkStatus;
+        $this->userContext = $userContext;
+        $this->operationDetails = $operationDetails;
+        $this->bulkNotificationManagement = $bulkNotificationManagement;
+        $this->authorization = $authorization;
+        $this->statusMapper = $statusMapper;
+    }
+
+    /**
+     * Adding bulk related messages to notification area
+     *
+     * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $collection
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterToArray(
+        \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $collection,
+        $result
+    ) {
+        if (!$this->authorization->isAllowed('Magento_Logging::system_magento_logging_bulk_operations')) {
+            return $result;
+        }
+        $userId = $this->userContext->getUserId();
+        $userBulks = $this->bulkStatus->getBulksByUser($userId);
+        $acknowledgedBulks = $this->getAcknowledgedBulksUuid(
+            $this->bulkNotificationManagement->getAcknowledgedBulksByUser($userId)
+        );
+        $bulkMessages = [];
+        foreach ($userBulks as $bulk) {
+            $bulkUuid = $bulk->getBulkId();
+            if (!in_array($bulkUuid, $acknowledgedBulks)) {
+                $details = $this->operationDetails->getDetails($bulkUuid);
+                $text = $this->getText($details);
+                $bulkStatus = $this->statusMapper->operationStatusToBulkSummaryStatus($bulk->getStatus());
+                if ($bulkStatus === \Magento\Framework\Bulk\BulkSummaryInterface::IN_PROGRESS) {
+                    $text = __('%1 item(s) are currently being updated.', $details['operations_total']) . $text;
+                }
+                $data = [
+                    'data' => [
+                        'text' => __('Task "%1": ', $bulk->getDescription()) . $text,
+                        'severity' => \Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR,
+                        'identity' => md5('bulk' . $bulkUuid),
+                        'uuid' => $bulkUuid,
+                        'status' => $bulkStatus,
+                        'created_at' => $bulk->getStartTime()
+                    ]
+                ];
+                $bulkMessages[] = $this->messageFactory->create($data)->toArray();
+            }
+        }
+
+        if (!empty($bulkMessages)) {
+            $result['totalRecords'] += count($bulkMessages);
+            $bulkMessages = array_slice($bulkMessages, 0, 5);
+            $result['items'] = array_merge($bulkMessages, $result['items']);
+        }
+        return $result;
+    }
+
+    /**
+     * Get Bulk notification message
+     *
+     * @param array $operationDetails
+     * @return \Magento\Framework\Phrase|string
+     */
+    private function getText($operationDetails)
+    {
+        if (0 == $operationDetails['operations_successful'] && 0 == $operationDetails['operations_failed']) {
+            return __('%1 item(s) have been scheduled for update.', $operationDetails['operations_total']);
+        }
+
+        $summaryReport = '';
+        if ($operationDetails['operations_successful'] > 0) {
+            $summaryReport .= __(
+                '%1 item(s) have been successfully updated.',
+                $operationDetails['operations_successful']
+            ) ;
+        }
+
+        if ($operationDetails['operations_failed'] > 0) {
+            $summaryReport .= '<strong>'
+                . __('%1 item(s) failed to update', $operationDetails['operations_failed'])
+                . '</strong>';
+        }
+        return $summaryReport;
+    }
+
+    /**
+     * Get array with acknowledgedBulksUuid
+     *
+     * @param array $acknowledgedBulks
+     * @return array
+     */
+    private function getAcknowledgedBulksUuid($acknowledgedBulks)
+    {
+        $acknowledgedBulksArray = [];
+        foreach ($acknowledgedBulks as $bulk) {
+            $acknowledgedBulksArray[] = $bulk->getBulkId();
+        }
+        return $acknowledgedBulksArray;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/StatusMapper.php b/app/code/Magento/AsynchronousOperations/Model/StatusMapper.php
new file mode 100644
index 00000000000..3ad260cf26a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/StatusMapper.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\Bulk\OperationInterface;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+/**
+ * Class StatusMapper
+ */
+class StatusMapper
+{
+    /**
+     * Map operation status to bulk summary status
+     *
+     * @param int $operationStatus
+     * @return null|int
+     */
+    public function operationStatusToBulkSummaryStatus($operationStatus)
+    {
+        $statusMapping = [
+            OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED => BulkSummaryInterface::FINISHED_WITH_FAILURE,
+            OperationInterface::STATUS_TYPE_RETRIABLY_FAILED => BulkSummaryInterface::FINISHED_WITH_FAILURE,
+            OperationInterface::STATUS_TYPE_COMPLETE => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+            OperationInterface::STATUS_TYPE_OPEN => BulkSummaryInterface::IN_PROGRESS,
+            BulkSummaryInterface::NOT_STARTED => BulkSummaryInterface::NOT_STARTED
+        ];
+
+        if (isset($statusMapping[$operationStatus])) {
+            return $statusMapping[$operationStatus];
+        }
+        return null;
+    }
+
+    /**
+     * Map bulk summary status to operation status
+     *
+     * @param int $bulkStatus
+     * @return int|null
+     */
+    public function bulkSummaryStatusToOperationStatus($bulkStatus)
+    {
+        $statusMapping = [
+            BulkSummaryInterface::FINISHED_WITH_FAILURE => [
+                OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+                OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+            ],
+            BulkSummaryInterface::FINISHED_SUCCESSFULLY => OperationInterface::STATUS_TYPE_COMPLETE,
+            BulkSummaryInterface::IN_PROGRESS => OperationInterface::STATUS_TYPE_OPEN,
+            BulkSummaryInterface::NOT_STARTED => BulkSummaryInterface::NOT_STARTED
+        ];
+
+        if (isset($statusMapping[$bulkStatus])) {
+            return $statusMapping[$bulkStatus];
+        }
+        return null;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/README.md b/app/code/Magento/AsynchronousOperations/README.md
new file mode 100644
index 00000000000..fb7d53df1b8
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/README.md
@@ -0,0 +1 @@
+ This component is designed  to provide response for client who launched the bulk operation as soon as possible and postpone handling of operations moving them to background handler.
\ No newline at end of file
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/BackButtonTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/BackButtonTest.php
new file mode 100644
index 00000000000..d6d4c5e7479
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/BackButtonTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Block\Adminhtml\Bulk\Details;
+
+class BackButtonTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\BackButton
+     */
+    protected $block;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlBuilderMock;
+
+    protected function setUp()
+    {
+        $this->urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
+            ->getMock();
+        $this->block = new \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\BackButton(
+            $this->urlBuilderMock
+        );
+    }
+
+    public function testGetButtonData()
+    {
+        $backUrl = 'back url';
+        $expectedResult = [
+            'label' => __('Back'),
+            'on_click' => sprintf("location.href = '%s';", $backUrl),
+            'class' => 'back',
+            'sort_order' => 10
+        ];
+
+        $this->urlBuilderMock->expects($this->once())
+            ->method('getUrl')
+            ->with('*/')
+            ->willReturn($backUrl);
+
+        $this->assertEquals($expectedResult, $this->block->getButtonData());
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/DoneButtonTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/DoneButtonTest.php
new file mode 100644
index 00000000000..10c9d898aa5
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/DoneButtonTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Block\Adminhtml\Bulk\Details;
+
+use Magento\Framework\Bulk\OperationInterface;
+
+class DoneButtonTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\DoneButton
+     */
+    protected $block;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $bulkStatusMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestMock;
+
+    protected function setUp()
+    {
+        $this->bulkStatusMock = $this->createMock(\Magento\Framework\Bulk\BulkStatusInterface::class);
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->getMock();
+        $this->block = new \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\DoneButton(
+            $this->bulkStatusMock,
+            $this->requestMock
+        );
+    }
+
+    /**
+     * @param int $failedCount
+     * @param int $buttonsParam
+     * @param array $expectedResult
+     * @dataProvider getButtonDataProvider
+     */
+    public function testGetButtonData($failedCount, $buttonsParam, $expectedResult)
+    {
+        $uuid = 'some standard uuid string';
+        $this->requestMock->expects($this->exactly(2))
+            ->method('getParam')
+            ->withConsecutive(['uuid'], ['buttons'])
+            ->willReturnOnConsecutiveCalls($uuid, $buttonsParam);
+        $this->bulkStatusMock->expects($this->once())
+            ->method('getOperationsCountByBulkIdAndStatus')
+            ->with($uuid, OperationInterface::STATUS_TYPE_RETRIABLY_FAILED)
+            ->willReturn($failedCount);
+
+        $this->assertEquals($expectedResult, $this->block->getButtonData());
+    }
+
+    /**
+     * @return array
+     */
+    public function getButtonDataProvider()
+    {
+        return [
+            [1, 0, []],
+            [0, 0, []],
+            [
+                0,
+                1,
+                [
+                    'label' => __('Done'),
+                    'class' => 'primary',
+                    'sort_order' => 10,
+                    'on_click' => '',
+                    'data_attribute' => [
+                        'mage-init' => [
+                            'Magento_Ui/js/form/button-adapter' => [
+                                'actions' => [
+                                    [
+                                        'targetName' => 'notification_area.notification_area.modalContainer.modal',
+                                        'actionName' => 'closeModal'
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ]
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/RetryButtonTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/RetryButtonTest.php
new file mode 100644
index 00000000000..b7c154be09d
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/RetryButtonTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Block\Adminhtml\Bulk\Details;
+
+class RetryButtonTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\RetryButton
+     */
+    protected $block;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $detailsMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestMock;
+
+    protected function setUp()
+    {
+        $this->detailsMock = $this->getMockBuilder(\Magento\AsynchronousOperations\Model\Operation\Details::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->getMock();
+        $this->block = new \Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\RetryButton(
+            $this->detailsMock,
+            $this->requestMock
+        );
+    }
+
+    /**
+     * @param int $failedCount
+     * @param array $expectedResult
+     * @dataProvider getButtonDataProvider
+     */
+    public function testGetButtonData($failedCount, $expectedResult)
+    {
+        $details = ['failed_retriable' => $failedCount];
+        $uuid = 'some standard uuid string';
+        $this->requestMock->expects($this->once())
+            ->method('getParam')
+            ->with('uuid')
+            ->willReturn($uuid);
+        $this->detailsMock->expects($this->once())
+            ->method('getDetails')
+            ->with($uuid)
+            ->willReturn($details);
+
+        $this->assertEquals($expectedResult, $this->block->getButtonData());
+    }
+
+    /**
+     * @return array
+     */
+    public function getButtonDataProvider()
+    {
+        return [
+            [0, []],
+            [
+                20,
+                [
+                    'label' => __('Retry'),
+                    'class' => 'retry primary',
+                    'data_attribute' => [
+                        'mage-init' => ['button' => ['event' => 'save']],
+                        'form-role' => 'save',
+                    ],
+                ]
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/DetailsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/DetailsTest.php
new file mode 100644
index 00000000000..ecd33d355c2
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/DetailsTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Controller\Adminhtml\Bulk;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DetailsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $viewMock;
+    
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Controller\Adminhtml\Bulk\Details
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    protected function setUp()
+    {
+        $objectManager =  new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->viewMock = $this->createMock(\Magento\Framework\App\ViewInterface::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        $this->resultFactoryMock = $this->createMock(\Magento\Framework\View\Result\PageFactory::class);
+        $this->model = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Controller\Adminhtml\Bulk\Details::class,
+            [
+                'request' => $this->requestMock,
+                'resultPageFactory' => $this->resultFactoryMock,
+                'view' => $this->viewMock,
+
+            ]
+        );
+    }
+
+    public function testExecute()
+    {
+        $id = '42';
+        $parameterName = 'uuid';
+        $itemId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations';
+        $layoutMock = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
+
+        $blockMock = $this->createPartialMock(
+            \Magento\Framework\View\Element\BlockInterface::class,
+            ['setActive', 'getMenuModel', 'toHtml']
+        );
+        $menuModelMock = $this->createMock(\Magento\Backend\Model\Menu::class);
+        $this->viewMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
+        $layoutMock->expects($this->once())->method('getBlock')->willReturn($blockMock);
+        $blockMock->expects($this->once())->method('setActive')->with($itemId);
+        $blockMock->expects($this->once())->method('getMenuModel')->willReturn($menuModelMock);
+        $menuModelMock->expects($this->once())->method('getParentItems')->willReturn([]);
+        $pageMock = $this->createMock(\Magento\Framework\View\Result\Page::class);
+        $pageConfigMock = $this->createMock(\Magento\Framework\View\Page\Config::class);
+        $titleMock = $this->createMock(\Magento\Framework\View\Page\Title::class);
+        $this->resultFactoryMock->expects($this->once())->method('create')->willReturn($pageMock);
+        $this->requestMock->expects($this->once())->method('getParam')->with($parameterName)->willReturn($id);
+        $pageMock->expects($this->once())->method('getConfig')->willReturn($pageConfigMock);
+        $pageConfigMock->expects($this->once())->method('getTitle')->willReturn($titleMock);
+        $titleMock->expects($this->once())->method('prepend')->with($this->stringContains($id));
+        $pageMock->expects($this->once())->method('initLayout');
+        $this->assertEquals($pageMock, $this->model->execute());
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/RetryTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/RetryTest.php
new file mode 100644
index 00000000000..ab5e117b022
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Bulk/RetryTest.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Controller\Adminhtml\Bulk;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\RequestInterface;
+use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\AsynchronousOperations\Controller\Adminhtml\Bulk\Retry;
+use Magento\AsynchronousOperations\Model\BulkManagement;
+use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\Result\Json;
+
+class RetryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Retry
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkManagementMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $notificationManagementMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $jsonResultMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->bulkManagementMock = $this->createMock(BulkManagement::class);
+        $this->notificationManagementMock = $this->createMock(BulkNotificationManagement::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
+        $this->resultFactoryMock = $this->createPartialMock(ResultFactory::class, ['create']);
+        $this->jsonResultMock = $this->createMock(Json::class);
+
+        $this->resultRedirectFactoryMock = $this->createPartialMock(RedirectFactory::class, ['create']);
+        $this->resultRedirectMock = $this->createMock(Redirect::class);
+
+        $this->model = $objectManager->getObject(
+            Retry::class,
+            [
+                'bulkManagement' => $this->bulkManagementMock,
+                'notificationManagement' => $this->notificationManagementMock,
+                'request' => $this->requestMock,
+                'resultRedirectFactory' => $this->resultRedirectFactoryMock,
+                'resultFactory' => $this->resultFactoryMock,
+            ]
+        );
+    }
+
+    public function testExecute()
+    {
+        $bulkUuid = '49da7406-1ec3-4100-95ae-9654c83a6801';
+        $operationsToRetry = [
+            [
+                'key' => 'value',
+                'error_code' => 1111,
+            ],
+            [
+                'error_code' => 2222,
+            ],
+            [
+                'error_code' => '3333',
+            ],
+        ];
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['uuid', null, $bulkUuid],
+                ['operations_to_retry', [], $operationsToRetry],
+                ['isAjax', null, false],
+            ]);
+
+        $this->bulkManagementMock->expects($this->once())
+            ->method('retryBulk')
+            ->with($bulkUuid, [1111, 2222, 3333]);
+
+        $this->notificationManagementMock->expects($this->once())
+            ->method('ignoreBulks')
+            ->with([$bulkUuid])
+            ->willReturn(true);
+
+        $this->resultRedirectFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultRedirectMock);
+
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('bulk/index');
+
+        $this->model->execute();
+    }
+
+    public function testExecuteReturnsJsonResultWhenRequestIsSentViaAjax()
+    {
+        $bulkUuid = '49da7406-1ec3-4100-95ae-9654c83a6801';
+        $operationsToRetry = [
+            [
+                'key' => 'value',
+                'error_code' => 1111,
+            ],
+        ];
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['uuid', null, $bulkUuid],
+                ['operations_to_retry', [], $operationsToRetry],
+                ['isAjax', null, true],
+            ]);
+
+        $this->bulkManagementMock->expects($this->once())
+            ->method('retryBulk')
+            ->with($bulkUuid, [1111]);
+
+        $this->notificationManagementMock->expects($this->once())
+            ->method('ignoreBulks')
+            ->with([$bulkUuid])
+            ->willReturn(true);
+
+        $this->resultFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_JSON, [])
+            ->willReturn($this->jsonResultMock);
+
+        $this->jsonResultMock->expects($this->once())
+            ->method('setHttpResponseCode')
+            ->with(200);
+
+        $this->assertEquals($this->jsonResultMock, $this->model->execute());
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Index/IndexTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Index/IndexTest.php
new file mode 100644
index 00000000000..98d51d8b0fd
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Index/IndexTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Controller\Adminhtml\Index;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class IndexTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $viewMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Controller\Adminhtml\Index\Index
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    protected function setUp()
+    {
+        $objectManager =  new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->viewMock = $this->createMock(\Magento\Framework\App\ViewInterface::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        $this->resultFactoryMock = $this->createMock(\Magento\Framework\View\Result\PageFactory::class);
+
+        $this->model = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Controller\Adminhtml\Index\Index::class,
+            [
+                'request' => $this->requestMock,
+                'view' => $this->viewMock,
+                'resultPageFactory' => $this->resultFactoryMock
+
+            ]
+        );
+    }
+
+    public function testExecute()
+    {
+        $itemId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations';
+        $prependText = 'Bulk Actions Log';
+        $layoutMock = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
+        $menuModelMock = $this->createMock(\Magento\Backend\Model\Menu::class);
+        $pageMock = $this->createMock(\Magento\Framework\View\Result\Page::class);
+        $pageConfigMock = $this->createMock(\Magento\Framework\View\Page\Config::class);
+        $titleMock = $this->createMock(\Magento\Framework\View\Page\Title::class);
+        $this->resultFactoryMock->expects($this->once())->method('create')->willReturn($pageMock);
+
+        $blockMock = $this->createPartialMock(
+            \Magento\Framework\View\Element\BlockInterface::class,
+            ['setActive', 'getMenuModel', 'toHtml']
+        );
+
+        $this->viewMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
+        $layoutMock->expects($this->once())->method('getBlock')->willReturn($blockMock);
+        $blockMock->expects($this->once())->method('setActive')->with($itemId);
+        $blockMock->expects($this->once())->method('getMenuModel')->willReturn($menuModelMock);
+        $menuModelMock->expects($this->once())->method('getParentItems')->willReturn([]);
+
+        $pageMock->expects($this->once())->method('getConfig')->willReturn($pageConfigMock);
+        $pageConfigMock->expects($this->once())->method('getTitle')->willReturn($titleMock);
+        $titleMock->expects($this->once())->method('prepend')->with($prependText);
+        $pageMock->expects($this->once())->method('initLayout');
+        $this->model->execute();
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Notification/DismissTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Notification/DismissTest.php
new file mode 100644
index 00000000000..8ec1ec4609a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Notification/DismissTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Controller\Adminhtml\Notification;
+
+use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\AsynchronousOperations\Controller\Adminhtml\Notification\Dismiss;
+use Magento\Framework\Controller\Result\Json;
+
+class DismissTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Dismiss
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $notificationManagementMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $jsonResultMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->notificationManagementMock = $this->createMock(BulkNotificationManagement::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
+        $this->resultFactoryMock = $this->createPartialMock(ResultFactory::class, ['create']);
+
+        $this->jsonResultMock = $this->createMock(Json::class);
+
+        $this->model = $objectManager->getObject(
+            Dismiss::class,
+            [
+                'notificationManagement' => $this->notificationManagementMock,
+                'request' => $this->requestMock,
+                'resultFactory' => $this->resultFactoryMock,
+            ]
+        );
+    }
+
+    public function testExecute()
+    {
+        $bulkUuids = ['49da7406-1ec3-4100-95ae-9654c83a6801'];
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->with('uuid', [])
+            ->willReturn($bulkUuids);
+
+        $this->notificationManagementMock->expects($this->once())
+            ->method('acknowledgeBulks')
+            ->with($bulkUuids)
+            ->willReturn(true);
+
+        $this->resultFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_JSON, [])
+            ->willReturn($this->jsonResultMock);
+
+        $this->assertEquals($this->jsonResultMock, $this->model->execute());
+    }
+
+    public function testExecuteSetsBadRequestResponseStatusIfBulkWasNotAcknowledgedCorrectly()
+    {
+        $bulkUuids = ['49da7406-1ec3-4100-95ae-9654c83a6801'];
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->with('uuid', [])
+            ->willReturn($bulkUuids);
+
+        $this->resultFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_JSON, [])
+            ->willReturn($this->jsonResultMock);
+
+        $this->notificationManagementMock->expects($this->once())
+            ->method('acknowledgeBulks')
+            ->with($bulkUuids)
+            ->willReturn(false);
+
+        $this->jsonResultMock->expects($this->once())
+            ->method('setHttpResponseCode')
+            ->with(400);
+
+        $this->assertEquals($this->jsonResultMock, $this->model->execute());
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Cron/BulkCleanupTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Cron/BulkCleanupTest.php
new file mode 100644
index 00000000000..be38e918173
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Cron/BulkCleanupTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Controller\Cron;
+
+class BulkCleanupTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Cron\BulkCleanup
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $timeMock;
+
+    protected function setUp()
+    {
+        $this->dateTimeMock = $this->createMock(\Magento\Framework\Stdlib\DateTime::class);
+        $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->resourceConnectionMock = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
+        $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $this->timeMock = $this->createMock(\Magento\Framework\Stdlib\DateTime\DateTime::class);
+        $this->model = new \Magento\AsynchronousOperations\Cron\BulkCleanup(
+            $this->metadataPoolMock,
+            $this->resourceConnectionMock,
+            $this->dateTimeMock,
+            $this->scopeConfigMock,
+            $this->timeMock
+        );
+    }
+
+    public function testExecute()
+    {
+        $entityType = 'BulkSummaryInterface';
+        $connectionName = 'Connection';
+        $bulkLifetimeMultiplier = 10;
+        $bulkLifetime = 3600 * 24 * $bulkLifetimeMultiplier;
+
+        $adapterMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $entityMetadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadataInterface::class);
+
+        $this->metadataPoolMock->expects($this->once())->method('getMetadata')->with($this->stringContains($entityType))
+            ->willReturn($entityMetadataMock);
+        $entityMetadataMock->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $this->resourceConnectionMock->expects($this->once())->method('getConnectionByName')->with($connectionName)
+            ->willReturn($adapterMock);
+        $this->scopeConfigMock->expects($this->once())->method('getValue')->with($this->stringContains('bulk/lifetime'))
+            ->willReturn($bulkLifetimeMultiplier);
+        $this->timeMock->expects($this->once())->method('gmtTimestamp')->willReturn($bulkLifetime*10);
+        $this->dateTimeMock->expects($this->once())->method('formatDate')->with($bulkLifetime*9);
+        $adapterMock->expects($this->once())->method('delete');
+
+        $this->model->execute();
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/AccessValidatorTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/AccessValidatorTest.php
new file mode 100644
index 00000000000..8eb8778a384
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/AccessValidatorTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+class AccessValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\AccessValidator
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $userContextMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkSummaryFactoryMock;
+
+    protected function setUp()
+    {
+        $this->userContextMock = $this->createMock(\Magento\Authorization\Model\UserContextInterface::class);
+        $this->entityManagerMock = $this->createMock(\Magento\Framework\EntityManager\EntityManager::class);
+        $this->bulkSummaryFactoryMock = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory::class,
+            ['create']
+        );
+
+        $this->model = new \Magento\AsynchronousOperations\Model\AccessValidator(
+            $this->userContextMock,
+            $this->entityManagerMock,
+            $this->bulkSummaryFactoryMock
+        );
+    }
+
+    /**
+     * @dataProvider summaryDataProvider
+     * @param string $bulkUserId
+     * @param bool $expectedResult
+     */
+    public function testIsAllowed($bulkUserId, $expectedResult)
+    {
+        $adminId = 1;
+        $uuid = 'test-001';
+        $bulkSummaryMock = $this->createMock(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class);
+
+        $this->bulkSummaryFactoryMock->expects($this->once())->method('create')->willReturn($bulkSummaryMock);
+        $this->entityManagerMock->expects($this->once())
+            ->method('load')
+            ->with($bulkSummaryMock, $uuid)
+            ->willReturn($bulkSummaryMock);
+
+        $bulkSummaryMock->expects($this->once())->method('getUserId')->willReturn($bulkUserId);
+        $this->userContextMock->expects($this->once())->method('getUserId')->willReturn($adminId);
+
+        $this->assertEquals($this->model->isAllowed($uuid), $expectedResult);
+    }
+
+    /**
+     * @return array
+     */
+    public static function summaryDataProvider()
+    {
+        return [
+            [2, false],
+            [1, true]
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkDescription/OptionsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkDescription/OptionsTest.php
new file mode 100644
index 00000000000..d5835f7856d
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkDescription/OptionsTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model\BulkDescription;
+
+class OptionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkDescription\Options
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkCollectionFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $userContextMock;
+
+    protected function setUp()
+    {
+        $this->bulkCollectionFactoryMock = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory::class,
+            ['create']
+        );
+        $this->userContextMock = $this->createMock(\Magento\Authorization\Model\UserContextInterface::class);
+        $this->model = new \Magento\AsynchronousOperations\Model\BulkDescription\Options(
+            $this->bulkCollectionFactoryMock,
+            $this->userContextMock
+        );
+    }
+
+    public function testToOptionsArray()
+    {
+        $userId = 100;
+        $collectionMock = $this->createMock(\Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection::class);
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $this->bulkCollectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock);
+
+        $this->userContextMock->expects($this->once())->method('getUserId')->willReturn($userId);
+
+        $collectionMock->expects($this->once())->method('getMainTable')->willReturn('table');
+
+        $selectMock->expects($this->once())->method('reset')->willReturnSelf();
+        $selectMock->expects($this->once())->method('distinct')->with(true)->willReturnSelf();
+        $selectMock->expects($this->once())->method('from')->with('table', ['description'])->willReturnSelf();
+        $selectMock->expects($this->once())->method('where')->with('user_id = ?', $userId)->willReturnSelf();
+
+        $itemMock = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Model\BulkSummary::class,
+            ['getDescription']
+        );
+        $itemMock->expects($this->exactly(2))->method('getDescription')->willReturn('description');
+
+        $collectionMock->expects($this->once())->method('getSelect')->willReturn($selectMock);
+        $collectionMock->expects($this->once())->method('getItems')->willReturn([$itemMock]);
+
+        $expectedResult = [
+            [
+                'value' => 'description',
+                'label' => 'description'
+            ]
+        ];
+
+        $this->assertEquals($expectedResult, $this->model->toOptionArray());
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php
new file mode 100644
index 00000000000..3a45c34df17
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+/**
+ * Unit test for BulkManagement model.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BulkManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\EntityManager\EntityManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityManager;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory
+     *      |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkSummaryFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory
+     *      |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationCollectionFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\BulkPublisherInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisher;
+
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPool;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkManagement
+     */
+    private $bulkManagement;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->entityManager = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityManager::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->bulkSummaryFactory = $this
+            ->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->operationCollectionFactory = $this
+            ->getMockBuilder(\Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->publisher = $this->getMockBuilder(\Magento\Framework\MessageQueue\BulkPublisherInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->bulkManagement = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Model\BulkManagement::class,
+            [
+                'entityManager' => $this->entityManager,
+                'bulkSummaryFactory' => $this->bulkSummaryFactory,
+                'operationCollectionFactory' => $this->operationCollectionFactory,
+                'publisher' => $this->publisher,
+                'metadataPool' => $this->metadataPool,
+                'resourceConnection' => $this->resourceConnection,
+                'logger' => $this->logger,
+            ]
+        );
+    }
+
+    /**
+     * Test for scheduleBulk method.
+     *
+     * @return void
+     */
+    public function testScheduleBulk()
+    {
+        $bulkUuid = 'bulk-001';
+        $description = 'Bulk summary description...';
+        $userId = 1;
+        $connectionName = 'default';
+        $topicNames = ['topic.name.0', 'topic.name.1'];
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnectionByName')->with($connectionName)->willReturn($connection);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $bulkSummary = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->bulkSummaryFactory->expects($this->once())->method('create')->willReturn($bulkSummary);
+        $this->entityManager->expects($this->once())
+            ->method('load')->with($bulkSummary, $bulkUuid)->willReturn($bulkSummary);
+        $bulkSummary->expects($this->once())->method('setBulkId')->with($bulkUuid)->willReturnSelf();
+        $bulkSummary->expects($this->once())->method('setDescription')->with($description)->willReturnSelf();
+        $bulkSummary->expects($this->once())->method('setUserId')->with($userId)->willReturnSelf();
+        $bulkSummary->expects($this->once())->method('getOperationCount')->willReturn(1);
+        $bulkSummary->expects($this->once())->method('setOperationCount')->with(3)->willReturnSelf();
+        $this->entityManager->expects($this->once())->method('save')->with($bulkSummary)->willReturn($bulkSummary);
+        $connection->expects($this->once())->method('commit')->willReturnSelf();
+        $operation->expects($this->exactly(2))->method('getTopicName')
+            ->willReturnOnConsecutiveCalls($topicNames[0], $topicNames[1]);
+        $this->publisher->expects($this->exactly(2))->method('publish')
+            ->withConsecutive([$topicNames[0], [$operation]], [$topicNames[1], [$operation]])->willReturn(null);
+        $this->assertTrue(
+            $this->bulkManagement->scheduleBulk($bulkUuid, [$operation, $operation], $description, $userId)
+        );
+    }
+
+    /**
+     * Test for scheduleBulk method with exception.
+     *
+     * @return void
+     */
+    public function testScheduleBulkWithException()
+    {
+        $bulkUuid = 'bulk-001';
+        $description = 'Bulk summary description...';
+        $userId = 1;
+        $connectionName = 'default';
+        $exceptionMessage = 'Exception message';
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnectionByName')->with($connectionName)->willReturn($connection);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $bulkSummary = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->bulkSummaryFactory->expects($this->once())->method('create')->willReturn($bulkSummary);
+        $this->entityManager->expects($this->once())->method('load')
+            ->with($bulkSummary, $bulkUuid)->willThrowException(new \LogicException($exceptionMessage));
+        $connection->expects($this->once())->method('rollBack')->willReturnSelf();
+        $this->logger->expects($this->once())->method('critical')->with($exceptionMessage);
+        $this->publisher->expects($this->never())->method('publish');
+        $this->assertFalse($this->bulkManagement->scheduleBulk($bulkUuid, [$operation], $description, $userId));
+    }
+
+    /**
+     * Test for retryBulk method.
+     *
+     * @return void
+     */
+    public function testRetryBulk()
+    {
+        $bulkUuid = 'bulk-001';
+        $errorCodes = ['errorCode'];
+        $connectionName = 'default';
+        $operationId = 1;
+        $operationTable = 'magento_operation';
+        $topicName = 'topic.name';
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnectionByName')->with($connectionName)->willReturn($connection);
+        $operationCollection = $this
+            ->getMockBuilder(\Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->operationCollectionFactory->expects($this->once())->method('create')->willReturn($operationCollection);
+        $operationCollection->expects($this->exactly(2))->method('addFieldToFilter')
+            ->withConsecutive(['error_code', ['in' => $errorCodes]], ['bulk_uuid', ['eq' => $bulkUuid]])
+            ->willReturnSelf();
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $operationCollection->expects($this->once())->method('getItems')->willReturn([$operation]);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $operation->expects($this->once())->method('getId')->willReturn($operationId);
+        $operation->expects($this->once())->method('setId')->with(null)->willReturnSelf();
+        $this->resourceConnection->expects($this->once())
+            ->method('getTableName')->with($operationTable)->willReturn($operationTable);
+        $connection->expects($this->once())
+            ->method('quoteInto')->with('id IN (?)', [$operationId])->willReturn('id IN (' . $operationId .')');
+        $connection->expects($this->once())
+            ->method('delete')->with($operationTable, 'id IN (' . $operationId .')')->willReturn(1);
+        $connection->expects($this->once())->method('commit')->willReturnSelf();
+        $operation->expects($this->once())->method('getTopicName')->willReturn($topicName);
+        $this->publisher->expects($this->once())->method('publish')->with($topicName, [$operation])->willReturn(null);
+        $this->assertEquals(1, $this->bulkManagement->retryBulk($bulkUuid, $errorCodes));
+    }
+
+    /**
+     * Test for retryBulk method with exception.
+     *
+     * @return void
+     */
+    public function testRetryBulkWithException()
+    {
+        $bulkUuid = 'bulk-001';
+        $errorCodes = ['errorCode'];
+        $connectionName = 'default';
+        $operationId = 1;
+        $operationTable = 'magento_operation';
+        $exceptionMessage = 'Exception message';
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnectionByName')->with($connectionName)->willReturn($connection);
+        $operationCollection = $this
+            ->getMockBuilder(\Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->operationCollectionFactory->expects($this->once())->method('create')->willReturn($operationCollection);
+        $operationCollection->expects($this->exactly(2))->method('addFieldToFilter')
+            ->withConsecutive(['error_code', ['in' => $errorCodes]], ['bulk_uuid', ['eq' => $bulkUuid]])
+            ->willReturnSelf();
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $operationCollection->expects($this->once())->method('getItems')->willReturn([$operation]);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $operation->expects($this->once())->method('getId')->willReturn($operationId);
+        $operation->expects($this->once())->method('setId')->with(null)->willReturnSelf();
+        $this->resourceConnection->expects($this->once())
+            ->method('getTableName')->with($operationTable)->willReturn($operationTable);
+        $connection->expects($this->once())
+            ->method('quoteInto')->with('id IN (?)', [$operationId])->willReturn('id IN (' . $operationId .')');
+        $connection->expects($this->once())
+            ->method('delete')->with($operationTable, 'id IN (' . $operationId .')')
+            ->willThrowException(new \Exception($exceptionMessage));
+        $connection->expects($this->once())->method('rollBack')->willReturnSelf();
+        $this->logger->expects($this->once())->method('critical')->with($exceptionMessage);
+        $this->publisher->expects($this->never())->method('publish');
+        $this->assertEquals(0, $this->bulkManagement->retryBulk($bulkUuid, $errorCodes));
+    }
+
+    /**
+     * Test for deleteBulk method.
+     *
+     * @return void
+     */
+    public function testDeleteBulk()
+    {
+        $bulkUuid = 'bulk-001';
+        $bulkSummary = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->bulkSummaryFactory->expects($this->once())->method('create')->willReturn($bulkSummary);
+        $this->entityManager->expects($this->once())
+            ->method('load')->with($bulkSummary, $bulkUuid)->willReturn($bulkSummary);
+        $this->entityManager->expects($this->once())->method('delete')->with($bulkSummary)->willReturn(true);
+        $this->assertTrue($this->bulkManagement->deleteBulk($bulkUuid));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkStatusTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkStatusTest.php
new file mode 100644
index 00000000000..cda55161ab8
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkStatusTest.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BulkStatusTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkStatus
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkCollectionFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationCollectionFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $calculatedStatusSqlMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityMetadataMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    protected function setUp()
+    {
+        $this->bulkCollectionFactory = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory::class,
+            ['create']
+        );
+        $this->operationCollectionFactory = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory::class,
+            ['create']
+        );
+        $this->operationMock = $this->createMock(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class);
+        $this->bulkMock = $this->createMock(\Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class);
+        $this->resourceConnectionMock = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
+        $this->calculatedStatusSqlMock = $this->createMock(
+            \Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql::class
+        );
+        $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+
+        $this->entityMetadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadataInterface::class);
+        $this->connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+
+        $this->model = new \Magento\AsynchronousOperations\Model\BulkStatus(
+            $this->bulkCollectionFactory,
+            $this->operationCollectionFactory,
+            $this->resourceConnectionMock,
+            $this->calculatedStatusSqlMock,
+            $this->metadataPoolMock
+        );
+    }
+
+    /**
+     * @param int|null $failureType
+     * @param array $failureCodes
+     * @dataProvider getFailedOperationsByBulkIdDataProvider
+     */
+    public function testGetFailedOperationsByBulkId($failureType, $failureCodes)
+    {
+        $bulkUuid = 'bulk-1';
+        $operationCollection = $this->createMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class
+        );
+        $this->operationCollectionFactory->expects($this->once())->method('create')->willReturn($operationCollection);
+        $operationCollection
+            ->expects($this->at(0))
+            ->method('addFieldToFilter')
+            ->with('bulk_uuid', $bulkUuid)
+            ->willReturnSelf();
+        $operationCollection
+            ->expects($this->at(1))
+            ->method('addFieldToFilter')
+            ->with('status', $failureCodes)
+            ->willReturnSelf();
+        $operationCollection->expects($this->once())->method('getItems')->willReturn([$this->operationMock]);
+        $this->assertEquals([$this->operationMock], $this->model->getFailedOperationsByBulkId($bulkUuid, $failureType));
+    }
+
+    public function testGetOperationsCountByBulkIdAndStatus()
+    {
+        $bulkUuid = 'bulk-1';
+        $status = 1354;
+        $size = 32;
+
+        $operationCollection = $this->createMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class
+        );
+        $this->operationCollectionFactory->expects($this->once())->method('create')->willReturn($operationCollection);
+        $operationCollection
+            ->expects($this->at(0))
+            ->method('addFieldToFilter')
+            ->with('bulk_uuid', $bulkUuid)
+            ->willReturnSelf();
+        $operationCollection
+            ->expects($this->at(1))
+            ->method('addFieldToFilter')
+            ->with('status', $status)
+            ->willReturnSelf();
+        $operationCollection
+            ->expects($this->once())
+            ->method('getSize')
+            ->willReturn($size);
+        $this->assertEquals($size, $this->model->getOperationsCountByBulkIdAndStatus($bulkUuid, $status));
+    }
+
+    public function getFailedOperationsByBulkIdDataProvider()
+    {
+        return [
+            [1, [1]],
+            [null,
+                [
+                    OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+                    OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED
+                ]
+            ]
+        ];
+    }
+
+    public function testGetBulksByUser()
+    {
+        $userId = 1;
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $bulkCollection = $this->createMock(\Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection::class);
+        $bulkCollection->expects($this->once())->method('getSelect')->willReturn($selectMock);
+        $selectMock->expects($this->once())->method('columns')->willReturnSelf();
+        $selectMock->expects($this->once())->method('order')->willReturnSelf();
+        $this->bulkCollectionFactory->expects($this->once())->method('create')->willReturn($bulkCollection);
+        $bulkCollection->expects($this->once())->method('addFieldToFilter')->with('user_id', $userId)->willReturnSelf();
+        $bulkCollection->expects($this->once())->method('getItems')->willReturn([$this->bulkMock]);
+        $this->assertEquals([$this->bulkMock], $this->model->getBulksByUser($userId));
+    }
+
+    public function testGetBulksStatus()
+    {
+        $bulkUuid = 'bulk-1';
+        $allProcessedOperationCollection = $this->createMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class
+        );
+
+        $completeOperationCollection = $this->createMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection::class
+        );
+
+        $connectionName = 'connection_name';
+        $entityType = \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::class;
+        $this->metadataPoolMock
+            ->expects($this->once())
+            ->method('getMetadata')
+            ->with($entityType)
+            ->willReturn($this->entityMetadataMock);
+        $this->entityMetadataMock
+            ->expects($this->once())
+            ->method('getEntityConnectionName')
+            ->willReturn($connectionName);
+        $this->resourceConnectionMock
+            ->expects($this->once())
+            ->method('getConnectionByName')
+            ->with($connectionName)
+            ->willReturn($this->connectionMock);
+
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $selectMock->expects($this->once())->method('from')->willReturnSelf();
+        $selectMock->expects($this->once())->method('where')->with('uuid = ?', $bulkUuid)->willReturnSelf();
+        $this->connectionMock->expects($this->once())->method('select')->willReturn($selectMock);
+        $this->connectionMock->expects($this->once())->method('fetchOne')->with($selectMock)->willReturn(10);
+
+        $this->operationCollectionFactory
+            ->expects($this->at(0))
+            ->method('create')
+            ->willReturn($allProcessedOperationCollection);
+        $this->operationCollectionFactory
+            ->expects($this->at(1))
+            ->method('create')
+            ->willReturn($completeOperationCollection);
+        $allProcessedOperationCollection
+            ->expects($this->once())
+            ->method('addFieldToFilter')
+            ->with('bulk_uuid', $bulkUuid)
+            ->willReturnSelf();
+        $allProcessedOperationCollection->expects($this->once())->method('getSize')->willReturn(5);
+
+        $completeOperationCollection
+            ->expects($this->at(0))
+            ->method('addFieldToFilter')
+            ->with('bulk_uuid', $bulkUuid)
+            ->willReturnSelf();
+        $completeOperationCollection
+            ->expects($this->at(1))
+            ->method('addFieldToFilter')
+            ->with('status', OperationInterface::STATUS_TYPE_COMPLETE)
+            ->willReturnSelf();
+        $completeOperationCollection->expects($this->any())->method('getSize')->willReturn(5);
+        $this->assertEquals(BulkSummaryInterface::IN_PROGRESS, $this->model->getBulkStatus($bulkUuid));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Entity/BulkSummaryMapperTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Entity/BulkSummaryMapperTest.php
new file mode 100644
index 00000000000..725eae3c01e
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Entity/BulkSummaryMapperTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model\Entity;
+
+use Magento\AsynchronousOperations\Model\Entity\BulkSummaryMapper;
+
+/**
+ * Class BulkSummaryMapperTest
+ */
+class BulkSummaryMapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\Entity\BulkSummaryMapper
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoolMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityMetadataMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    protected function setUp()
+    {
+        $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $this->resourceConnectionMock = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
+        $this->entityMetadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadataInterface::class);
+        $this->connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $this->selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $this->model = new BulkSummaryMapper(
+            $this->metadataPoolMock,
+            $this->resourceConnectionMock
+        );
+    }
+
+    /**
+     * @param int $identifier
+     * @param array|false $result
+     * @dataProvider entityToDatabaseDataProvider
+     */
+    public function testEntityToDatabase($identifier, $result)
+    {
+        $entityType = 'entityType';
+        $data = ['uuid' => 'bulk-1'];
+        $connectionName = 'connection_name';
+        $entityTable = 'table_name';
+        $this->metadataPoolMock
+            ->expects($this->once())
+            ->method('getMetadata')
+            ->with($entityType)
+            ->willReturn($this->entityMetadataMock);
+        $this->entityMetadataMock
+            ->expects($this->once())
+            ->method('getEntityConnectionName')
+            ->willReturn($connectionName);
+
+        $this->resourceConnectionMock
+            ->expects($this->once())
+            ->method('getConnectionByName')
+            ->with($connectionName)
+            ->willReturn($this->connectionMock);
+        $this->connectionMock->expects($this->once())->method('select')->willReturn($this->selectMock);
+        $this->entityMetadataMock->expects($this->once())->method('getEntityTable')->willReturn($entityTable);
+        $this->selectMock->expects($this->once())->method('from')->with($entityTable, 'id')->willReturnSelf();
+        $this->selectMock->expects($this->once())->method('where')->with("uuid = ?", 'bulk-1')->willReturnSelf();
+        $this->connectionMock
+            ->expects($this->once())
+            ->method('fetchOne')
+            ->with($this->selectMock)
+            ->willReturn($identifier);
+        
+        $this->assertEquals($result, $this->model->entityToDatabase($entityType, $data));
+    }
+
+    public function entityToDatabaseDataProvider()
+    {
+        return [
+            [1, ['uuid' => 'bulk-1', 'id' => 1]],
+            [false, ['uuid' => 'bulk-1']]
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Operation/DetailsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Operation/DetailsTest.php
new file mode 100644
index 00000000000..7060a48e773
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Operation/DetailsTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model\Operation;
+
+use Magento\Framework\Bulk\OperationInterface;
+
+class DetailsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkStatusMock;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\Operation\Details
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->bulkStatusMock = $this->getMockBuilder(\Magento\Framework\Bulk\BulkStatusInterface::class)
+            ->getMock();
+        $this->model = new \Magento\AsynchronousOperations\Model\Operation\Details($this->bulkStatusMock);
+    }
+
+    public function testGetDetails()
+    {
+        $uuid = 'some_uuid_string';
+        $completed = 100;
+        $failedRetriable = 23;
+        $failedNotRetriable = 45;
+        $open = 303;
+
+        $expectedResult = [
+            'operations_total' => $completed + $failedRetriable + $failedNotRetriable + $open,
+            'operations_successful' => $completed,
+            'operations_failed' => $failedRetriable + $failedNotRetriable,
+            'failed_retriable' => $failedRetriable,
+            'failed_not_retriable' => $failedNotRetriable,
+        ];
+
+        $this->bulkStatusMock->method('getOperationsCountByBulkIdAndStatus')
+            ->willReturnMap([
+                [$uuid, OperationInterface::STATUS_TYPE_COMPLETE, $completed],
+                [$uuid, OperationInterface::STATUS_TYPE_RETRIABLY_FAILED, $failedRetriable],
+                [$uuid, OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED, $failedNotRetriable],
+                [$uuid, OperationInterface::STATUS_TYPE_OPEN, $open],
+            ]);
+
+        $result = $this->model->getDetails($uuid);
+        $this->assertEquals($expectedResult, $result);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php
new file mode 100644
index 00000000000..32146b7b6eb
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+/**
+ * Class OperationManagementTest
+ */
+class OperationManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\OperationManagement
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+    
+    protected function setUp()
+    {
+        $this->entityManagerMock = $this->createMock(\Magento\Framework\EntityManager\EntityManager::class);
+        $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $this->operationFactoryMock = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory::class,
+            ['create']
+        );
+        $this->operationMock = $this->createMock(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class);
+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $this->model = new \Magento\AsynchronousOperations\Model\OperationManagement(
+            $this->entityManagerMock,
+            $this->operationFactoryMock,
+            $this->loggerMock
+        );
+    }
+
+    public function testChangeOperationStatus()
+    {
+        $operationId = 1;
+        $status = 1;
+        $message = 'Message';
+        $data = 'data';
+        $errorCode = 101;
+        $this->operationFactoryMock->expects($this->once())->method('create')->willReturn($this->operationMock);
+        $this->entityManagerMock->expects($this->once())->method('load')->with($this->operationMock, $operationId);
+        $this->operationMock->expects($this->once())->method('setStatus')->with($status)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setResultMessage')->with($message)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setSerializedData')->with($data)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setErrorCode')->with($errorCode)->willReturnSelf();
+        $this->entityManagerMock->expects($this->once())->method('save')->with($this->operationMock);
+        $this->assertTrue($this->model->changeOperationStatus($operationId, $status, $errorCode, $message, $data));
+    }
+
+    public function testChangeOperationStatusIfExceptionWasThrown()
+    {
+        $operationId = 1;
+        $status = 1;
+        $message = 'Message';
+        $data = 'data';
+        $errorCode = 101;
+        $this->operationFactoryMock->expects($this->once())->method('create')->willReturn($this->operationMock);
+        $this->entityManagerMock->expects($this->once())->method('load')->with($this->operationMock, $operationId);
+        $this->operationMock->expects($this->once())->method('setStatus')->with($status)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setResultMessage')->with($message)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setSerializedData')->with($data)->willReturnSelf();
+        $this->operationMock->expects($this->once())->method('setErrorCode')->with($errorCode)->willReturnSelf();
+        $this->entityManagerMock->expects($this->once())->method('save')->willThrowException(new \Exception());
+        $this->loggerMock->expects($this->once())->method('critical');
+        $this->assertFalse($this->model->changeOperationStatus($operationId, $status, $errorCode, $message, $data));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/Operation/CreateTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/Operation/CreateTest.php
new file mode 100644
index 00000000000..2f0fc8ceba4
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/Operation/CreateTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model\ResourceModel\Operation;
+
+/**
+ * Unit test for Create operation.
+ */
+class CreateTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPool;
+
+    /**
+     * @var \Magento\Framework\EntityManager\TypeResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $typeResolver;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnection;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Create
+     */
+    private $create;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->metadataPool = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->typeResolver = $this->getMockBuilder(\Magento\Framework\EntityManager\TypeResolver::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->create = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Create::class,
+            [
+                'metadataPool' => $this->metadataPool,
+                'typeResolver' => $this->typeResolver,
+                'resourceConnection' => $this->resourceConnection,
+            ]
+        );
+    }
+
+    /**
+     * Test for execute method.
+     *
+     * @return void
+     */
+    public function testExecute()
+    {
+        $connectionName = 'default';
+        $operationData = ['key1' => 'value1'];
+        $operationTable = 'magento_operation';
+        $operationList = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->typeResolver->expects($this->once())->method('resolve')->with($operationList)
+            ->willReturn(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class);
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class)->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnection')->with($connectionName)->willReturn($connection);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->setMethods(['getData'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $operationList->expects($this->once())->method('getItems')->willReturn([$operation]);
+        $operation->expects($this->once())->method('getData')->willReturn($operationData);
+        $metadata->expects($this->once())->method('getEntityTable')->willReturn($operationTable);
+        $connection->expects($this->once())->method('insertOnDuplicate')
+            ->with($operationTable, [$operationData], ['status', 'error_code', 'result_message'])->willReturn(1);
+        $connection->expects($this->once())->method('commit')->willReturnSelf();
+        $this->assertEquals($operationList, $this->create->execute($operationList));
+    }
+
+    /**
+     * Test for execute method with exception.
+     *
+     * @return void
+     * @expectedException \Exception
+     */
+    public function testExecuteWithException()
+    {
+        $connectionName = 'default';
+        $operationData = ['key1' => 'value1'];
+        $operationTable = 'magento_operation';
+        $operationList = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->typeResolver->expects($this->once())->method('resolve')->with($operationList)
+            ->willReturn(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class);
+        $metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->metadataPool->expects($this->once())->method('getMetadata')
+            ->with(\Magento\AsynchronousOperations\Api\Data\OperationListInterface::class)->willReturn($metadata);
+        $metadata->expects($this->once())->method('getEntityConnectionName')->willReturn($connectionName);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resourceConnection->expects($this->once())
+            ->method('getConnection')->with($connectionName)->willReturn($connection);
+        $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
+        $operation = $this->getMockBuilder(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class)
+            ->setMethods(['getData'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $operationList->expects($this->once())->method('getItems')->willReturn([$operation]);
+        $operation->expects($this->once())->method('getData')->willReturn($operationData);
+        $metadata->expects($this->once())->method('getEntityTable')->willReturn($operationTable);
+        $connection->expects($this->once())->method('insertOnDuplicate')
+            ->with($operationTable, [$operationData], ['status', 'error_code', 'result_message'])
+            ->willThrowException(new \Exception());
+        $connection->expects($this->once())->method('rollBack')->willReturnSelf();
+        $this->create->execute($operationList);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php
new file mode 100644
index 00000000000..68864d12e76
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Model\ResourceModel\System\Message\Collection\Synchronized;
+
+use Magento\AsynchronousOperations\Model\ResourceModel\System\Message\Collection\Synchronized\Plugin;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Bulk\BulkStatusInterface;
+use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\AsynchronousOperations\Model\Operation\Details;
+use Magento\Framework\AuthorizationInterface;
+use Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized;
+
+/**
+ * Class PluginTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Plugin
+     */
+    private $plugin;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messagefactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkStatusMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkNotificationMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $userContextMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationsDetailsMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $authorizationMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statusMapper;
+
+    /**
+     * @var string
+     */
+    private $resourceName = 'Magento_Logging::system_magento_logging_bulk_operations';
+
+    protected function setUp()
+    {
+        $this->messagefactoryMock = $this->createPartialMock(
+            \Magento\AdminNotification\Model\System\MessageFactory::class,
+            ['create']
+        );
+        $this->bulkStatusMock = $this->createMock(BulkStatusInterface::class);
+
+        $this->userContextMock = $this->createMock(UserContextInterface::class);
+        $this->operationsDetailsMock = $this->createMock(Details::class);
+        $this->authorizationMock = $this->createMock(AuthorizationInterface::class);
+        $this->messageMock = $this->createMock(\Magento\AdminNotification\Model\System\Message::class);
+        $this->collectionMock = $this->createMock(Synchronized::class);
+        $this->bulkNotificationMock = $this->createMock(BulkNotificationManagement::class);
+        $this->statusMapper = $this->createMock(\Magento\AsynchronousOperations\Model\StatusMapper::class);
+        $this->plugin = new Plugin(
+            $this->messagefactoryMock,
+            $this->bulkStatusMock,
+            $this->bulkNotificationMock,
+            $this->userContextMock,
+            $this->operationsDetailsMock,
+            $this->authorizationMock,
+            $this->statusMapper
+        );
+    }
+
+    public function testAfterToArrayIfNotAllowed()
+    {
+        $result = [];
+        $this->authorizationMock
+            ->expects($this->once())
+            ->method('isAllowed')
+            ->with($this->resourceName)
+            ->willReturn(false);
+        $this->assertEquals($result, $this->plugin->afterToArray($this->collectionMock, $result));
+    }
+
+    /**
+     * @param array $operationDetails
+     * @dataProvider afterToDataProvider
+     */
+    public function testAfterTo($operationDetails)
+    {
+        $methods = ['getBulkId', 'getDescription', 'getStatus', 'getStartTime'];
+        $bulkMock = $this->createPartialMock(\Magento\AsynchronousOperations\Model\BulkSummary::class, $methods);
+        $result = ['items' =>[], 'totalRecords' => 1];
+        $userBulks = [$bulkMock];
+        $userId = 1;
+        $bulkUuid = 2;
+        $bulkArray = [
+            'status' => \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface::NOT_STARTED
+        ];
+        $bulkMock->expects($this->once())->method('getBulkId')->willReturn($bulkUuid);
+        $this->operationsDetailsMock
+            ->expects($this->once())
+            ->method('getDetails')
+            ->with($bulkUuid)
+            ->willReturn($operationDetails);
+        $bulkMock->expects($this->once())->method('getDescription')->willReturn('Bulk Description');
+        $this->messagefactoryMock->expects($this->once())->method('create')->willReturn($this->messageMock);
+        $this->messageMock->expects($this->once())->method('toArray')->willReturn($bulkArray);
+        $this->authorizationMock
+            ->expects($this->once())
+            ->method('isAllowed')
+            ->with($this->resourceName)
+            ->willReturn(true);
+        $this->userContextMock->expects($this->once())->method('getUserId')->willReturn($userId);
+        $this->bulkNotificationMock
+            ->expects($this->once())
+            ->method('getAcknowledgedBulksByUser')
+            ->with($userId)
+            ->willReturn([]);
+        $this->statusMapper->expects($this->once())->method('operationStatusToBulkSummaryStatus');
+        $this->bulkStatusMock->expects($this->once())->method('getBulksByUser')->willReturn($userBulks);
+        $result2 = $this->plugin->afterToArray($this->collectionMock, $result);
+        $this->assertEquals(2, $result2['totalRecords']);
+    }
+
+    public function afterToDataProvider()
+    {
+        return [
+            ['operations_successful' => 0,
+                'operations_failed' => 0,
+                'operations_total' => 10
+            ],
+            ['operations_successful' => 1,
+                'operations_failed' => 2,
+                'operations_total' => 10
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php
new file mode 100644
index 00000000000..87d2bbac3ca
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+use Magento\Framework\Bulk\OperationInterface;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+/**
+ * Class StatusMapperTest
+ */
+class StatusMapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\StatusMapper
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new \Magento\AsynchronousOperations\Model\StatusMapper();
+    }
+
+    public function testOperationStatusToBulkSummaryStatus()
+    {
+        $this->assertEquals(
+            $this->model->operationStatusToBulkSummaryStatus(OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED),
+            BulkSummaryInterface::FINISHED_WITH_FAILURE
+        );
+
+        $this->assertEquals(
+            $this->model->operationStatusToBulkSummaryStatus(OperationInterface::STATUS_TYPE_RETRIABLY_FAILED),
+            BulkSummaryInterface::FINISHED_WITH_FAILURE
+        );
+
+        $this->assertEquals(
+            $this->model->operationStatusToBulkSummaryStatus(OperationInterface::STATUS_TYPE_COMPLETE),
+            BulkSummaryInterface::FINISHED_SUCCESSFULLY
+        );
+
+        $this->assertEquals(
+            $this->model->operationStatusToBulkSummaryStatus(OperationInterface::STATUS_TYPE_OPEN),
+            BulkSummaryInterface::IN_PROGRESS
+        );
+
+        $this->assertEquals(
+            $this->model->operationStatusToBulkSummaryStatus(0),
+            BulkSummaryInterface::NOT_STARTED
+        );
+    }
+
+    public function testOperationStatusToBulkSummaryStatusWithUnknownStatus()
+    {
+        $this->assertNull($this->model->operationStatusToBulkSummaryStatus('unknown_status'));
+    }
+
+    public function testBulkSummaryStatusToOperationStatus()
+    {
+        $this->assertEquals(
+            $this->model->bulkSummaryStatusToOperationStatus(BulkSummaryInterface::FINISHED_SUCCESSFULLY),
+            OperationInterface::STATUS_TYPE_COMPLETE
+        );
+
+        $this->assertEquals(
+            $this->model->bulkSummaryStatusToOperationStatus(BulkSummaryInterface::IN_PROGRESS),
+            OperationInterface::STATUS_TYPE_OPEN
+        );
+
+        $this->assertEquals(
+            $this->model->bulkSummaryStatusToOperationStatus(BulkSummaryInterface::FINISHED_WITH_FAILURE),
+            [
+                OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+                OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+            ]
+        );
+
+        $this->assertEquals(
+            $this->model->bulkSummaryStatusToOperationStatus(BulkSummaryInterface::NOT_STARTED),
+            0
+        );
+    }
+
+    public function testBulkSummaryStatusToOperationStatusWithUnknownStatus()
+    {
+        $this->assertNull($this->model->bulkSummaryStatusToOperationStatus('unknown_status'));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/AdminNotification/PluginTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/AdminNotification/PluginTest.php
new file mode 100644
index 00000000000..cc0b3a3da38
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/AdminNotification/PluginTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Ui\Component\AdminNotification;
+
+use Magento\Framework\AuthorizationInterface;
+
+class PluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Ui\Component\AdminNotification\Plugin
+     */
+    private $plugin;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $authorizationMock;
+
+    protected function setUp()
+    {
+        $this->authorizationMock = $this->createMock(AuthorizationInterface::class);
+        $this->plugin = new \Magento\AsynchronousOperations\Ui\Component\AdminNotification\Plugin(
+            $this->authorizationMock
+        );
+    }
+
+    public function testAfterGetMeta()
+    {
+        $result = [];
+        $expectedResult = [
+            'columns' => [
+                'arguments' => [
+                    'data' => [
+                        'config' => [
+                            'isAllowed' => true
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        $dataProviderMock = $this->createMock(\Magento\AdminNotification\Ui\Component\DataProvider\DataProvider::class);
+        $this->authorizationMock->expects($this->once())->method('isAllowed')->willReturn(true);
+        $this->assertEquals($expectedResult, $this->plugin->afterGetMeta($dataProviderMock, $result));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php
new file mode 100644
index 00000000000..f5cce7af943
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\AsynchronousOperations\Model\BulkSummary;
+
+class ActionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Ui\Component\Listing\Column\Actions
+     */
+    private $actionColumn;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->context = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextInterface::class);
+        $this->uiComponentFactory = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
+        $processor = $this->createPartialMock(
+            \Magento\Framework\View\Element\UiComponent\Processor::class,
+            ['getProcessor']
+        );
+        $this->context->expects($this->never())->method('getProcessor')->will($this->returnValue($processor));
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->actionColumn = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Ui\Component\Listing\Column\Actions::class,
+            [
+                'context' => $this->context,
+                'uiComponentFactory' => $this->uiComponentFactory,
+                'components' => [],
+                'data' => ['name' => 'Edit'],
+                'editUrl' => ''
+            ]
+        );
+    }
+
+    /**
+     * Test for method prepareDataSource
+     */
+    public function testPrepareDataSource()
+    {
+        $href = 'bulk/bulk/details/id/bulk-1';
+        $this->context->expects($this->once())->method('getUrl')->with(
+            'bulk/bulk/details',
+            ['uuid' => 'bulk-1']
+        )->willReturn($href);
+        $dataSource['data']['items']['item'] = [BulkSummary::BULK_ID => 'bulk-1'];
+        $actionColumn['data']['items']['item'] = [
+            'Edit' => [
+                'edit' => [
+                    'href' => $href,
+                    'label' => __('Details'),
+                    'hidden' => false
+                ]
+            ]
+        ];
+        $expectedResult = array_merge_recursive($dataSource, $actionColumn);
+        $this->assertEquals($expectedResult, $this->actionColumn->prepareDataSource($dataSource));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationActionsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationActionsTest.php
new file mode 100644
index 00000000000..a35fd827741
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationActionsTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\AsynchronousOperations\Model\BulkSummary;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+class NotificationActionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationActions
+     */
+    private $actionColumn;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->context = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextInterface::class);
+        $this->uiComponentFactory = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
+        $processor = $this->createPartialMock(
+            \Magento\Framework\View\Element\UiComponent\Processor::class,
+            ['getProcessor']
+        );
+        $this->context->expects($this->never())->method('getProcessor')->will($this->returnValue($processor));
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->actionColumn = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationActions::class,
+            [
+                'context' => $this->context,
+                'uiComponentFactory' => $this->uiComponentFactory,
+                'components' => [],
+                'data' => ['name' => 'actions']
+            ]
+        );
+    }
+
+    public function testPrepareDataSource()
+    {
+        $testData['data']['items'] = [
+            [
+                'key' => 'value',
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-1',
+                'status' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-2',
+            ],
+        ];
+        $expectedResult['data']['items'] = [
+            [
+                'key' => 'value',
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-1',
+                'status' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+                'actions' => [
+                    'details' => [
+                        'href' => '#',
+                        'label' => __('View Details'),
+                        'callback' => [
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                                'target' => 'destroyInserted',
+                            ],
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                                'target' => 'updateData',
+                                'params' => [
+                                    BulkSummary::BULK_ID => 'uuid-1',
+                                ],
+                            ],
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal',
+                                'target' => 'openModal',
+                            ],
+                            [
+                                'provider' => 'ns = notification_area, index = columns',
+                                'target' => 'dismiss',
+                                'params' => ['uuid-1'],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-2',
+                'actions' => [
+                    'details' => [
+                        'href' => '#',
+                        'label' => __('View Details'),
+                        'callback' => [
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                                'target' => 'destroyInserted',
+                            ],
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                                'target' => 'updateData',
+                                'params' => [
+                                    BulkSummary::BULK_ID => 'uuid-2',
+                                ],
+                            ],
+                            [
+                                'provider' => 'notification_area.notification_area.modalContainer.modal',
+                                'target' => 'openModal',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->assertEquals($expectedResult, $this->actionColumn->prepareDataSource($testData));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationDismissActionsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationDismissActionsTest.php
new file mode 100644
index 00000000000..cf1f0db58df
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Listing/Column/NotificationDismissActionsTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\AsynchronousOperations\Model\BulkSummary;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+class NotificationDismissActionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationDismissActions
+     */
+    private $actionColumn;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->context = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextInterface::class);
+        $this->uiComponentFactory = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
+        $processor = $this->createPartialMock(
+            \Magento\Framework\View\Element\UiComponent\Processor::class,
+            ['getProcessor']
+        );
+        $this->context->expects($this->never())->method('getProcessor')->will($this->returnValue($processor));
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->actionColumn = $objectManager->getObject(
+            \Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationDismissActions::class,
+            [
+                'context' => $this->context,
+                'uiComponentFactory' => $this->uiComponentFactory,
+                'components' => [],
+                'data' => ['name' => 'actions']
+            ]
+        );
+    }
+
+    public function testPrepareDataSource()
+    {
+        $testData['data']['items'] = [
+            [
+                'key' => 'value',
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-1',
+                'status' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+            ],
+            [
+                'status' => BulkSummaryInterface::IN_PROGRESS,
+            ],
+        ];
+        $expectedResult['data']['items'] = [
+            [
+                'key' => 'value',
+            ],
+            [
+                BulkSummary::BULK_ID => 'uuid-1',
+                'status' => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
+                'actions' => [
+                    'dismiss' => [
+                        'href' => '#',
+                        'label' => __('Dismiss'),
+                        'callback' => [
+                            [
+                                'provider' => 'ns = notification_area, index = columns',
+                                'target' => 'dismiss',
+                                'params' => [
+                                    0 => 'uuid-1',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            [
+                'status' => BulkSummaryInterface::IN_PROGRESS,
+            ],
+        ];
+        $this->assertEquals($expectedResult, $this->actionColumn->prepareDataSource($testData));
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Operation/DataProviderTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Operation/DataProviderTest.php
new file mode 100644
index 00000000000..bc1e4bcd7e3
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Ui/Component/Operation/DataProviderTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Test\Unit\Ui\Component\Operation;
+
+use Magento\AsynchronousOperations\Ui\Component\Operation\DataProvider;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class DataProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkCollectionFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkCollectionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $operationDetailsMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkMock;
+
+    /**
+     * Set up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $helper = new ObjectManager($this);
+
+        $this->bulkCollectionFactoryMock = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory::class,
+            ['create']
+        );
+        $this->bulkCollectionMock = $this->createMock(
+            \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection::class
+        );
+        $this->operationDetailsMock = $this->createMock(\Magento\AsynchronousOperations\Model\Operation\Details::class);
+        $this->bulkMock = $this->createMock(\Magento\AsynchronousOperations\Model\BulkSummary::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+
+        $this->bulkCollectionFactoryMock
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($this->bulkCollectionMock);
+
+        $this->dataProvider = $helper->getObject(
+            \Magento\AsynchronousOperations\Ui\Component\Operation\DataProvider::class,
+            [
+                'name' => 'test-name',
+                'bulkCollectionFactory' => $this->bulkCollectionFactoryMock,
+                'operationDetails' => $this->operationDetailsMock,
+                'request' => $this->requestMock
+            ]
+        );
+    }
+
+    public function testGetData()
+    {
+        $testData = [
+            'id' => '1',
+            'uuid' => 'bulk-uuid1',
+            'user_id' => '2',
+            'description' => 'Description'
+        ];
+        $testOperationData = [
+            'operations_total' => 2,
+            'operations_successful' => 1,
+            'operations_failed' => 2
+        ];
+        $testSummaryData = [
+            'summary' => '2 items selected for mass update, 1 successfully updated, 2 failed to update'
+        ];
+        $resultData[$testData['id']] = array_merge($testData, $testOperationData, $testSummaryData);
+
+        $this->bulkCollectionMock
+            ->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$this->bulkMock]);
+        $this->bulkMock
+            ->expects($this->once())
+            ->method('getData')
+            ->willReturn($testData);
+        $this->operationDetailsMock
+            ->expects($this->once())
+            ->method('getDetails')
+            ->with($testData['uuid'])
+            ->willReturn($testOperationData);
+        $this->bulkMock
+            ->expects($this->once())
+            ->method('getBulkId')
+            ->willReturn($testData['id']);
+
+        $expectedResult = $this->dataProvider->getData();
+        $this->assertEquals($resultData, $expectedResult);
+    }
+
+    public function testPrepareMeta()
+    {
+        $resultData['retriable_operations']['arguments']['data']['disabled'] = true;
+        $resultData['failed_operations']['arguments']['data']['disabled'] = true;
+        $testData = [
+            'uuid' => 'bulk-uuid1',
+            'failed_retriable' => 0,
+            'failed_not_retriable' => 0
+        ];
+
+        $this->requestMock
+            ->expects($this->once())
+            ->method('getParam')
+            ->willReturn($testData['uuid']);
+        $this->operationDetailsMock
+            ->expects($this->once())
+            ->method('getDetails')
+            ->with($testData['uuid'])
+            ->willReturn($testData);
+
+        $expectedResult = $this->dataProvider->prepareMeta([]);
+        $this->assertEquals($resultData, $expectedResult);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/AdminNotification/Plugin.php b/app/code/Magento/AsynchronousOperations/Ui/Component/AdminNotification/Plugin.php
new file mode 100644
index 00000000000..b5670639dce
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/AdminNotification/Plugin.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Ui\Component\AdminNotification;
+
+/**
+ * Class Plugin to eliminate Bulk related links in the notification area
+ */
+class Plugin
+{
+    /**
+     * @var \Magento\Framework\AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var bool
+     */
+    private $isAllowed;
+
+    /**
+     * Plugin constructor.
+     * @param \Magento\Framework\AuthorizationInterface $authorization
+     */
+    public function __construct(
+        \Magento\Framework\AuthorizationInterface $authorization
+    ) {
+        $this->authorization = $authorization;
+    }
+
+    /**
+     * Prepares Meta
+     *
+     * @param \Magento\AdminNotification\Ui\Component\DataProvider\DataProvider $dataProvider
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetMeta(
+        \Magento\AdminNotification\Ui\Component\DataProvider\DataProvider $dataProvider,
+        $result
+    ) {
+        if (!isset($this->isAllowed)) {
+            $this->isAllowed = $this->authorization->isAllowed(
+                'Magento_Logging::system_magento_logging_bulk_operations'
+            );
+        }
+        $result['columns']['arguments']['data']['config']['isAllowed'] = $this->isAllowed;
+        return $result;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Bulk/IdentifierResolver.php b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Bulk/IdentifierResolver.php
new file mode 100644
index 00000000000..b5b7da13180
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Bulk/IdentifierResolver.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider\Bulk;
+
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Class IdentifierResolver
+ */
+class IdentifierResolver
+{
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param RequestInterface $request
+     */
+    public function __construct(
+        RequestInterface $request
+    ) {
+        $this->request = $request;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function execute()
+    {
+        return $this->request->getParam('uuid');
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResult.php b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResult.php
new file mode 100644
index 00000000000..aba7554c26d
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResult.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Failed;
+
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
+use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+use Psr\Log\LoggerInterface as Logger;
+use Magento\AsynchronousOperations\Ui\Component\DataProvider\Bulk\IdentifierResolver;
+use Magento\Framework\Bulk\OperationInterface;
+
+/**
+ * Class SearchResult
+ */
+class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
+{
+    /**
+     * @var IdentifierResolver
+     */
+    private $identifierResolver;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * SearchResult constructor.
+     * @param EntityFactory $entityFactory
+     * @param Logger $logger
+     * @param FetchStrategy $fetchStrategy
+     * @param EventManager $eventManager
+     * @param IdentifierResolver $identifierResolver
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param string $mainTable
+     * @param null $resourceModel
+     * @param string $identifierName identifier field name for collection items
+     */
+    public function __construct(
+        EntityFactory $entityFactory,
+        Logger $logger,
+        FetchStrategy $fetchStrategy,
+        EventManager $eventManager,
+        IdentifierResolver $identifierResolver,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        $mainTable = 'magento_operation',
+        $resourceModel = null,
+        $identifierName = 'id'
+    ) {
+        $this->jsonHelper = $jsonHelper;
+        $this->identifierResolver = $identifierResolver;
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $mainTable,
+            $resourceModel,
+            $identifierName
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _initSelect()
+    {
+        $bulkUuid = $this->identifierResolver->execute();
+        $this->getSelect()->from(['main_table' => $this->getMainTable()], ['id', 'result_message', 'serialized_data'])
+            ->where('bulk_uuid=?', $bulkUuid)
+            ->where('status=?', OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _afterLoad()
+    {
+        parent::_afterLoad();
+        foreach ($this->_items as $key => $item) {
+            try {
+                $unserializedData = $this->jsonHelper->jsonDecode($item['serialized_data']);
+            } catch (\Exception $e) {
+                $this->_logger->error($e->getMessage());
+                $unserializedData = [];
+            }
+            $this->_items[$key]->setData('meta_information', $this->provideMetaInfo($unserializedData));
+            $this->_items[$key]->setData('link', $this->getLink($unserializedData));
+            $this->_items[$key]->setData('entity_id', $this->getEntityId($unserializedData));
+        }
+        return $this;
+    }
+
+    /**
+     * Provide meta info by serialized data
+     *
+     * @param array $item
+     * @return string
+     */
+    private function provideMetaInfo($item)
+    {
+        $metaInfo = '';
+        if (isset($item['meta_information'])) {
+            $metaInfo = $item['meta_information'];
+        }
+        return $metaInfo;
+    }
+
+    /**
+     * Get link from serialized data
+     *
+     * @param array $item
+     * @return string
+     */
+    private function getLink($item)
+    {
+        $entityLink = '';
+        if (isset($item['entity_link'])) {
+            $entityLink = $item['entity_link'];
+        }
+        return $entityLink;
+    }
+
+    /**
+     * Get entity id from serialized data
+     *
+     * @param array $item
+     * @return string
+     */
+    private function getEntityId($item)
+    {
+        $entityLink = '';
+        if (isset($item['entity_id'])) {
+            $entityLink = $item['entity_id'];
+        }
+        return $entityLink;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResult.php b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResult.php
new file mode 100644
index 00000000000..9641bd1333f
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResult.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable;
+
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
+use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+use Psr\Log\LoggerInterface as Logger;
+use Magento\AsynchronousOperations\Ui\Component\DataProvider\Bulk\IdentifierResolver;
+use Magento\Framework\Bulk\OperationInterface;
+
+/**
+ * Class SearchResult
+ */
+class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
+{
+    /**
+     * @var IdentifierResolver
+     */
+    private $identifierResolver;
+
+    /**
+     * SearchResult constructor.
+     * @param EntityFactory $entityFactory
+     * @param Logger $logger
+     * @param FetchStrategy $fetchStrategy
+     * @param EventManager $eventManager
+     * @param IdentifierResolver $identifierResolver
+     * @param string $mainTable
+     * @param null $resourceModel
+     * @param string $identifierName
+     */
+    public function __construct(
+        EntityFactory $entityFactory,
+        Logger $logger,
+        FetchStrategy $fetchStrategy,
+        EventManager $eventManager,
+        IdentifierResolver $identifierResolver,
+        $mainTable = 'magento_operation',
+        $resourceModel = null,
+        $identifierName = 'id'
+    ) {
+        $this->identifierResolver = $identifierResolver;
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $mainTable,
+            $resourceModel,
+            $identifierName
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _initSelect()
+    {
+        $bulkUuid = $this->identifierResolver->execute();
+        $this->getSelect()->from(['main_table' => $this->getMainTable()], ['id', 'result_message', 'error_code'])
+            ->where('bulk_uuid=?', $bulkUuid)
+            ->where('status=?', OperationInterface::STATUS_TYPE_RETRIABLY_FAILED)
+            ->group('error_code')
+            ->columns(['records_qty' => new \Zend_Db_Expr('COUNT(id)')]);
+        return $this;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResult.php b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResult.php
new file mode 100644
index 00000000000..5f2fbd9ea8b
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResult.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider;
+
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
+use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+use Psr\Log\LoggerInterface as Logger;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+use Magento\AsynchronousOperations\Model\StatusMapper;
+use Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql;
+
+/**
+ * Class SearchResult
+ */
+class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
+{
+    /**
+     * @var UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var StatusMapper
+     */
+    private $statusMapper;
+
+    /**
+     * @var array|int
+     */
+    private $operationStatus;
+
+    /**
+     * @var CalculatedStatusSql
+     */
+    private $calculatedStatusSql;
+
+    /**
+     * SearchResult constructor.
+     * @param EntityFactory $entityFactory
+     * @param Logger $logger
+     * @param FetchStrategy $fetchStrategy
+     * @param EventManager $eventManager
+     * @param UserContextInterface $userContextInterface
+     * @param StatusMapper $statusMapper
+     * @param CalculatedStatusSql $calculatedStatusSql
+     * @param string $mainTable
+     * @param null $resourceModel
+     * @param string $identifierName
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        EntityFactory $entityFactory,
+        Logger $logger,
+        FetchStrategy $fetchStrategy,
+        EventManager $eventManager,
+        UserContextInterface $userContextInterface,
+        StatusMapper $statusMapper,
+        CalculatedStatusSql $calculatedStatusSql,
+        $mainTable = 'magento_bulk',
+        $resourceModel = null,
+        $identifierName = 'uuid'
+    ) {
+        $this->userContext = $userContextInterface;
+        $this->statusMapper = $statusMapper;
+        $this->calculatedStatusSql = $calculatedStatusSql;
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $mainTable,
+            $resourceModel,
+            $identifierName
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _initSelect()
+    {
+        $this->getSelect()->from(
+            ['main_table' => $this->getMainTable()],
+            [
+                '*',
+                'status' => $this->calculatedStatusSql->get($this->getTable('magento_operation'))
+            ]
+        )->where(
+            'user_id=?',
+            $this->userContext->getUserId()
+        );
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _afterLoad()
+    {
+        /** @var BulkSummaryInterface $item */
+        foreach ($this->getItems() as $item) {
+            $item->setStatus($this->statusMapper->operationStatusToBulkSummaryStatus($item->getStatus()));
+        }
+        return parent::_afterLoad();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addFieldToFilter($field, $condition = null)
+    {
+        if ($field == 'status') {
+            if (is_array($condition)) {
+                foreach ($condition as $value) {
+                    $this->operationStatus = $this->statusMapper->bulkSummaryStatusToOperationStatus($value);
+                    if (is_array($this->operationStatus)) {
+                        foreach ($this->operationStatus as $statusValue) {
+                            $this->getSelect()->orHaving('status = ?', $statusValue);
+                        }
+                        continue;
+                    }
+                    $this->getSelect()->having('status = ?', $this->operationStatus);
+                }
+            }
+            return $this;
+        }
+        return parent::addFieldToFilter($field, $condition);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSelectCountSql()
+    {
+        $select = parent::getSelectCountSql();
+        $select->columns(['status' => $this->calculatedStatusSql->get($this->getTable('magento_operation'))]);
+        //add grouping by status if filtering by status was executed
+        if (isset($this->operationStatus)) {
+            $select->group('status');
+        }
+        return $select;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/Actions.php b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/Actions.php
new file mode 100644
index 00000000000..232f8ca1356
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/Actions.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Ui\Component\Listing\Column;
+
+use Magento\Ui\Component\Listing\Columns\Column;
+
+/**
+ * Class Actions
+ */
+class Actions extends Column
+{
+    /**
+     * Prepare Data Source
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        $dataSource = parent::prepareDataSource($dataSource);
+
+        if (empty($dataSource['data']['items'])) {
+            return $dataSource;
+        }
+
+        foreach ($dataSource['data']['items'] as &$item) {
+            $item[$this->getData('name')]['edit'] = [
+                'href' => $this->context->getUrl(
+                    'bulk/bulk/details',
+                    ['uuid' => $item['uuid']]
+                ),
+                'label' => __('Details'),
+                'hidden' => false,
+            ];
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationActions.php b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationActions.php
new file mode 100644
index 00000000000..1886bbf430b
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationActions.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\Listing\Column;
+
+use Magento\Ui\Component\Listing\Columns\Column;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+/**
+ * Class Actions
+ */
+class NotificationActions extends Column
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        $dataSource = parent::prepareDataSource($dataSource);
+
+        if (empty($dataSource['data']['items'])) {
+            return $dataSource;
+        }
+
+        foreach ($dataSource['data']['items'] as &$item) {
+            if (isset($item['uuid'])) {
+                $item[$this->getData('name')]['details'] = [
+                    'callback' => [
+                        [
+                            'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                            'target' => 'destroyInserted',
+                        ],
+                        [
+                            'provider' => 'notification_area.notification_area.modalContainer.modal.insertBulk',
+                            'target' => 'updateData',
+                            'params' => [
+                                'uuid' => $item['uuid'],
+                            ],
+                        ],
+                        [
+                            'provider' => 'notification_area.notification_area.modalContainer.modal',
+                            'target' => 'openModal',
+                        ],
+                    ],
+                    'href' => '#',
+                    'label' => __('View Details'),
+                ];
+
+                if (isset($item['status'])
+                    && ($item['status'] === BulkSummaryInterface::FINISHED_SUCCESSFULLY
+                    || $item['status'] === BulkSummaryInterface::FINISHED_WITH_FAILURE)
+                ) {
+                    $item[$this->getData('name')]['details']['callback'][] = [
+                        'provider' => 'ns = notification_area, index = columns',
+                        'target' => 'dismiss',
+                        'params' => [
+                            0 => $item['uuid'],
+                        ],
+                    ];
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationDismissActions.php b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationDismissActions.php
new file mode 100644
index 00000000000..cae2524f926
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/Listing/Column/NotificationDismissActions.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\Listing\Column;
+
+use Magento\Ui\Component\Listing\Columns\Column;
+use Magento\Framework\Bulk\BulkSummaryInterface;
+
+/**
+ * Class NotificationDismissActions
+ */
+class NotificationDismissActions extends Column
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        $dataSource = parent::prepareDataSource($dataSource);
+
+        if (empty($dataSource['data']['items'])) {
+            return $dataSource;
+        }
+
+        foreach ($dataSource['data']['items'] as &$item) {
+            if (isset($item['status'])
+                && ($item['status'] === BulkSummaryInterface::FINISHED_SUCCESSFULLY
+                || $item['status'] === BulkSummaryInterface::FINISHED_WITH_FAILURE)
+            ) {
+                $item[$this->getData('name')]['dismiss'] = [
+                    'callback' => [
+                        [
+                            'provider' => 'ns = notification_area, index = columns',
+                            'target' => 'dismiss',
+                            'params' => [
+                                0 => $item['uuid'],
+                            ],
+                        ],
+                    ],
+                    'href' => '#',
+                    'label' => __('Dismiss'),
+                ];
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Ui/Component/Operation/DataProvider.php b/app/code/Magento/AsynchronousOperations/Ui/Component/Operation/DataProvider.php
new file mode 100644
index 00000000000..89aae531fec
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Ui/Component/Operation/DataProvider.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Ui\Component\Operation;
+
+/**
+ * Class DataProvider
+ */
+class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\Collection
+     */
+    protected $collection;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\Operation\Details
+     */
+    private $operationDetails;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface $request,
+     */
+    private $request;
+
+    /**
+     * DataProvider constructor.
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollectionFactory
+     * @param \Magento\AsynchronousOperations\Model\Operation\Details $operationDetails
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param array $meta
+     * @param array $data
+     */
+    public function __construct(
+        $name,
+        $primaryFieldName,
+        $requestFieldName,
+        \Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory $bulkCollectionFactory,
+        \Magento\AsynchronousOperations\Model\Operation\Details $operationDetails,
+        \Magento\Framework\App\RequestInterface $request,
+        array $meta = [],
+        array $data = []
+    ) {
+        $this->collection = $bulkCollectionFactory->create();
+        $this->operationDetails = $operationDetails;
+        $this->request = $request;
+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
+        $this->meta = $this->prepareMeta($this->meta);
+    }
+
+    /**
+     * Human readable summary for bulk
+     *
+     * @param array $operationDetails structure is implied as getOperationDetails() result
+     * @return string
+     */
+    private function getSummaryReport($operationDetails)
+    {
+        if (0 == $operationDetails['operations_successful'] && 0 == $operationDetails['operations_failed']) {
+            return __('Pending, in queue...');
+        }
+
+        $summaryReport = __('%1 items selected for mass update', $operationDetails['operations_total'])->__toString();
+        if ($operationDetails['operations_successful'] > 0) {
+            $summaryReport .= __(', %1 successfully updated', $operationDetails['operations_successful']);
+        }
+
+        if ($operationDetails['operations_failed'] > 0) {
+            $summaryReport .= __(', %1 failed to update', $operationDetails['operations_failed']);
+        }
+
+        return $summaryReport;
+    }
+
+    /**
+     * Bulk summary with operation statistics
+     *
+     * @return array
+     */
+    public function getData()
+    {
+        $data = [];
+        $items = $this->collection->getItems();
+        if (count($items) == 0) {
+            return $data;
+        }
+        $bulk = array_shift($items);
+        /** @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface $bulk */
+        $data = $bulk->getData();
+        $operationDetails = $this->operationDetails->getDetails($data['uuid']);
+        $data['summary'] = $this->getSummaryReport($operationDetails);
+        $data = array_merge($data, $operationDetails);
+
+        return [$bulk->getBulkId() => $data];
+    }
+
+    /**
+     * Prepares Meta
+     *
+     * @param array $meta
+     * @return array
+     */
+    public function prepareMeta($meta)
+    {
+        $requestId = $this->request->getParam($this->requestFieldName);
+        $operationDetails = $this->operationDetails->getDetails($requestId);
+
+        if (isset($operationDetails['failed_retriable']) && !$operationDetails['failed_retriable']) {
+            $meta['retriable_operations']['arguments']['data']['disabled'] = true;
+        }
+
+        if (isset($operationDetails['failed_not_retriable']) && !$operationDetails['failed_not_retriable']) {
+            $meta['failed_operations']['arguments']['data']['disabled'] = true;
+        }
+
+        return $meta;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
new file mode 100644
index 00000000000..7a4e7f6aad6
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "magento/module-asynchronous-operations",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "100.3.*",
+        "magento/framework-bulk": "100.3.*",
+        "magento/module-authorization": "100.3.*",
+        "magento/module-backend": "100.3.*",
+        "magento/module-ui": "100.3.*",
+        "magento/module-user": "100.3.*",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "suggest": {
+        "magento/module-admin-notification": "100.3.*",
+        "magento/module-logging": "100.3.*"
+    },
+    "type": "magento2-module",
+    "version": "100.3.0-dev",
+    "license": [
+        "proprietary"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\AsynchronousOperations\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/etc/acl.xml b/app/code/Magento/AsynchronousOperations/etc/acl.xml
new file mode 100644
index 00000000000..42521ad40ff
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/acl.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Logging::magento_logging" title="Action Log" translate="title" sortOrder="70">
+                        <resource id="Magento_Logging::magento_logging_events" title="Report" translate="title" sortOrder="10"/>
+                        <resource id="Magento_Logging::system_magento_logging_bulk_operations" title="Bulk Actions" translate="title" sortOrder="15"/>
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/adminhtml/di.xml b/app/code/Magento/AsynchronousOperations/etc/adminhtml/di.xml
new file mode 100644
index 00000000000..26dd6a39473
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/adminhtml/di.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized">
+        <plugin name="afterToArray" type="Magento\AsynchronousOperations\Model\ResourceModel\System\Message\Collection\Synchronized\Plugin" />
+    </type>
+    <type name="Magento\AdminNotification\Ui\Component\DataProvider\DataProvider">
+        <plugin name="afterGetMeta" type="Magento\AsynchronousOperations\Ui\Component\AdminNotification\Plugin" />
+    </type>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/adminhtml/menu.xml b/app/code/Magento/AsynchronousOperations/etc/adminhtml/menu.xml
new file mode 100644
index 00000000000..2e9fe34c45c
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/adminhtml/menu.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
+    <menu>
+        <add id="Magento_AsynchronousOperations::system_magento_logging"
+             title="Action Logs"
+             translate="title"
+             module="Magento_AsynchronousOperations"
+             sortOrder="70" parent="Magento_Backend::system"
+             dependsOnModule="Magento_AsynchronousOperations"
+             resource="Magento_Logging::magento_logging"/>
+        <add id="Magento_AsynchronousOperations::system_magento_logging_bulk_operations"
+             title="Bulk Actions"
+             translate="title"
+             module="Magento_AsynchronousOperations"
+             sortOrder="25"
+             parent="Magento_AsynchronousOperations::system_magento_logging"
+             action="bulk/index/"
+             resource="Magento_Logging::system_magento_logging_bulk_operations"/>
+    </menu>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/adminhtml/routes.xml b/app/code/Magento/AsynchronousOperations/etc/adminhtml/routes.xml
new file mode 100644
index 00000000000..a255af90eac
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/adminhtml/routes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="bulk" frontName="bulk">
+            <module name="Magento_AsynchronousOperations" before="Magento_Backend" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/adminhtml/system.xml b/app/code/Magento/AsynchronousOperations/etc/adminhtml/system.xml
new file mode 100644
index 00000000000..7190b807503
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/adminhtml/system.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="system">
+            <tab>advanced</tab>
+            <group id="bulk" translate="label" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="600">
+                <label>Bulk Actions</label>
+                <field id="lifetime" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Days Saved in Log</label>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/config.xml b/app/code/Magento/AsynchronousOperations/etc/config.xml
new file mode 100644
index 00000000000..e30c1005d0d
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <system>
+            <bulk>
+                <lifetime>60</lifetime>
+            </bulk>
+        </system>
+    </default>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/crontab.xml b/app/code/Magento/AsynchronousOperations/etc/crontab.xml
new file mode 100644
index 00000000000..c55b0a886ac
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/crontab.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
+    <group id="default">
+        <job name="bulk_cleanup" instance="Magento\AsynchronousOperations\Cron\BulkCleanup" method="execute">
+            <schedule>* * * * *</schedule>
+        </job>
+    </group>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
new file mode 100644
index 00000000000..b986b98abf3
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="magento_bulk" resource="default" engine="innodb"
+           comment="Bulk entity that represents set of related asynchronous operations">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Bulk Internal ID (must not be exposed)"/>
+        <column xsi:type="varbinary" name="uuid" nullable="true" length="39"
+                comment="Bulk UUID (can be exposed to reference bulk entity)"/>
+        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="true" identity="false"
+                comment="ID of the user that performed an action"/>
+        <column xsi:type="varchar" name="description" nullable="true" length="255" comment="Bulk Description"/>
+        <column xsi:type="int" name="operation_count" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Total number of operations scheduled within this bulk"/>
+        <column xsi:type="timestamp" name="start_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Bulk start time"/>
+        <constraint xsi:type="primary" name="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" name="MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID" table="magento_bulk"
+                    column="user_id" referenceTable="admin_user" referenceColumn="user_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" name="MAGENTO_BULK_UUID">
+            <column name="uuid"/>
+        </constraint>
+    </table>
+    <table name="magento_operation" resource="default" engine="innodb" comment="Operation entity">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Operation ID"/>
+        <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
+        <column xsi:type="varchar" name="topic_name" nullable="true" length="255"
+                comment="Name of the related message queue topic"/>
+        <column xsi:type="blob" name="serialized_data" nullable="true"
+                comment="Data (serialized) required to perform an operation"/>
+        <column xsi:type="smallint" name="status" padding="6" unsigned="false" nullable="true" identity="false"
+                default="0" comment="Operation status (OPEN | COMPLETE | RETRIABLY_FAILED | NOT_RETRIABLY_FAILED)"/>
+        <column xsi:type="smallint" name="error_code" padding="6" unsigned="false" nullable="true" identity="false"
+                comment="Code of the error that appeared during operation execution (used to aggregate related failed operations)"/>
+        <column xsi:type="varchar" name="result_message" nullable="true" length="255"
+                comment="Operation result message"/>
+        <constraint xsi:type="primary" name="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" name="MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID" table="magento_operation"
+                    column="bulk_uuid" referenceTable="magento_bulk" referenceColumn="uuid" onDelete="CASCADE"/>
+        <index name="MAGENTO_OPERATION_BULK_UUID_ERROR_CODE" indexType="btree">
+            <column name="bulk_uuid"/>
+            <column name="error_code"/>
+        </index>
+    </table>
+    <table name="magento_acknowledged_bulk" resource="default" engine="innodb"
+           comment="Bulk that was viewed by user from notification area">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Internal ID"/>
+        <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
+        <constraint xsi:type="primary" name="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" name="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID"
+                    table="magento_acknowledged_bulk" column="bulk_uuid" referenceTable="magento_bulk"
+                    referenceColumn="uuid" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" name="MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID">
+            <column name="bulk_uuid"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
new file mode 100644
index 00000000000..22ea2da3bd7
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
@@ -0,0 +1,46 @@
+{
+  "magento_bulk": {
+    "column": {
+      "id": true,
+      "uuid": true,
+      "user_id": true,
+      "description": true,
+      "operation_count": true,
+      "start_time": true
+    },
+    "constraint": {
+      "PRIMARY": true,
+      "MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true,
+      "MAGENTO_BULK_UUID": true
+    }
+  },
+  "magento_operation": {
+    "column": {
+      "id": true,
+      "bulk_uuid": true,
+      "topic_name": true,
+      "serialized_data": true,
+      "status": true,
+      "error_code": true,
+      "result_message": true
+    },
+    "index": {
+      "MAGENTO_OPERATION_BULK_UUID_ERROR_CODE": true
+    },
+    "constraint": {
+      "PRIMARY": true,
+      "MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID": true
+    }
+  },
+  "magento_acknowledged_bulk": {
+    "column": {
+      "id": true,
+      "bulk_uuid": true
+    },
+    "constraint": {
+      "PRIMARY": true,
+      "MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID_MAGENTO_BULK_UUID": true,
+      "MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/code/Magento/AsynchronousOperations/etc/di.xml b/app/code/Magento/AsynchronousOperations/etc/di.xml
new file mode 100644
index 00000000000..3a4225347ee
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/di.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" type="Magento\AsynchronousOperations\Model\BulkSummary" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\OperationInterface" type="Magento\AsynchronousOperations\Model\Operation" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\OperationListInterface" type="Magento\AsynchronousOperations\Model\OperationList" />
+    <preference for="Magento\Framework\Bulk\BulkManagementInterface" type="Magento\AsynchronousOperations\Model\BulkManagement" />
+    <preference for="Magento\Framework\Bulk\BulkStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus" />
+    <preference for="Magento\Framework\Bulk\OperationManagementInterface" type="Magento\AsynchronousOperations\Model\OperationManagement" />
+    <type name="Magento\Framework\EntityManager\MetadataPool">
+        <arguments>
+            <argument name="metadata" xsi:type="array">
+                <item name="Magento\AsynchronousOperations\Api\Data\OperationInterface" xsi:type="array">
+                    <item name="entityTableName" xsi:type="string">magento_operation</item>
+                    <item name="identifierField" xsi:type="string">id</item>
+                </item>
+                <item name="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" xsi:type="array">
+                    <item name="entityTableName" xsi:type="string">magento_bulk</item>
+                    <item name="identifierField" xsi:type="string">uuid</item>
+                </item>
+                <item name="Magento\AsynchronousOperations\Api\Data\OperationListInterface" xsi:type="array">
+                    <item name="entityTableName" xsi:type="string">magento_operation</item>
+                    <item name="identifierField" xsi:type="string">id</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\EntityManager\Mapper">
+        <arguments>
+            <argument name="config" xsi:type="array">
+                <item name="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" xsi:type="array">
+                    <item name="uuid" xsi:type="string">bulk_id</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="bulkSummaryMapper" type="Magento\Framework\EntityManager\CompositeMapper">
+        <arguments>
+            <argument name="mappers" xsi:type="array">
+                <item name="identifierMapper" xsi:type="object">Magento\AsynchronousOperations\Model\Entity\BulkSummaryMapper</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\EntityManager\MapperPool">
+        <arguments>
+            <argument name="mappers" xsi:type="array">
+                <item name="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" xsi:type="string">bulkSummaryMapper</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
+        <arguments>
+            <argument name="collections" xsi:type="array">
+                <item name="bulk_listing_data_source" xsi:type="string">Magento\AsynchronousOperations\Ui\Component\DataProvider\SearchResult</item>
+                <item name="failed_operation_listing_data_source" xsi:type="string">Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Failed\SearchResult</item>
+                <item name="retriable_operation_listing_data_source" xsi:type="string">Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable\SearchResult</item>
+                <item name="failed_operation_modal_listing_data_source" xsi:type="string">Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Failed\SearchResult</item>
+                <item name="retriable_operation_modal_listing_data_source" xsi:type="string">Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable\SearchResult</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\EntityManager\OperationPool">
+        <arguments>
+            <argument name="operations" xsi:type="array">
+                <item name="Magento\AsynchronousOperations\Api\Data\OperationListInterface" xsi:type="array">
+                    <item name="checkIfExists" xsi:type="string">Magento\AsynchronousOperations\Model\ResourceModel\Operation\CheckIfExists</item>
+                    <item name="create" xsi:type="string">Magento\AsynchronousOperations\Model\ResourceModel\Operation\Create</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\AsynchronousOperations\Ui\Component\DataProvider"
+                 type="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider"/>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/module.xml b/app/code/Magento/AsynchronousOperations/etc/module.xml
new file mode 100644
index 00000000000..8f7a9e14446
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_AsynchronousOperations" >
+        <sequence>
+            <module name="Magento_User"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/AsynchronousOperations/i18n/en_US.csv b/app/code/Magento/AsynchronousOperations/i18n/en_US.csv
new file mode 100644
index 00000000000..44cc0a0ab77
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/i18n/en_US.csv
@@ -0,0 +1,35 @@
+Back,Back
+Done,Done
+Retry,Retry
+"'Action Details - #' .","'Action Details - #' ."
+"%1 item(s) have been scheduled for update.""","%1 item(s) have been scheduled for update."""
+"Bulk Actions Log","Bulk Actions Log"
+"%1 item(s) are currently being updated.","%1 item(s) are currently being updated."
+"Task ""%1"": ","Task ""%1"": "
+"%1 item(s) have been scheduled for update.","%1 item(s) have been scheduled for update."
+"%1 item(s) have been successfully updated.","%1 item(s) have been successfully updated."
+"%1 item(s) failed to update","%1 item(s) failed to update"
+Details,Details
+"View Details","View Details"
+Dismiss,Dismiss
+"Pending, in queue...","Pending, in queue..."
+"%1 items selected for mass update","%1 items selected for mass update"
+", %1 successfully updated",", %1 successfully updated"
+", %1 failed to update",", %1 failed to update"
+"Something went wrong.","Something went wrong."
+"Action Log","Action Log"
+"Bulk Actions","Bulk Actions"
+"Days Saved in Log","Days Saved in Log"
+"Description of Operation","Description of Operation"
+Summary,Summary
+"Start Time","Start Time"
+"Items to Retry","Items to Retry"
+"To retry, select the items and click “Retry”.","To retry, select the items and click “Retry”."
+"Items That Can’t Be Updated.","Items That Can’t Be Updated."
+ID,ID
+Status,Status
+"Meta Information","Meta Information"
+Error,Error
+"Dismiss All Completed Tasks","Dismiss All Completed Tasks"
+"Action Details - #","Action Details - #"
+"Number of Records Affected","Number of Records Affected"
diff --git a/app/code/Magento/AsynchronousOperations/registration.php b/app/code/Magento/AsynchronousOperations/registration.php
new file mode 100644
index 00000000000..d384df583fb
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AsynchronousOperations', __DIR__);
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details.xml
new file mode 100644
index 00000000000..a250eed51c7
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="formkey"/>
+    <update handle="styles"/>
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="bulk_details_form"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details_modal.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details_modal.xml
new file mode 100644
index 00000000000..946cf0a8985
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_bulk_details_modal.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="formkey"/>
+    <update handle="styles"/>
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="bulk_details_form_modal"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_index_index.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_index_index.xml
new file mode 100644
index 00000000000..d8686887bbc
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/layout/bulk_index_index.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="formkey"/>
+    <update handle="styles"/>
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="bulk_listing"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form.xml
new file mode 100644
index 00000000000..19793ac82ba
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">bulk_details_form.bulk_details_form_data_source</item>
+        </item>
+        <item name="template" xsi:type="string">templates/form/collapsible</item>
+    </argument>
+    <settings>
+        <buttons>
+            <button name="save" class="Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\RetryButton"/>
+            <button name="back" class="Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\BackButton"/>
+        </buttons>
+        <namespace>bulk_details_form</namespace>
+        <dataScope>data</dataScope>
+        <deps>
+            <dep>bulk_details_form.bulk_details_form_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="bulk_details_form_data_source">
+        <argument name="data" xsi:type="array">
+            <item name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/form/provider</item>
+            </item>
+        </argument>
+        <settings>
+            <submitUrl path="bulk/bulk/retry"/>
+        </settings>
+        <dataProvider class="Magento\AsynchronousOperations\Ui\Component\Operation\DataProvider" name="bulk_details_form_data_source">
+            <settings>
+                <requestFieldName>uuid</requestFieldName>
+                <primaryFieldName>uuid</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <fieldset name="general" sortOrder="10">
+        <settings>
+            <label/>
+        </settings>
+        <field name="description" formElement="input">
+            <settings>
+                <elementTmpl>ui/form/element/text</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Description of Operation</label>
+            </settings>
+        </field>
+        <field name="summary" formElement="input">
+            <settings>
+                <elementTmpl>ui/form/element/text</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Summary</label>
+            </settings>
+        </field>
+        <field name="start_time" formElement="date">
+            <settings>
+                <elementTmpl>ui/form/element/textDate</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Start Time</label>
+            </settings>
+            <formElements>
+                <date>
+                    <settings>
+                        <options>
+                            <option name="showsTime" xsi:type="boolean">true</option>
+                            <option name="dateFormat" xsi:type="string">MMM d, YYYY</option>
+                            <option name="timeFormat" xsi:type="string">h:mm:ss A</option>
+                        </options>
+                    </settings>
+                </date>
+            </formElements>
+        </field>
+    </fieldset>
+    <fieldset name="retriable_operations" sortOrder="20">
+        <settings>
+            <label translate="true">Items to Retry</label>
+        </settings>
+        <container name="retriable_operations_description" template="ui/form/components/complex">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string"/>
+                    <item name="text" xsi:type="string" translate="true">To retry, select the items and click “Retry”.</item>
+                </item>
+            </argument>
+        </container>
+        <field name="retriable_operation_validation" component="Magento_AsynchronousOperations/js/form/error" template="Magento_AsynchronousOperations/form/field" formElement="input">
+            <settings>
+                <additionalClasses>
+                    <class name="message message-warning">true</class>
+                </additionalClasses>
+                <validation>
+                    <rule name="required-entry" xsi:type="array">
+                        <item name="validate" xsi:type="boolean">true</item>
+                        <item name="message" xsi:type="string">An item needs to be selected. Select and try again.</item>
+                    </rule>
+                </validation>
+                <elementTmpl/>
+                <dataType>text</dataType>
+                <dataScope>operations_to_retry</dataScope>
+            </settings>
+        </field>
+        <insertListing name="retriable_operation">
+            <settings>
+                <externalProvider>${ $.ns }.retriable_operation_listing_data_source</externalProvider>
+                <loading>false</loading>
+                <selectionsProvider>${ $.ns }.${ $.ns }.retriable_operation_listing_columns.ids</selectionsProvider>
+                <autoRender>true</autoRender>
+                <dataScope>operations_to_retry</dataScope>
+                <ns>retriable_operation_listing</ns>
+                <exports>
+                    <link name="uuid">${ $.externalProvider }:params.uuid</link>
+                </exports>
+                <imports>
+                    <link name="uuid">${ $.provider }:data.uuid</link>
+                </imports>
+            </settings>
+        </insertListing>
+    </fieldset>
+    <fieldset name="failed_operations" sortOrder="30">
+        <settings>
+            <label translate="true">Items That Can’t Be Updated.</label>
+        </settings>
+        <container name="failed_operations_description" template="ui/form/components/complex">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string"/>
+                </item>
+            </argument>
+        </container>
+        <insertListing name="failed_operation">
+            <settings>
+                <externalProvider>failed_operation_listing.failed_operation_listing_data_source</externalProvider>
+                <loading>false</loading>
+                <autoRender>true</autoRender>
+                <ns>failed_operation_listing</ns>
+                <exports>
+                    <link name="uuid">${ $.externalProvider }:params.uuid</link>
+                </exports>
+                <imports>
+                    <link name="uuid">${ $.provider }:data.uuid</link>
+                </imports>
+            </settings>
+        </insertListing>
+    </fieldset>
+</form>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form_modal.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form_modal.xml
new file mode 100644
index 00000000000..a7d4ad03a0a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_details_form_modal.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">bulk_details_form_modal.bulk_details_form_modal_data_source</item>
+        </item>
+        <item name="template" xsi:type="string">templates/form/collapsible</item>
+    </argument>
+    <settings>
+        <buttons>
+            <button name="save" class="Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\RetryButton"/>
+            <button name="done" class="Magento\AsynchronousOperations\Block\Adminhtml\Bulk\Details\DoneButton"/>
+        </buttons>
+        <namespace>bulk_details_form_modal</namespace>
+        <ajaxSave>true</ajaxSave>
+        <ajaxSaveType>simple</ajaxSaveType>
+        <dataScope>data</dataScope>
+        <deps>
+            <dep>bulk_details_form_modal.bulk_details_form_modal_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="bulk_details_form_modal_data_source">
+        <argument name="data" xsi:type="array">
+            <item name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/form/provider</item>
+            </item>
+        </argument>
+        <settings>
+            <submitUrl path="bulk/bulk/retry"/>
+        </settings>
+        <dataProvider class="Magento\AsynchronousOperations\Ui\Component\Operation\DataProvider" name="bulk_details_form_modal_data_source">
+            <settings>
+                <requestFieldName>uuid</requestFieldName>
+                <primaryFieldName>uuid</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <fieldset name="general" sortOrder="10">
+        <settings>
+            <label/>
+        </settings>
+        <field name="description" formElement="input">
+            <settings>
+                <elementTmpl>ui/form/element/text</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Description of Operation</label>
+            </settings>
+        </field>
+        <field name="summary" formElement="input">
+            <settings>
+                <elementTmpl>ui/form/element/text</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Summary</label>
+            </settings>
+        </field>
+        <field name="start_time" formElement="date">
+            <settings>
+                <elementTmpl>ui/form/element/textDate</elementTmpl>
+                <dataType>text</dataType>
+                <label translate="true">Start Time</label>
+            </settings>
+            <formElements>
+                <date>
+                    <settings>
+                        <options>
+                            <option name="timeFormat" xsi:type="string">h:mm:ss A</option>
+                            <option name="dateFormat" xsi:type="string">MMM d, YYYY</option>
+                            <option name="showsTime" xsi:type="boolean">true</option>
+                        </options>
+                    </settings>
+                </date>
+            </formElements>
+        </field>
+    </fieldset>
+    <fieldset name="retriable_operations" sortOrder="20">
+        <settings>
+            <label translate="true">Items to Retry</label>
+        </settings>
+        <container name="retriable_operations_description" template="ui/form/components/complex">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string"/>
+                    <item name="text" xsi:type="string" translate="true">To retry, select the items and click “Retry”.</item>
+                </item>
+            </argument>
+        </container>
+        <field name="retriable_operation_validation" component="Magento_AsynchronousOperations/js/form/error" template="Magento_AsynchronousOperations/form/field" formElement="input">
+            <settings>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">true</rule>
+                </validation>
+                <elementTmpl/>
+                <dataType>text</dataType>
+                <dataScope>operations_to_retry</dataScope>
+            </settings>
+        </field>
+        <insertListing name="retriable_operation">
+            <settings>
+                <externalProvider>${ $.ns }.retriable_operation_modal_listing_data_source</externalProvider>
+                <loading>false</loading>
+                <selectionsProvider>${ $.ns }.${ $.ns }.retriable_operation_modal_listing_columns.ids</selectionsProvider>
+                <autoRender>true</autoRender>
+                <dataScope>operations_to_retry</dataScope>
+                <ns>retriable_operation_modal_listing</ns>
+                <exports>
+                    <link name="uuid">${ $.externalProvider }:params.uuid</link>
+                </exports>
+                <imports>
+                    <link name="uuid">${ $.provider }:data.uuid</link>
+                </imports>
+            </settings>
+        </insertListing>
+    </fieldset>
+    <fieldset name="failed_operations" sortOrder="30">
+        <settings>
+            <label translate="true">Items That Can’t Be Updated.</label>
+        </settings>
+        <container name="failed_operations_description" template="ui/form/components/complex">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string"/>
+                </item>
+            </argument>
+        </container>
+        <insertListing name="failed_operation">
+            <settings>
+                <externalProvider>failed_operation_modal_listing.failed_operation_modal_listing_data_source</externalProvider>
+                <loading>false</loading>
+                <autoRender>true</autoRender>
+                <ns>failed_operation_modal_listing</ns>
+                <exports>
+                    <link name="uuid">${ $.externalProvider }:params.uuid</link>
+                </exports>
+                <imports>
+                    <link name="uuid">${ $.provider }:data.uuid</link>
+                </imports>
+            </settings>
+        </insertListing>
+    </fieldset>
+</form>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml
new file mode 100644
index 00000000000..512b08d6a8d
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">bulk_listing.bulk_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>bulk_columns</spinner>
+        <deps>
+            <dep>bulk_listing.bulk_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="bulk_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Logging::system_magento_logging_bulk_operations</aclResource>
+        <dataProvider class="Magento\AsynchronousOperations\Ui\Component\DataProvider" name="bulk_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <bookmark name="bookmarks"/>
+        <columnsControls name="columns_controls"/>
+        <exportButton name="export_button"/>
+        <filters name="listing_filters">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="params" xsi:type="array">
+                        <item name="filters_modifier" xsi:type="array"/>
+                    </item>
+                    <item name="observers" xsi:type="array"/>
+                </item>
+            </argument>
+            <settings>
+                <statefull>
+                    <property name="applied" xsi:type="boolean">false</property>
+                </statefull>
+            </settings>
+        </filters>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="bulk_columns">
+        <selectionsColumn name="ids" sortOrder="10">
+            <settings>
+                <indexField>uuid</indexField>
+                <visible>false</visible>
+            </settings>
+        </selectionsColumn>
+        <column name="uuid" sortOrder="20">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">ID</label>
+            </settings>
+        </column>
+        <column name="start_time" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date" sortOrder="40">
+            <settings>
+                <filter>dateRange</filter>
+                <dataType>date</dataType>
+                <label translate="true">Start Time</label>
+            </settings>
+        </column>
+        <column name="description" sortOrder="50">
+            <settings>
+                <filter>select</filter>
+                <options class="Magento\AsynchronousOperations\Model\BulkDescription\Options"/>
+                <dataType>select</dataType>
+                <label translate="true">Description of Operation</label>
+            </settings>
+        </column>
+        <column name="status" component="Magento_Ui/js/grid/columns/select" sortOrder="60">
+            <settings>
+                <filter>select</filter>
+                <options class="Magento\AsynchronousOperations\Model\BulkStatus\Options"/>
+                <dataType>select</dataType>
+                <label translate="true">Status</label>
+            </settings>
+        </column>
+        <actionsColumn name="actions" class="\Magento\AsynchronousOperations\Ui\Component\Listing\Column\Actions">
+            <settings>
+                <indexField>id</indexField>
+                <label>Action</label>
+            </settings>
+        </actionsColumn>
+    </columns>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_listing.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_listing.xml
new file mode 100644
index 00000000000..2ac762e3985
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_listing.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">failed_operation_listing.failed_operation_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>failed_operation_listing_columns</spinner>
+        <deps>
+            <dep>failed_operation_listing.failed_operation_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="failed_operation_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Logging::system_magento_logging_bulk_operations</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="failed_operation_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <paging name="listing_paging"/>
+        <exportButton name="export_button">
+            <settings>
+                <additionalParams>
+                    <param xsi:type="string" name="uuid">${ $.provider}:params.uuid</param>
+                </additionalParams>
+            </settings>
+        </exportButton>
+    </listingToolbar>
+    <columns name="failed_operation_listing_columns">
+        <settings>
+            <dndConfig>
+                <param name="enabled" xsi:type="boolean">false</param>
+            </dndConfig>
+        </settings>
+        <selectionsColumn name="ids">
+            <settings>
+                <indexField>id</indexField>
+                <visible>false</visible>
+            </settings>
+        </selectionsColumn>
+        <column name="id" component="Magento_Ui/js/grid/columns/link" sortOrder="10">
+            <settings>
+                <label translate="true">ID</label>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="meta_information" sortOrder="20">
+            <settings>
+                <label translate="true">Meta Information</label>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="result_message" sortOrder="30">
+            <settings>
+                <label translate="true">Error</label>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_modal_listing.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_modal_listing.xml
new file mode 100644
index 00000000000..62a4935da8b
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/failed_operation_modal_listing.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">failed_operation_modal_listing.failed_operation_modal_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>failed_operation_modal_listing_columns</spinner>
+        <deps>
+            <dep>failed_operation_modal_listing.failed_operation_modal_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="failed_operation_modal_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Logging::system_magento_logging_bulk_operations</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="failed_operation_modal_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <paging name="listing_paging"/>
+        <exportButton name="export_button">
+            <settings>
+                <additionalParams>
+                    <param xsi:type="string" name="uuid">${ $.provider}:params.uuid</param>
+                </additionalParams>
+            </settings>
+        </exportButton>
+    </listingToolbar>
+    <columns name="failed_operation_modal_listing_columns">
+        <settings>
+            <dndConfig>
+                <param name="enabled" xsi:type="boolean">false</param>
+            </dndConfig>
+        </settings>
+        <selectionsColumn name="ids">
+            <settings>
+                <indexField>id</indexField>
+                <visible>false</visible>
+            </settings>
+        </selectionsColumn>
+        <column name="id" component="Magento_Ui/js/grid/columns/link" sortOrder="10">
+            <settings>
+                <label translate="true">ID</label>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="meta_information" sortOrder="20">
+            <settings>
+                <label translate="true">Meta Information</label>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="result_message" sortOrder="30">
+            <settings>
+                <label translate="true">Error</label>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/notification_area.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/notification_area.xml
new file mode 100644
index 00000000000..b43a7e6f4c3
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/notification_area.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <columns name="columns" component="Magento_AsynchronousOperations/js/grid/listing" template="Magento_AsynchronousOperations/grid/listing">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="link" xsi:type="url" path="bulk/index"/>
+                <item name="linkText" xsi:type="string" translate="true">Bulk Actions Log</item>
+                <item name="dismissAllText" xsi:type="string" translate="true">Dismiss All Completed Tasks</item>
+                <item name="dismissUrl" xsi:type="url" path="bulk/notification/dismiss"/>
+            </item>
+        </argument>
+        <actionsColumn name="actions" class="Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationActions" sortOrder="20">
+            <settings>
+                <indexField>identity</indexField>
+            </settings>
+        </actionsColumn>
+        <actionsColumn name="dismiss" class="Magento\AsynchronousOperations\Ui\Component\Listing\Column\NotificationDismissActions" sortOrder="10">
+            <settings>
+                <indexField>identity</indexField>
+                <bodyTmpl>Magento_AsynchronousOperations/grid/cells/actions</bodyTmpl>
+            </settings>
+        </actionsColumn>
+    </columns>
+    <container name="modalContainer">
+        <modal name="modal">
+            <insertForm name="insertBulk" component="Magento_AsynchronousOperations/js/insert-form">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="titlePrefix" xsi:type="string" translate="true">Action Details - #</item>
+                        <item name="modalTitleProvider" xsi:type="string">${ $.externalProvider }:data.uuid</item>
+                    </item>
+                </argument>
+                <settings>
+                    <formSubmitType>ajax</formSubmitType>
+                    <columnsProvider>ns = notification_area, index = columns</columnsProvider>
+                    <renderUrl path="mui/index/render_handle">
+                        <param name="handle">bulk_bulk_details_modal</param>
+                        <param name="buttons">1</param>
+                    </renderUrl>
+                    <loading>false</loading>
+                    <toolbarContainer>${ $.parentName }</toolbarContainer>
+                    <externalProvider>${ $.ns }.bulk_details_form_modal_data_source</externalProvider>
+                    <ns>bulk_details_form_modal</ns>
+                </settings>
+            </insertForm>
+        </modal>
+    </container>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_listing.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_listing.xml
new file mode 100644
index 00000000000..3618e10ee77
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_listing.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">retriable_operation_listing.retriable_operation_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>retriable_operation_listing_columns</spinner>
+        <deps>
+            <dep>retriable_operation_listing.retriable_operation_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="retriable_operation_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Logging::system_magento_logging_bulk_operations</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="retriable_operation_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="retriable_operation_listing_columns">
+        <settings>
+            <dndConfig>
+                <param name="enabled" xsi:type="boolean">false</param>
+            </dndConfig>
+        </settings>
+        <selectionsColumn name="ids" sortOrder="10">
+            <settings>
+                <indexField>error_code</indexField>
+            </settings>
+        </selectionsColumn>
+        <column name="result_message" sortOrder="20">
+            <settings>
+                <label translate="true">Error</label>
+            </settings>
+        </column>
+        <column name="records_qty" sortOrder="30">
+            <settings>
+                <label translate="true">Number of Records Affected</label>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_modal_listing.xml b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_modal_listing.xml
new file mode 100644
index 00000000000..97e3e897c25
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/retriable_operation_modal_listing.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">retriable_operation_modal_listing.retriable_operation_modal_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>retriable_operation_modal_listing_columns</spinner>
+        <deps>
+            <dep>retriable_operation_modal_listing.retriable_operation_modal_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="retriable_operation_modal_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Logging::system_magento_logging_bulk_operations</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="retriable_operation_modal_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="retriable_operation_modal_listing_columns">
+        <settings>
+            <dndConfig>
+                <param name="enabled" xsi:type="boolean">false</param>
+            </dndConfig>
+        </settings>
+        <selectionsColumn name="ids" sortOrder="10">
+            <settings>
+                <indexField>error_code</indexField>
+            </settings>
+        </selectionsColumn>
+        <column name="result_message" sortOrder="20">
+            <settings>
+                <label translate="true">Error</label>
+            </settings>
+        </column>
+        <column name="records_qty" sortOrder="30">
+            <settings>
+                <label translate="true">Number of Records Affected</label>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/form/error.js b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/form/error.js
new file mode 100644
index 00000000000..bc41946657d
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/form/error.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/abstract'
+], function (Abstract) {
+    'use strict';
+
+    return Abstract.extend({
+        /** @inheritdoc */
+        onUpdate: function () {
+            this.bubble('update', this.hasChanged());
+        }
+    });
+});
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/grid/listing.js b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/grid/listing.js
new file mode 100644
index 00000000000..104ac0ae1ec
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/grid/listing.js
@@ -0,0 +1,88 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_AdminNotification/js/grid/listing',
+    'Magento_Ui/js/modal/alert',
+    'mage/translate',
+    'underscore',
+    'jquery'
+], function (Listing, uiAlert, $t, _, $) {
+    'use strict';
+
+    return Listing.extend({
+        defaults: {
+            isAllowed: true,
+            ajaxSettings: {
+                method: 'POST',
+                data: {},
+                url: '${ $.dismissUrl }'
+            }
+        },
+
+        /** @inheritdoc */
+        initialize: function () {
+            _.bindAll(this, 'reload', 'onError');
+
+            return this._super();
+        },
+
+        /**
+         * Dismiss all items.
+         */
+        dismissAll: function () {
+            var toDismiss = [];
+
+            _.each(this.rows, function (row) {
+                if (row.dismiss) {
+                    toDismiss.push(row.uuid);
+                }
+            });
+            toDismiss.length && this.dismiss(toDismiss);
+        },
+
+        /**
+         * Dismiss action.
+         *
+         * @param {Array} items
+         */
+        dismiss: function (items) {
+            var config = _.extend({}, this.ajaxSettings);
+
+            config.data.uuid = items;
+            this.showLoader();
+
+            $.ajax(config)
+                .done(this.reload)
+                .fail(this.onError);
+        },
+
+        /**
+         * Success callback for dismiss request.
+         */
+        reload: function () {
+            this.source.reload({
+                refresh: true
+            });
+        },
+
+        /**
+         * Error callback for dismiss request.
+         *
+         * @param {Object} xhr
+         */
+        onError: function (xhr) {
+            this.hideLoader();
+
+            if (xhr.statusText === 'abort') {
+                return;
+            }
+
+            uiAlert({
+                content: $t('Something went wrong.')
+            });
+        }
+    });
+});
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/insert-form.js b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/insert-form.js
new file mode 100644
index 00000000000..5c39534ea5e
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/js/insert-form.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/components/insert-form',
+    'uiRegistry'
+], function (Insert, registry) {
+    'use strict';
+
+    return Insert.extend({
+        defaults: {
+            modalProvider: '${ $.parentName }',
+            titlePrefix: '',
+            imports: {
+                changeModalTitle: '${ $.modalProvider }:state'
+            },
+            listens: {
+                responseData: 'afterRetry'
+            },
+            modules: {
+                modal: '${ $.modalProvider }',
+                notificationListing: '${ $.columnsProvider }'
+            }
+        },
+
+        /** @inheritdoc */
+        initConfig: function () {
+            var modalTitleProvider;
+
+            this._super();
+            modalTitleProvider = this.modalTitleProvider.split(':');
+            this.modalTitleTarget = modalTitleProvider[0];
+            this.modalTitlePath = modalTitleProvider[1];
+        },
+
+        /**
+         * Change modal title.
+         *
+         * @param {Boolean} change
+         */
+        changeModalTitle: function (change) {
+            if (change) {
+                registry.get(this.modalTitleTarget, function (target) {
+                    this.modal().setTitle(this.titlePrefix + target.get(this.modalTitlePath));
+                }.bind(this));
+            } else {
+                this.modal().setTitle('');
+            }
+        },
+
+        /**
+         * Action after retry operation.
+         *
+         * @param {Object} data
+         */
+        afterRetry: function (data) {
+            if (!data.error) {
+                this.modal().closeModal();
+                this.notificationListing().reload();
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/form/field.html b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/form/field.html
new file mode 100644
index 00000000000..6cff5e3ca97
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/form/field.html
@@ -0,0 +1,9 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div css="$data.additionalClasses"
+     if="error"
+     text="error"/>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/cells/actions.html b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/cells/actions.html
new file mode 100644
index 00000000000..17144a22cd3
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/cells/actions.html
@@ -0,0 +1,15 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="action-menu-item action-close-wrapper">
+    <button class="action-close"
+            repeat="foreach: $col.getVisibleActions($row()._rowIndex), item: '$action'"
+            click="$col.getActionHandler($action())"
+            attr="{
+                title: $action().label
+            }"
+    />
+</div>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html
new file mode 100644
index 00000000000..e6559a6ede3
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html
@@ -0,0 +1,43 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div id="system_messages" class="message-system" collapsible visible="totalRecords">
+    <div class="message-system-inner" outerClick="fixLoaderHeight.bind($data, true)">
+        <div class="message-system-short">
+            <button class="message-system-action-dropdown" toggleCollapsible>
+                <span>
+                    <translate args="'System Messages'"/>:
+                    <text args="totalRecords"/>
+                </span>
+            </button>
+            <div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
+                <fastForEach args="data: getVisible(), as: '$col'" >
+                    <render args="$col.getBody()"/>
+                </fastForEach>
+            </div>
+        </div>
+        <div class="message-system-collapsible">
+            <ul class="message-system-list">
+                <li repeat="foreach: rows, item: '$row'">
+                    <fastForEach args="data: getVisible(), as: '$col'" >
+                        <render args="$col.getBody()"/>
+                    </fastForEach>
+                </li>
+            </ul>
+            <div class="message-system-summary" if="isAllowed">
+                <a class="action__message-log"
+                   href="#"
+                   click="dismissAll"
+                   text="dismissAllText"/>
+                <a class="action__message-log"
+                    attr="{
+                        href: link
+                    }"
+                    text="linkText"/>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php b/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
index a63ab272d63..84992badf65 100644
--- a/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
+++ b/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
 use Magento\Authorization\Model\UserContextInterface;
 
diff --git a/app/code/Magento/Authorization/etc/db_schema.xml b/app/code/Magento/Authorization/etc/db_schema.xml
index ef615b4508a..45c02128bfc 100644
--- a/app/code/Magento/Authorization/etc/db_schema.xml
+++ b/app/code/Magento/Authorization/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="authorization_role" resource="default" engine="innodb" comment="Admin Role Table">
         <column xsi:type="int" name="role_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Role ID"/>
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
index 40a5d92c56b..632603d389d 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
@@ -127,7 +127,7 @@ public function getHtml()
 
     /**
      * @param string|null $index
-     * @return string
+     * @return array|string|int|float|null
      */
     public function getEscapedValue($index = null)
     {
@@ -138,6 +138,11 @@ public function getEscapedValue($index = null)
                 $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT)
             );
         }
+
+        if (is_string($value)) {
+            return $this->escapeHtml($value);
+        }
+
         return $value;
     }
 
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
index 96b3471db84..88d1560026c 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -140,8 +140,8 @@ public function getHtml()
     /**
      * Return escaped value for calendar
      *
-     * @param string $index
-     * @return string
+     * @param string|null $index
+     * @return array|string|int|float|null
      */
     public function getEscapedValue($index = null)
     {
@@ -150,6 +150,11 @@ public function getEscapedValue($index = null)
             if ($value instanceof \DateTimeInterface) {
                 return $this->_localeDate->formatDateTime($value);
             }
+
+            if (is_string($value)) {
+                return $this->escapeHtml($value);
+            }
+
             return $value;
         }
 
diff --git a/app/code/Magento/Backend/Model/Menu/Item/Validator.php b/app/code/Magento/Backend/Model/Menu/Item/Validator.php
index d79752b296e..7b72b355f55 100644
--- a/app/code/Magento/Backend/Model/Menu/Item/Validator.php
+++ b/app/code/Magento/Backend/Model/Menu/Item/Validator.php
@@ -74,34 +74,86 @@ public function __construct()
      * @throws \BadMethodCallException
      */
     public function validate($data)
+    {
+        if ($this->checkMenuItemIsRemoved($data)) {
+            return;
+        }
+
+        $this->assertContainsRequiredParameters($data);
+        $this->assertIdentifierIsNotUsed($data['id']);
+
+        foreach ($data as $param => $value) {
+            $this->validateMenuItemParameter($param, $value);
+        }
+        $this->_ids[] = $data['id'];
+    }
+
+    /**
+     * Check that menu item is not deleted
+     *
+     * @param array $data
+     * @return bool
+     */
+    private function checkMenuItemIsRemoved($data)
+    {
+        return isset($data['id'], $data['removed']) && $data['removed'] === true;
+    }
+
+    /**
+     * Check that menu item contains all required data
+     * @param array $data
+     *
+     * @throws \BadMethodCallException
+     */
+    private function assertContainsRequiredParameters($data)
     {
         foreach ($this->_required as $param) {
             if (!isset($data[$param])) {
                 throw new \BadMethodCallException('Missing required param ' . $param);
             }
         }
+    }
 
-        if (array_search($data['id'], $this->_ids) !== false) {
-            throw new \InvalidArgumentException('Item with id ' . $data['id'] . ' already exists');
+    /**
+     * Check that menu item id is not used
+     *
+     * @param string $id
+     * @throws \InvalidArgumentException
+     */
+    private function assertIdentifierIsNotUsed($id)
+    {
+        if (array_search($id, $this->_ids) !== false) {
+            throw new \InvalidArgumentException('Item with id ' . $id . ' already exists');
         }
+    }
 
-        foreach ($data as $param => $value) {
-            if ($data[$param] !== null
-            && isset(
-                $this->_validators[$param]
-            ) && !$this->_validators[$param]->isValid(
-                $value
-            )
-            ) {
-                throw new \InvalidArgumentException(
-                    "Param " . $param . " doesn't pass validation: " . implode(
-                        '; ',
-                        $this->_validators[$param]->getMessages()
-                    )
-                );
-            }
+    /**
+     * Validate menu item parameter value
+     *
+     * @param string $param
+     * @param mixed $value
+     * @throws \InvalidArgumentException
+     */
+    private function validateMenuItemParameter($param, $value)
+    {
+        if ($value === null) {
+            return;
         }
-        $this->_ids[] = $data['id'];
+        if (!isset($this->_validators[$param])) {
+            return;
+        }
+
+        $validator = $this->_validators[$param];
+        if ($validator->isValid($value)) {
+            return;
+        }
+
+        throw new \InvalidArgumentException(
+            "Param " . $param . " doesn't pass validation: " . implode(
+                '; ',
+                $validator->getMessages()
+            )
+        );
     }
 
     /**
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php
index 355d11b5613..2848c9b23d2 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php
@@ -30,6 +30,12 @@ class DateTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $localeDateMock;
 
+    /** @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject */
+    private $escaperMock;
+
+    /** @var \Magento\Backend\Block\Context|\PHPUnit_Framework_MockObject_MockObject */
+    private $contextMock;
+
     protected function setUp()
     {
         $this->mathRandomMock = $this->getMockBuilder(\Magento\Framework\Math\Random::class)
@@ -58,6 +64,17 @@ protected function setUp()
             ->setMethods([])
             ->getMock();
 
+        $this->escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock = $this->getMockBuilder(\Magento\Backend\Block\Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
+        $this->contextMock->expects($this->once())->method('getLocaleDate')->willReturn($this->localeDateMock);
+
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $objectManagerHelper->getObject(
             \Magento\Backend\Block\Widget\Grid\Column\Filter\Date::class,
@@ -65,7 +82,8 @@ protected function setUp()
                 'mathRandom' => $this->mathRandomMock,
                 'localeResolver' => $this->localeResolverMock,
                 'dateTimeFormatter' => $this->dateTimeFormatterMock,
-                'localeDate' => $this->localeDateMock
+                'localeDate' => $this->localeDateMock,
+                'context' => $this->contextMock,
             ]
         );
         $this->model->setColumn($this->columnMock);
@@ -98,4 +116,16 @@ public function testGetHtmlSuccessfulTimestamp()
         $this->assertContains('id="' . $uniqueHash . '_from" value="' . $yesterday->getTimestamp(), $output);
         $this->assertContains('id="' . $uniqueHash . '_to" value="' . $tomorrow->getTimestamp(), $output);
     }
+
+    public function testGetEscapedValueEscapeString()
+    {
+        $value = "\"><img src=x onerror=alert(2) />";
+        $array = [
+            'orig_from' => $value,
+            'from' => $value,
+        ];
+        $this->model->setValue($array);
+        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($value);
+        $this->model->getEscapedValue('from');
+    }
 }
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php
index 1e692f890a9..cdb88b6735f 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php
@@ -30,6 +30,12 @@ class DatetimeTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $localeDateMock;
 
+    /** @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject */
+    private $escaperMock;
+
+    /** @var \Magento\Backend\Block\Context|\PHPUnit_Framework_MockObject_MockObject */
+    private $contextMock;
+
     protected function setUp()
     {
         $this->mathRandomMock = $this->getMockBuilder(\Magento\Framework\Math\Random::class)
@@ -50,7 +56,7 @@ protected function setUp()
 
         $this->columnMock = $this->getMockBuilder(\Magento\Backend\Block\Widget\Grid\Column::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getTimezone', 'getHtmlId', 'getId'])
+            ->setMethods(['getTimezone', 'getHtmlId', 'getId', 'getFilterTime'])
             ->getMock();
 
         $this->localeDateMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
@@ -58,6 +64,17 @@ protected function setUp()
             ->setMethods([])
             ->getMock();
 
+        $this->escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock = $this->getMockBuilder(\Magento\Backend\Block\Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
+        $this->contextMock->expects($this->once())->method('getLocaleDate')->willReturn($this->localeDateMock);
+
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $objectManagerHelper->getObject(
             \Magento\Backend\Block\Widget\Grid\Column\Filter\Datetime::class,
@@ -65,7 +82,8 @@ protected function setUp()
                 'mathRandom' => $this->mathRandomMock,
                 'localeResolver' => $this->localeResolverMock,
                 'dateTimeFormatter' => $this->dateTimeFormatterMock,
-                'localeDate' => $this->localeDateMock
+                'localeDate' => $this->localeDateMock,
+                'context' => $this->contextMock,
             ]
         );
         $this->model->setColumn($this->columnMock);
@@ -98,4 +116,17 @@ public function testGetHtmlSuccessfulTimestamp()
         $this->assertContains('id="' . $uniqueHash . '_from" value="' . $yesterday->getTimestamp(), $output);
         $this->assertContains('id="' . $uniqueHash . '_to" value="' . $tomorrow->getTimestamp(), $output);
     }
+
+    public function testGetEscapedValueEscapeString()
+    {
+        $value = "\"><img src=x onerror=alert(2) />";
+        $array = [
+            'orig_from' => $value,
+            'from' => $value,
+        ];
+        $this->model->setValue($array);
+        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($value);
+        $this->columnMock->expects($this->once())->method('getFilterTime')->willReturn(true);
+        $this->model->getEscapedValue('from');
+    }
 }
diff --git a/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php
index da51d29bf7b..a0704002842 100644
--- a/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Convert data fro php native serialized data to JSON.
diff --git a/app/code/Magento/Bundle/Setup/Patch/Data/ApplyAttributesUpdate.php b/app/code/Magento/Bundle/Setup/Patch/Data/ApplyAttributesUpdate.php
index 0e0d4bbc74c..d8ad1757ab2 100644
--- a/app/code/Magento/Bundle/Setup/Patch/Data/ApplyAttributesUpdate.php
+++ b/app/code/Magento/Bundle/Setup/Patch/Data/ApplyAttributesUpdate.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Eav\Setup\EavSetup;
 use Magento\Eav\Setup\EavSetupFactory;
 
diff --git a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
index 4a66803d53d..44647ea76a1 100644
--- a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
+++ b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
@@ -9,8 +9,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Eav\Setup\EavSetup;
 
diff --git a/app/code/Magento/Bundle/Setup/Patch/Schema/UpdateBundleRelatedSchema.php b/app/code/Magento/Bundle/Setup/Patch/Schema/UpdateBundleRelatedSchema.php
index e348b1eb15b..94bf1d11fb4 100644
--- a/app/code/Magento/Bundle/Setup/Patch/Schema/UpdateBundleRelatedSchema.php
+++ b/app/code/Magento/Bundle/Setup/Patch/Schema/UpdateBundleRelatedSchema.php
@@ -7,8 +7,8 @@
 namespace Magento\Bundle\Setup\Patch\Schema;
 
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
-use Magento\Setup\Model\Patch\SchemaPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
 
 /**
  * Class UpdateBundleRelatedSchema
diff --git a/app/code/Magento/Bundle/etc/db_schema.xml b/app/code/Magento/Bundle/etc/db_schema.xml
index 5f9e1902697..8092f34c533 100644
--- a/app/code/Magento/Bundle/etc/db_schema.xml
+++ b/app/code/Magento/Bundle/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalog_product_bundle_option" resource="default" engine="innodb"
            comment="Catalog Product Bundle Option">
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
@@ -45,10 +45,6 @@
         <constraint xsi:type="foreign" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
                     table="catalog_product_bundle_option_value" column="option_id"
                     referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
-        <constraint xsi:type="unique" name="CATALOG_PRODUCT_BUNDLE_OPTION_VALUE_OPTION_ID_STORE_ID">
-            <column name="option_id"/>
-            <column name="store_id"/>
-        </constraint>
         <constraint xsi:type="unique" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID">
             <column name="option_id"/>
             <column name="parent_product_id"/>
diff --git a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
index 9b8518a41ff..4004a3e5f19 100644
--- a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
@@ -242,7 +242,8 @@ protected function getFormattedBundleSelections($optionValues, SelectionCollecti
                 'price' => $selection->getSelectionPriceValue(),
                 'default' => $selection->getIsDefault(),
                 'default_qty' => $selection->getSelectionQty(),
-                'price_type' => $this->getPriceTypeValue($selection->getSelectionPriceType())
+                'price_type' => $this->getPriceTypeValue($selection->getSelectionPriceType()),
+                'can_change_qty' => $selection->getSelectionCanChangeQty(),
             ];
             $bundleData .= $optionValues
                 . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
diff --git a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
index bc32483b416..8e59c866e16 100644
--- a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
+++ b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
@@ -299,6 +299,7 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
         } else {
             $productId = $selection['product_id'];
         }
+
         $populatedSelection = [
             'selection_id' => null,
             'option_id' => (int)$optionId,
@@ -310,7 +311,8 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
                 ? self::SELECTION_PRICE_TYPE_FIXED : self::SELECTION_PRICE_TYPE_PERCENT,
             'selection_price_value' => (isset($selection['price'])) ? (float)$selection['price'] : 0.0,
             'selection_qty' => (isset($selection['default_qty'])) ? (float)$selection['default_qty'] : 1.0,
-            'selection_can_change_qty' => 1,
+            'selection_can_change_qty' => isset($selection['can_change_qty'])
+                ? ($selection['can_change_qty'] ? 1 : 0) : 1,
         ];
         if (isset($selection['selection_id'])) {
             $populatedSelection['selection_id'] = $selection['selection_id'];
diff --git a/app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php b/app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php
index e76e9e1ba56..849158122e8 100644
--- a/app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php
+++ b/app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php
@@ -105,12 +105,20 @@ protected function setUp()
         );
         $this->selection = $this->createPartialMock(
             \Magento\Catalog\Model\Product::class,
-            ['getSku', 'getSelectionPriceValue', 'getIsDefault', 'getSelectionQty', 'getSelectionPriceType']
+            [
+                'getSku',
+                'getSelectionPriceValue',
+                'getIsDefault',
+                'getSelectionQty',
+                'getSelectionPriceType',
+                'getSelectionCanChangeQty'
+            ]
         );
         $this->selection->expects($this->any())->method('getSku')->willReturn(1);
         $this->selection->expects($this->any())->method('getSelectionPriceValue')->willReturn(1);
         $this->selection->expects($this->any())->method('getSelectionQty')->willReturn(1);
         $this->selection->expects($this->any())->method('getSelectionPriceType')->willReturn(1);
+        $this->selection->expects($this->any())->method('getSelectionCanChangeQty')->willReturn(1);
         $this->selectionsCollection = $this->createPartialMock(
             \Magento\Bundle\Model\ResourceModel\Selection\Collection::class,
             ['getIterator', 'addAttributeToSort']
@@ -168,6 +176,19 @@ public function testAddData()
             'additional_attributes' => $attributes
         ];
         $preparedRow = $preparedData->addData($dataRow, 1);
+
+        $bundleValues = [
+            'name=title',
+            'type=1',
+            'required=1',
+            'sku=1',
+            'price=1',
+            'default=',
+            'default_qty=1',
+            'price_type=percent',
+            'can_change_qty=1',
+        ];
+
         $expected = [
             'sku' => 'sku1',
             'additional_attributes' => 'attribute=1,attribute2="Text",attribute3=One,Two,Three',
@@ -176,7 +197,7 @@ public function testAddData()
             'bundle_sku_type' => 'fixed',
             'bundle_price_view' => 'As low as',
             'bundle_weight_type' => 'fixed',
-            'bundle_values' => 'name=title,type=1,required=1,sku=1,price=1,default=,default_qty=1,price_type=percent'
+            'bundle_values' => implode(',', $bundleValues)
         ];
         $this->assertEquals($expected, $preparedRow);
     }
diff --git a/app/code/Magento/Captcha/etc/db_schema.xml b/app/code/Magento/Captcha/etc/db_schema.xml
index 25aef55c606..fa9a14abb89 100644
--- a/app/code/Magento/Captcha/etc/db_schema.xml
+++ b/app/code/Magento/Captcha/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="captcha_log" resource="default" engine="innodb" comment="Count Login Attempts">
         <column xsi:type="varchar" name="type" nullable="false" length="32" comment="Type"/>
         <column xsi:type="varchar" name="value" nullable="false" length="32" comment="Value"/>
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
index 12adf5b0893..590c23a0aa0 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
@@ -32,4 +32,9 @@ interface ProductAttributeInterface extends \Magento\Catalog\Api\Data\EavAttribu
     const CODE_TIER_PRICE_FIELD_VALUE_TYPE = 'value_type';
     const CODE_SEO_FIELD_META_DESCRIPTION = 'meta_description';
     const CODE_WEIGHT = 'weight';
+
+    /**
+     * @return \Magento\Eav\Api\Data\AttributeExtensionInterface|null
+     */
+    public function getExtensionAttributes();
 }
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 4a7d28c383d..ee63d3400ad 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -9,11 +9,20 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Block\Product\ProductList\Toolbar;
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Config;
+use Magento\Catalog\Model\Layer;
+use Magento\Catalog\Model\Layer\Resolver;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Pricing\Price\FinalPrice;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\Config\Element;
+use Magento\Framework\Data\Helper\PostHelper;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Pricing\Render;
+use Magento\Framework\Url\Helper\Data;
 
 /**
  * Product list
@@ -40,17 +49,17 @@ class ListProduct extends AbstractProduct implements IdentityInterface
     /**
      * Catalog layer
      *
-     * @var \Magento\Catalog\Model\Layer
+     * @var Layer
      */
     protected $_catalogLayer;
 
     /**
-     * @var \Magento\Framework\Data\Helper\PostHelper
+     * @var PostHelper
      */
     protected $_postDataHelper;
 
     /**
-     * @var \Magento\Framework\Url\Helper\Data
+     * @var Data
      */
     protected $urlHelper;
 
@@ -61,18 +70,18 @@ class ListProduct extends AbstractProduct implements IdentityInterface
 
     /**
      * @param Context $context
-     * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
-     * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
+     * @param PostHelper $postDataHelper
+     * @param Resolver $layerResolver
      * @param CategoryRepositoryInterface $categoryRepository
-     * @param \Magento\Framework\Url\Helper\Data $urlHelper
+     * @param Data $urlHelper
      * @param array $data
      */
     public function __construct(
-        \Magento\Catalog\Block\Product\Context $context,
-        \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
-        \Magento\Catalog\Model\Layer\Resolver $layerResolver,
+        Context $context,
+        PostHelper $postDataHelper,
+        Resolver $layerResolver,
         CategoryRepositoryInterface $categoryRepository,
-        \Magento\Framework\Url\Helper\Data $urlHelper,
+        Data $urlHelper,
         array $data = []
     ) {
         $this->_catalogLayer = $layerResolver->get();
@@ -113,7 +122,7 @@ protected function _getProductCollection()
     /**
      * Get catalog layer model
      *
-     * @return \Magento\Catalog\Model\Layer
+     * @return Layer
      */
     public function getLayer()
     {
@@ -137,7 +146,35 @@ public function getLoadedProductCollection()
      */
     public function getMode()
     {
-        return $this->getChildBlock('toolbar')->getCurrentMode();
+        if ($this->getChildBlock('toolbar')) {
+            return $this->getChildBlock('toolbar')->getCurrentMode();
+        }
+
+        return $this->getDefaultListingMode();
+    }
+
+    /**
+     * Get listing mode for products if toolbar is removed from layout.
+     * Use the general configuration for product list mode from config path catalog/frontend/list_mode as default value
+     * or mode data from block declaration from layout.
+     *
+     * @return string
+     */
+    private function getDefaultListingMode()
+    {
+        // default Toolbar when the toolbar layout is not used
+        $defaultToolbar = $this->getToolbarBlock();
+        $availableModes = $defaultToolbar->getModes();
+
+        // layout config mode
+        $mode = $this->getData('mode');
+
+        if (!$mode || !isset($availableModes[$mode])) {
+            // default config mode
+            $mode = $defaultToolbar->getCurrentMode();
+        }
+
+        return $mode;
     }
 
     /**
@@ -148,28 +185,60 @@ public function getMode()
     protected function _beforeToHtml()
     {
         $collection = $this->_getProductCollection();
-        $this->configureToolbar($this->getToolbarBlock(), $collection);
+
+        $this->addToolbarBlock($collection);
+
         $collection->load();
 
         return parent::_beforeToHtml();
     }
 
     /**
-     * Retrieve Toolbar block
+     * Add toolbar block from product listing layout
+     *
+     * @param Collection $collection
+     */
+    private function addToolbarBlock(Collection $collection)
+    {
+        $toolbarLayout = $this->getToolbarFromLayout();
+
+        if ($toolbarLayout) {
+            $this->configureToolbar($toolbarLayout, $collection);
+        }
+    }
+
+    /**
+     * Retrieve Toolbar block from layout or a default Toolbar
      *
      * @return Toolbar
      */
     public function getToolbarBlock()
+    {
+        $block = $this->getToolbarFromLayout();
+
+        if (!$block) {
+            $block = $this->getLayout()->createBlock($this->_defaultToolbarBlock, uniqid(microtime()));
+        }
+
+        return $block;
+    }
+
+    /**
+     * Get toolbar block from layout
+     *
+     * @return bool|Toolbar
+     */
+    private function getToolbarFromLayout()
     {
         $blockName = $this->getToolbarBlockName();
+
+        $toolbarLayout = false;
+
         if ($blockName) {
-            $block = $this->getLayout()->getBlock($blockName);
-            if ($block) {
-                return $block;
-            }
+            $toolbarLayout = $this->getLayout()->getBlock($blockName);
         }
-        $block = $this->getLayout()->createBlock($this->_defaultToolbarBlock, uniqid(microtime()));
-        return $block;
+
+        return $toolbarLayout;
     }
 
     /**
@@ -203,7 +272,7 @@ public function setCollection($collection)
     }
 
     /**
-     * @param array|string|integer|\Magento\Framework\App\Config\Element $code
+     * @param array|string|integer| Element $code
      * @return $this
      */
     public function addAttribute($code)
@@ -223,7 +292,7 @@ public function getPriceBlockTemplate()
     /**
      * Retrieve Catalog Config object
      *
-     * @return \Magento\Catalog\Model\Config
+     * @return Config
      */
     protected function _getConfig()
     {
@@ -233,8 +302,8 @@ protected function _getConfig()
     /**
      * Prepare Sort By fields from Category Data
      *
-     * @param \Magento\Catalog\Model\Category $category
-     * @return \Magento\Catalog\Block\Product\ListProduct
+     * @param Category $category
+     * @return $this
      */
     public function prepareSortableFieldsByCategory($category)
     {
@@ -286,38 +355,38 @@ public function getIdentities()
     /**
      * Get post parameters
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return string
      */
-    public function getAddToCartPostParams(\Magento\Catalog\Model\Product $product)
+    public function getAddToCartPostParams(Product $product)
     {
         $url = $this->getAddToCartUrl($product);
         return [
             'action' => $url,
             'data' => [
                 'product' => $product->getEntityId(),
-                \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlHelper->getEncodedUrl($url),
+                ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlHelper->getEncodedUrl($url),
             ]
         ];
     }
 
     /**
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return string
      */
-    public function getProductPrice(\Magento\Catalog\Model\Product $product)
+    public function getProductPrice(Product $product)
     {
         $priceRender = $this->getPriceRender();
 
         $price = '';
         if ($priceRender) {
             $price = $priceRender->render(
-                \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                FinalPrice::PRICE_CODE,
                 $product,
                 [
                     'include_container' => true,
                     'display_minimal_price' => true,
-                    'zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                    'zone' => Render::ZONE_ITEM_LIST,
                     'list_category_page' => true
                 ]
             );
@@ -330,7 +399,7 @@ public function getProductPrice(\Magento\Catalog\Model\Product $product)
      * Specifies that price rendering should be done for the list of products
      * i.e. rendering happens in the scope of product list, but not single product
      *
-     * @return \Magento\Framework\Pricing\Render
+     * @return Render
      */
     protected function getPriceRender()
     {
@@ -356,7 +425,7 @@ protected function getPriceRender()
     private function initializeProductCollection()
     {
         $layer = $this->getLayer();
-        /* @var $layer \Magento\Catalog\Model\Layer */
+        /* @var $layer Layer */
         if ($this->getShowRootCategory()) {
             $this->setCategoryId($this->_storeManager->getStore()->getRootCategoryId());
         }
@@ -395,8 +464,7 @@ private function initializeProductCollection()
             $layer->setCurrentCategory($origCategory);
         }
 
-        $toolbar = $this->getToolbarBlock();
-        $this->configureToolbar($toolbar, $collection);
+        $this->addToolbarBlock($collection);
 
         $this->_eventManager->dispatch(
             'catalog_block_product_list_collection',
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index f0ba9b518fa..6a9abe0a4c6 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -202,8 +202,6 @@ public function execute()
                 }
             }
 
-            $data = $this->presentation->convertPresentationDataToInputType($data);
-
             if ($attributeId) {
                 if (!$model->getId()) {
                     $this->messageManager->addErrorMessage(__('This attribute no longer exists.'));
@@ -218,6 +216,7 @@ public function execute()
 
                 $data['attribute_code'] = $model->getAttributeCode();
                 $data['is_user_defined'] = $model->getIsUserDefined();
+                $data['frontend_input'] = $model->getFrontendInput();
             } else {
                 /**
                  * @todo add to helper and specify all relations for properties
@@ -230,6 +229,8 @@ public function execute()
                 );
             }
 
+            $data = $this->presentation->convertPresentationDataToInputType($data);
+
             $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0];
 
             if ($model->getIsUserDefined() === null || $model->getIsUserDefined() != 0) {
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 69340665b2c..9b05b8edeee 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -97,6 +97,11 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_url;
 
+    /**
+     * @var ResourceModel\Category
+     */
+    protected $_resource;
+
     /**
      * URL rewrite model
      *
@@ -313,6 +318,16 @@ protected function getCustomAttributesCodes()
         return $this->getCustomAttributeCodes->execute($this->metadataService);
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return \Magento\Catalog\Model\ResourceModel\Category
+     * @deprecated because resource models should be used directly
+     */
+    protected function _getResource()
+    {
+        return parent::_getResource();
+    }
+
     /**
      * Get flat resource model flag
      *
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index db16c34f123..9bb3562a8b1 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -120,6 +120,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_urlModel = null;
 
+    /**
+     * @var ResourceModel\Product
+     */
+    protected $_resource;
+
     /**
      * @var string
      */
@@ -475,6 +480,18 @@ protected function _construct()
         $this->_init(\Magento\Catalog\Model\ResourceModel\Product::class);
     }
 
+    /**
+     * Get resource instance
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return \Magento\Catalog\Model\ResourceModel\Product
+     * @deprecated because resource models should be used directly
+     */
+    protected function _getResource()
+    {
+        return parent::_getResource();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
index adbd6579e68..07a8c4cc4d1 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
@@ -28,13 +28,16 @@ class Inputtype extends \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputt
     /**
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Registry $coreRegistry
+     * @param array $optionsArray
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Registry $coreRegistry
+        \Magento\Framework\Registry $coreRegistry,
+        array $optionsArray = []
     ) {
         $this->_eventManager = $eventManager;
         $this->_coreRegistry = $coreRegistry;
+        parent::__construct($optionsArray);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
index 7879c629970..4f232ba4ac8 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
@@ -21,7 +21,6 @@
  * @method int setSearchWeight(int $value)
  * @method bool getIsUsedForPriceRules()
  * @method int setIsUsedForPriceRules(int $value)
- * @method \Magento\Eav\Api\Data\AttributeExtensionInterface getExtensionAttributes()
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -80,6 +79,11 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
      */
     protected $_indexerEavProcessor;
 
+    /**
+     * @var \Magento\Eav\Api\Data\AttributeExtensionFactory
+     */
+    private $eavAttributeFactory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -101,9 +105,10 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
      * @param \Magento\Catalog\Model\Indexer\Product\Eav\Processor $indexerEavProcessor
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productFlatIndexerHelper
      * @param LockValidatorInterface $lockValidator
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param \Magento\Eav\Api\Data\AttributeExtensionFactory|null $eavAttributeFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -129,12 +134,15 @@ public function __construct(
         LockValidatorInterface $lockValidator,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Eav\Api\Data\AttributeExtensionFactory $eavAttributeFactory = null
     ) {
         $this->_indexerEavProcessor = $indexerEavProcessor;
         $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
         $this->_productFlatIndexerHelper = $productFlatIndexerHelper;
         $this->attrLockValidator = $lockValidator;
+        $this->eavAttributeFactory = $eavAttributeFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Eav\Api\Data\AttributeExtensionFactory::class);
         parent::__construct(
             $context,
             $registry,
@@ -887,4 +895,18 @@ public function setIsFilterableInGrid($isFilterableInGrid)
         $this->setData(self::IS_FILTERABLE_IN_GRID, $isFilterableInGrid);
         return $this;
     }
+
+    /**
+     * @return \Magento\Eav\Api\Data\AttributeExtensionInterface
+     */
+    public function getExtensionAttributes()
+    {
+        $extensionAttributes = $this->_getExtensionAttributes();
+        if (null === $extensionAttributes) {
+            /** @var \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes */
+            $extensionAttributes = $this->eavAttributeFactory->create();
+            $this->setExtensionAttributes($extensionAttributes);
+        }
+        return $extensionAttributes;
+    }
 }
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php b/app/code/Magento/Catalog/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php
index 023ffd316c9..9698e2e049f 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php
@@ -10,8 +10,8 @@
 use Magento\Catalog\Setup\CategorySetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ChangePriceAttributeDefaultScope
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php b/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php
index 6bd0c69def2..ea8f6bbf39b 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php
@@ -9,8 +9,8 @@
 use Magento\Catalog\Setup\CategorySetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class DisallowUsingHtmlForProductName.
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultCategories.php b/app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultCategories.php
index 23f5e889793..f1d836a5862 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultCategories.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultCategories.php
@@ -11,8 +11,8 @@
 use Magento\Catalog\Setup\CategorySetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallDefaultCategories data patch.
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/SetNewResourceModelsPaths.php b/app/code/Magento/Catalog/Setup/Patch/Data/SetNewResourceModelsPaths.php
index bc480443019..d59347f501d 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/SetNewResourceModelsPaths.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/SetNewResourceModelsPaths.php
@@ -10,8 +10,8 @@
 use Magento\Catalog\Setup\CategorySetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class SetNewResourceModelsPaths
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php
index 293506530dc..1d58de1994a 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php
@@ -10,8 +10,8 @@
 use Magento\Catalog\Setup\CategorySetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateDefaultAttributeValue
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMediaAttributesBackendTypes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMediaAttributesBackendTypes.php
index 4dfd795273a..43665c569c0 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMediaAttributesBackendTypes.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMediaAttributesBackendTypes.php
@@ -10,8 +10,8 @@
 use Magento\Catalog\Setup\CategorySetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateMediaAttributesBackendTypes
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
index e6a69ba680b..d02753d44ad 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
@@ -10,8 +10,8 @@
 use Magento\Catalog\Setup\CategorySetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateProductAttributes
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductMetaDescription.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductMetaDescription.php
index e7936560d86..0c8f248d1d5 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductMetaDescription.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductMetaDescription.php
@@ -10,8 +10,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateProductMetaDescription
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php
index 85a4ec789b5..f9d6abbc374 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php
@@ -12,8 +12,8 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpgradeWebsiteAttributes
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWidgetData.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWidgetData.php
index 46c579bde20..8f72f943199 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWidgetData.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWidgetData.php
@@ -12,8 +12,8 @@
 use Magento\Framework\DB\FieldToConvert;
 use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Widget\Setup\LayoutUpdateConverter;
 
 /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
index 9f5f3313c68..51521db5331 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
@@ -441,33 +441,39 @@ public function testReindexFlatDisabled(
 
     public function testGetCustomAttributes()
     {
-        $nameAttributeCode = 'name';
-        $descriptionAttributeCode = 'description';
+        $interfaceAttributeCode = 'name';
+        $customAttributeCode = 'description';
+        $initialCustomAttributeValue = 'initial description';
+        $newCustomAttributeValue = 'new description';
+
         $this->getCustomAttributeCodes->expects($this->exactly(3))
             ->method('execute')
-            ->willReturn([$descriptionAttributeCode]);
-        $this->category->setData($nameAttributeCode, "sub");
+            ->willReturn([$customAttributeCode]);
+        $this->category->setData($interfaceAttributeCode, "sub");
 
         //The description attribute is not set, expect empty custom attribute array
         $this->assertEquals([], $this->category->getCustomAttributes());
 
         //Set the description attribute;
-        $this->category->setData($descriptionAttributeCode, "description");
+        $this->category->setData($customAttributeCode, $initialCustomAttributeValue);
         $attributeValue = new \Magento\Framework\Api\AttributeValue();
         $attributeValue2 = new \Magento\Framework\Api\AttributeValue();
         $this->attributeValueFactory->expects($this->exactly(2))->method('create')
             ->willReturnOnConsecutiveCalls($attributeValue, $attributeValue2);
         $this->assertEquals(1, count($this->category->getCustomAttributes()));
-        $this->assertNotNull($this->category->getCustomAttribute($descriptionAttributeCode));
-        $this->assertEquals("description", $this->category->getCustomAttribute($descriptionAttributeCode)->getValue());
+        $this->assertNotNull($this->category->getCustomAttribute($customAttributeCode));
+        $this->assertEquals(
+            $initialCustomAttributeValue,
+            $this->category->getCustomAttribute($customAttributeCode)->getValue()
+        );
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->category->setData($descriptionAttributeCode, "new description");
+        $this->category->setData($customAttributeCode, $newCustomAttributeValue);
         $this->assertEquals(1, count($this->category->getCustomAttributes()));
-        $this->assertNotNull($this->category->getCustomAttribute($descriptionAttributeCode));
+        $this->assertNotNull($this->category->getCustomAttribute($customAttributeCode));
         $this->assertEquals(
-            "new description",
-            $this->category->getCustomAttribute($descriptionAttributeCode)->getValue()
+            $newCustomAttributeValue,
+            $this->category->getCustomAttribute($customAttributeCode)->getValue()
         );
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/InputtypeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/InputtypeTest.php
index f5c71e45a66..0246ba337db 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/InputtypeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/InputtypeTest.php
@@ -27,27 +27,37 @@ protected function setUp()
         $this->inputtypeModel = $this->objectManagerHelper->getObject(
             \Magento\Catalog\Model\Product\Attribute\Source\Inputtype::class,
             [
-                'coreRegistry' => $this->registry
+                'coreRegistry' => $this->registry,
+                'optionsArray' => $this->getInputTypeSet()
             ]
         );
     }
 
     public function testToOptionArray()
     {
-        $inputTypesSet = [
+
+        $extraValues = [
+            ['value' => 'price', 'label' => 'Price'],
+            ['value' => 'media_image', 'label' => 'Media Image']
+        ];
+        $inputTypesSet = $this->getInputTypeSet();
+        $inputTypesSet = array_merge($inputTypesSet, $extraValues);
+
+        $this->registry->expects($this->once())->method('registry');
+        $this->registry->expects($this->once())->method('register');
+        $this->assertEquals($inputTypesSet, $this->inputtypeModel->toOptionArray());
+    }
+
+    private function getInputTypeSet()
+    {
+        return [
             ['value' => 'text', 'label' => 'Text Field'],
             ['value' => 'textarea', 'label' => 'Text Area'],
             ['value' => 'texteditor', 'label' => 'Text Editor'],
             ['value' => 'date', 'label' => 'Date'],
             ['value' => 'boolean', 'label' => 'Yes/No'],
             ['value' => 'multiselect', 'label' => 'Multiple Select'],
-            ['value' => 'select', 'label' => 'Dropdown'],
-            ['value' => 'price', 'label' => 'Price'],
-            ['value' => 'media_image', 'label' => 'Media Image'],
+            ['value' => 'select', 'label' => 'Dropdown']
         ];
-
-        $this->registry->expects($this->once())->method('registry');
-        $this->registry->expects($this->once())->method('register');
-        $this->assertEquals($inputTypesSet, $this->inputtypeModel->toOptionArray());
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index 74a71a2828e..1ba35dde7ad 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -1278,31 +1278,40 @@ public function testGetMediaGalleryImagesMerging()
 
     public function testGetCustomAttributes()
     {
-        $priceCode = 'price';
-        $colorAttributeCode = 'color';
+        $interfaceAttributeCode = 'price';
+        $customAttributeCode = 'color';
+        $initialCustomAttributeValue = 'red';
+        $newCustomAttributeValue = 'blue';
+
         $this->getCustomAttributeCodes->expects($this->exactly(3))
             ->method('execute')
-            ->willReturn([$colorAttributeCode]);
-        $this->model->setData($priceCode, 10);
+            ->willReturn([$customAttributeCode]);
+        $this->model->setData($interfaceAttributeCode, 10);
 
         //The color attribute is not set, expect empty custom attribute array
         $this->assertEquals([], $this->model->getCustomAttributes());
 
         //Set the color attribute;
-        $this->model->setData($colorAttributeCode, "red");
+        $this->model->setData($customAttributeCode, $initialCustomAttributeValue);
         $attributeValue = new \Magento\Framework\Api\AttributeValue();
         $attributeValue2 = new \Magento\Framework\Api\AttributeValue();
         $this->attributeValueFactory->expects($this->exactly(2))->method('create')
             ->willReturnOnConsecutiveCalls($attributeValue, $attributeValue2);
         $this->assertEquals(1, count($this->model->getCustomAttributes()));
-        $this->assertNotNull($this->model->getCustomAttribute($colorAttributeCode));
-        $this->assertEquals("red", $this->model->getCustomAttribute($colorAttributeCode)->getValue());
+        $this->assertNotNull($this->model->getCustomAttribute($customAttributeCode));
+        $this->assertEquals(
+            $initialCustomAttributeValue,
+            $this->model->getCustomAttribute($customAttributeCode)->getValue()
+        );
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->model->setData($colorAttributeCode, "blue");
+        $this->model->setData($customAttributeCode, $newCustomAttributeValue);
         $this->assertEquals(1, count($this->model->getCustomAttributes()));
-        $this->assertNotNull($this->model->getCustomAttribute($colorAttributeCode));
-        $this->assertEquals("blue", $this->model->getCustomAttribute($colorAttributeCode)->getValue());
+        $this->assertNotNull($this->model->getCustomAttribute($customAttributeCode));
+        $this->assertEquals(
+            $newCustomAttributeValue,
+            $this->model->getCustomAttribute($customAttributeCode)->getValue()
+        );
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index ee6d483c9d4..3dc95b02b75 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -31,6 +31,7 @@
 use Magento\Ui\Component\Form\Fieldset;
 use Magento\Ui\DataProvider\Mapper\FormElement as FormElementMapper;
 use Magento\Ui\DataProvider\Mapper\MetaProperties as MetaPropertiesMapper;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\CompositeConfigProcessor;
 
 /**
  * Class Eav
@@ -187,6 +188,11 @@ class Eav extends AbstractModifier
      */
     private $localeCurrency;
 
+    /**
+     * @var CompositeConfigProcessor
+     */
+    private $wysiwygConfigProcessor;
+
     /**
      * @param LocatorInterface $locator
      * @param CatalogEavValidationRules $catalogEavValidationRules
@@ -207,6 +213,7 @@ class Eav extends AbstractModifier
      * @param DataPersistorInterface $dataPersistor
      * @param array $attributesToDisable
      * @param array $attributesToEliminate
+     * @param CompositeConfigProcessor|null $wysiwygConfigProcessor
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -228,7 +235,8 @@ public function __construct(
         ScopeOverriddenValue $scopeOverriddenValue,
         DataPersistorInterface $dataPersistor,
         $attributesToDisable = [],
-        $attributesToEliminate = []
+        $attributesToEliminate = [],
+        CompositeConfigProcessor $wysiwygConfigProcessor = null
     ) {
         $this->locator = $locator;
         $this->catalogEavValidationRules = $catalogEavValidationRules;
@@ -249,6 +257,8 @@ public function __construct(
         $this->dataPersistor = $dataPersistor;
         $this->attributesToDisable = $attributesToDisable;
         $this->attributesToEliminate = $attributesToEliminate;
+        $this->wysiwygConfigProcessor = $wysiwygConfigProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(CompositeConfigProcessor::class);
     }
 
     /**
@@ -779,13 +789,7 @@ private function customizeWysiwyg(ProductAttributeInterface $attribute, array $m
 
         $meta['arguments']['data']['config']['formElement'] = WysiwygElement::NAME;
         $meta['arguments']['data']['config']['wysiwyg'] = true;
-        $meta['arguments']['data']['config']['wysiwygConfigData'] = [
-            'add_variables' => false,
-            'add_widgets' => false,
-            'add_directives' => true,
-            'use_container' => true,
-            'container_class' => 'hor-scroll',
-        ];
+        $meta['arguments']['data']['config']['wysiwygConfigData'] = $this->wysiwygConfigProcessor->process($attribute);
 
         return $meta;
     }
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
new file mode 100644
index 00000000000..5513af9d98e
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Psr\Log\LoggerInterface as Logger;
+
+class CompositeConfigProcessor implements WysiwygConfigDataProcessorInterface
+{
+    /**
+     * @var Logger
+     */
+    private $logger;
+
+    /**
+     * @var array
+     */
+    private $eavWysiwygDataProcessors = [];
+
+    /**
+     * CompositeConfigProcessor constructor.
+     * @param array $eavWysiwygDataProcessors
+     */
+    public function __construct(Logger $logger, array $eavWysiwygDataProcessors)
+    {
+        $this->logger = $logger;
+        $this->eavWysiwygDataProcessors = $eavWysiwygDataProcessors;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
+    {
+        $wysiwygConfigData = [];
+
+        foreach ($this->eavWysiwygDataProcessors as $processor) {
+            if (!$processor instanceof WysiwygConfigDataProcessorInterface) {
+                $this->logger->critical(
+                    __(
+                        'Processor %1 doesn\'t implement WysiwygConfigDataProcessorInterface. It will be skipped',
+                        get_class($processor)
+                    )
+                );
+                continue;
+            }
+
+            $wysiwygConfigData = array_merge_recursive($wysiwygConfigData, $processor->process($attribute));
+        }
+
+        return $wysiwygConfigData;
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php
new file mode 100644
index 00000000000..d301a45d14f
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+/**
+ * Add data to related to $meta['arguments']['data']['config']['wysiwygConfigData']
+ */
+class WysiwygConfigDataProcessor implements WysiwygConfigDataProcessorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
+    {
+        return [
+            'add_variables' => false,
+            'add_widgets' => false,
+            'add_directives' => true,
+            'use_container' => true,
+            'container_class' => 'hor-scroll',
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessorInterface.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessorInterface.php
new file mode 100644
index 00000000000..64faef7ba27
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessorInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+/**
+ * Interface WysiwygConfigDataProcessorInterface
+ */
+interface WysiwygConfigDataProcessorInterface
+{
+    /**
+     * Returns wysiwygConfigData array to render wysiwyg ui component
+     *
+     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
+     * @return array
+     */
+    public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute);
+}
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index 9739ee28a6d..7578b608d9f 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -193,4 +193,11 @@
     <type name="Magento\Eav\Api\AttributeSetRepositoryInterface">
         <plugin name="remove_products" type="Magento\Catalog\Plugin\Model\AttributeSetRepository\RemoveProducts"/>
     </type>
+    <type name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\CompositeConfigProcessor">
+        <arguments>
+            <argument name="eavWysiwygDataProcessors" xsi:type="array">
+                <item name="default" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\WysiwygConfigDataProcessor</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/db_schema.xml b/app/code/Magento/Catalog/etc/db_schema.xml
index 5160eeff9ab..f39a78d922f 100644
--- a/app/code/Magento/Catalog/etc/db_schema.xml
+++ b/app/code/Magento/Catalog/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalog_product_entity" resource="default" engine="innodb" comment="Catalog Product Table">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Entity Id"/>
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
index 130e7b169cc..1d587e21313 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
@@ -179,7 +179,7 @@
                 </imageUploader>
             </formElements>
         </field>
-        <field name="description" template="Magento_Catalog/field-wysiwyg" sortOrder="50" formElement="wysiwyg">
+        <field name="description" template="ui/form/field" sortOrder="50" formElement="wysiwyg">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="wysiwygConfigData" xsi:type="array">
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/field-wysiwyg.html b/app/code/Magento/Catalog/view/adminhtml/web/template/field-wysiwyg.html
deleted file mode 100644
index c9340eab2f2..00000000000
--- a/app/code/Magento/Catalog/view/adminhtml/web/template/field-wysiwyg.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<div class="admin__field"
-     visible="visible"
-     css="$data.additionalClasses"
-     attr="'data-index': index"
-     ifnot="stageActive">
-    <label class="admin__field-label" if="$data.label" visible="$data.labelVisible" attr="for: uid">
-        <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
-    </label>
-    <div class="admin__field-control"
-         css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
-        <render args="elementTmpl" ifnot="hasAddons()"/>
-
-        <div class="admin__control-addon" if="hasAddons()">
-            <render args="elementTmpl"/>
-
-            <label class="admin__addon-prefix" if="$data.addbefore" attr="for: uid">
-                <span text="addbefore"/>
-            </label>
-            <label class="admin__addon-suffix" if="$data.addafter" attr="for: uid">
-                <span text="addafter"/>
-            </label>
-        </div>
-
-        <render args="tooltipTpl" if="$data.tooltip"/>
-
-        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
-
-        <label class="admin__field-error" if="error" attr="for: uid" text="error"/>
-
-        <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
-            <span translate="notice"/>
-        </div>
-
-        <div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfo"></div>
-
-        <render args="$data.service.template" if="$data.hasService()"/>
-    </div>
-</div>
-
-<render if="stageActive" args="elementTmpl"/>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index b3f59991bed..cad2b3aaa01 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -77,7 +77,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                                 <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $position : '' ?>>
                                     <?php if ($_product->isSaleable()): ?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
-                                        <form data-role="tocart-form" data-product-sku="<?=  /* @NoEscape */ $_product->getSku() ?>" action="<?= /* @NoEscape */ $postParams['action'] ?>" method="post">
+                                        <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>" action="<?= /* @NoEscape */ $postParams['action'] ?>" method="post">
                                             <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $postParams['data']['product'] ?>">
                                             <input type="hidden" name="<?= /* @escapeNotVerified */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @escapeNotVerified */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
                                             <?= $block->getBlockHtml('formkey') ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index c8c915a3140..4d7005dfe6c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -16,7 +16,7 @@
 <?php $_product = $block->getProduct(); ?>
 
 <div class="product-add-form">
-    <form data-product-sku="<?= /* @NoEscape */ $_product->getSku() ?>"
+    <form data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>"
           action="<?= /* @NoEscape */ $block->getSubmitUrl($_product) ?>" method="post"
           id="product_addtocart_form"<?php if ($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
         <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $_product->getId() ?>" />
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index cf8707b4721..58e2b13b192 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1712,7 +1712,7 @@ protected function _saveProducts()
                 foreach ($rowImages as $column => $columnImages) {
                     foreach ($columnImages as $columnImageKey => $columnImage) {
                         if (!isset($uploadedImages[$columnImage])) {
-                            $uploadedFile = $this->uploadMediaFiles($columnImage, true);
+                            $uploadedFile = $this->uploadMediaFiles($columnImage);
                             $uploadedFile = $uploadedFile ?: $this->getSystemFile($columnImage);
                             if ($uploadedFile) {
                                 $uploadedImages[$columnImage] = $uploadedFile;
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php
index 07edb435743..d0ea3da59c5 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -11,8 +11,8 @@
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ConvertSerializedDataToJson
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
index 179e7a88b31..ceb353a8091 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
@@ -10,8 +10,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class CreateDefaultStock
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
index b5d1471435c..9c73da8915b 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
@@ -9,8 +9,8 @@
 use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateStockItemsWebsite
diff --git a/app/code/Magento/CatalogInventory/etc/db_schema.xml b/app/code/Magento/CatalogInventory/etc/db_schema.xml
index a5395ae0a2c..82372f7f605 100644
--- a/app/code/Magento/CatalogInventory/etc/db_schema.xml
+++ b/app/code/Magento/CatalogInventory/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="cataloginventory_stock" resource="default" engine="innodb" comment="Cataloginventory Stock">
         <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="true"
                 comment="Stock Id"/>
diff --git a/app/code/Magento/CatalogRule/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/CatalogRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
index eb5ed43806a..111d7acd530 100644
--- a/app/code/Magento/CatalogRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/CatalogRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Framework\DB\AggregatedFieldDataConverter;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\DB\FieldToConvert;
diff --git a/app/code/Magento/CatalogRule/Setup/Patch/Data/UpdateClassAliasesForCatalogRules.php b/app/code/Magento/CatalogRule/Setup/Patch/Data/UpdateClassAliasesForCatalogRules.php
index 17920a99701..ce1d76876f6 100644
--- a/app/code/Magento/CatalogRule/Setup/Patch/Data/UpdateClassAliasesForCatalogRules.php
+++ b/app/code/Magento/CatalogRule/Setup/Patch/Data/UpdateClassAliasesForCatalogRules.php
@@ -7,8 +7,8 @@
 namespace Magento\CatalogRule\Setup\Patch\Data;
 
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateClassAliasesForCatalogRules
diff --git a/app/code/Magento/CatalogRule/etc/db_schema.xml b/app/code/Magento/CatalogRule/etc/db_schema.xml
index 726c92e252f..883a992d8c7 100644
--- a/app/code/Magento/CatalogRule/etc/db_schema.xml
+++ b/app/code/Magento/CatalogRule/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalogrule" resource="default" engine="innodb" comment="CatalogRule">
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Entity Id"/>
diff --git a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
index c4413d002e1..c1c9997bc83 100644
--- a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
@@ -10,9 +10,16 @@
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\Autocomplete\DataProviderInterface;
 use Magento\Search\Model\Autocomplete\ItemFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
+use Magento\Store\Model\ScopeInterface;
 
 class DataProvider implements DataProviderInterface
 {
+    /**
+     * Autocomplete limit
+     */
+    const CONFIG_AUTOCOMPLETE_LIMIT = 'catalog/search/autocomplete_limit';
+
     /**
      * Query factory
      *
@@ -27,16 +34,29 @@ class DataProvider implements DataProviderInterface
      */
     protected $itemFactory;
 
+    /**
+     * Limit
+     *
+     * @var int
+     */
+    protected $limit;
+
     /**
      * @param QueryFactory $queryFactory
      * @param ItemFactory $itemFactory
      */
     public function __construct(
         QueryFactory $queryFactory,
-        ItemFactory $itemFactory
+        ItemFactory $itemFactory,
+        ScopeConfig $scopeConfig
     ) {
         $this->queryFactory = $queryFactory;
         $this->itemFactory = $itemFactory;
+
+        $this->limit = (int) $scopeConfig->getValue(
+            self::CONFIG_AUTOCOMPLETE_LIMIT,
+            ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
@@ -58,7 +78,7 @@ public function getItems()
                 $result[] = $resultItem;
             }
         }
-        return $result;
+        return ($this->limit) ? array_splice($result, 0, $this->limit) : $result;
     }
 
     /**
diff --git a/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php b/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
index 31cc70b0508..e266e67804e 100644
--- a/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
+++ b/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
@@ -6,8 +6,8 @@
 
 namespace Magento\CatalogSearch\Setup\Patch\Data;
 
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Framework\Indexer\IndexerInterfaceFactory;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php
index 75daf438f7b..bb8fc848bb2 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php
@@ -30,6 +30,11 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $suggestCollection;
 
+    /**
+     * @var integer
+     */
+    private $limit = 3;
+
     protected function setUp()
     {
         $helper = new ObjectManager($this);
@@ -60,11 +65,20 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
+        $scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->setMethods(['getValue'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $scopeConfig->expects($this->any())
+            ->method('getValue')
+            ->willReturn($this->limit);
+
         $this->model = $helper->getObject(
             \Magento\CatalogSearch\Model\Autocomplete\DataProvider::class,
             [
                 'queryFactory' => $queryFactory,
-                'itemFactory' => $this->itemFactory
+                'itemFactory' => $this->itemFactory,
+                'scopeConfig' => $scopeConfig
             ]
         );
     }
@@ -103,8 +117,10 @@ public function testGetItems()
             ->will($this->returnValue($expected));
 
         $this->itemFactory->expects($this->any())->method('create')->willReturn($itemMock);
+
         $result = $this->model->getItems();
         $this->assertEquals($expected, $result[0]->toArray());
+        $this->assertEquals($this->limit, count($result));
     }
 
     private function buildCollection(array $data)
diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
index f5ebd3c6c9d..18d2cdf5427 100644
--- a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
+++ b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
@@ -32,6 +32,10 @@
                     <comment>Number of popular search terms to be cached for faster response. Use “0” to cache all results after a term is searched for the second time.</comment>
                     <validate>validate-digits</validate>
                 </field>
+                <field id="autocomplete_limit" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Autocomplete Limit</label>
+                    <validate>validate-digits</validate>
+                </field>
             </group>
         </section>
     </system>
diff --git a/app/code/Magento/CatalogSearch/etc/config.xml b/app/code/Magento/CatalogSearch/etc/config.xml
index 9fb0118701d..d2b50fe9f53 100644
--- a/app/code/Magento/CatalogSearch/etc/config.xml
+++ b/app/code/Magento/CatalogSearch/etc/config.xml
@@ -16,6 +16,7 @@
                 <min_query_length>1</min_query_length>
                 <max_query_length>128</max_query_length>
                 <max_count_cacheable_search_terms>100</max_count_cacheable_search_terms>
+                <autocomplete_limit>8</autocomplete_limit>
             </search>
         </catalog>
     </default>
diff --git a/app/code/Magento/CatalogSearch/etc/db_schema.xml b/app/code/Magento/CatalogSearch/etc/db_schema.xml
index 2f6c0ba2b72..ae9217b0632 100644
--- a/app/code/Magento/CatalogSearch/etc/db_schema.xml
+++ b/app/code/Magento/CatalogSearch/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalog_eav_attribute" resource="default" comment="Catalog EAV Attribute Table">
         <column xsi:type="float" name="search_weight" unsigned="false" nullable="false"
                 default="1" comment="Search Weight"/>
diff --git a/app/code/Magento/CatalogUrlRewrite/Setup/Patch/Data/CreateUrlAttributes.php b/app/code/Magento/CatalogUrlRewrite/Setup/Patch/Data/CreateUrlAttributes.php
index dfbbb6f6f31..22e87174e1f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Setup/Patch/Data/CreateUrlAttributes.php
+++ b/app/code/Magento/CatalogUrlRewrite/Setup/Patch/Data/CreateUrlAttributes.php
@@ -10,8 +10,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class CreateUrlAttributes
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml b/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml
index bb83af6a75c..174173fa201 100644
--- a/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml
+++ b/app/code/Magento/CatalogUrlRewrite/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalog_url_rewrite_product_category" resource="default" engine="innodb"
            comment="url_rewrite_relation">
         <column xsi:type="int" name="url_rewrite_id" padding="10" unsigned="true" nullable="false" identity="false"
diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 7b0ab1bc03e..c52b7fe1881 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -74,7 +74,8 @@ public function getJsLayout()
         foreach ($this->layoutProcessors as $processor) {
             $this->jsLayout = $processor->process($this->jsLayout);
         }
-        return $this->serializer->serialize($this->jsLayout);
+
+        return json_encode($this->jsLayout, JSON_HEX_TAG);
     }
 
     /**
@@ -94,6 +95,6 @@ public function getBaseUrl()
      */
     public function getSerializedCheckoutConfig()
     {
-        return $this->serializer->serialize($this->getCheckoutConfig());
+        return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
     }
 }
diff --git a/app/code/Magento/Checkout/Block/Cart/Totals.php b/app/code/Magento/Checkout/Block/Cart/Totals.php
index d3d3adbe40f..375c564f290 100644
--- a/app/code/Magento/Checkout/Block/Cart/Totals.php
+++ b/app/code/Magento/Checkout/Block/Cart/Totals.php
@@ -69,7 +69,8 @@ public function getJsLayout()
         foreach ($this->layoutProcessors as $processor) {
             $this->jsLayout = $processor->process($this->jsLayout);
         }
-        return parent::getJsLayout();
+
+        return json_encode($this->jsLayout, JSON_HEX_TAG);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index bc3cd43a024..ca6b045ddbb 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -77,7 +77,8 @@ public function getJsLayout()
         foreach ($this->layoutProcessors as $processor) {
             $this->jsLayout = $processor->process($this->jsLayout);
         }
-        return $this->serializer->serialize($this->jsLayout);
+
+        return json_encode($this->jsLayout, JSON_HEX_TAG);
     }
 
     /**
@@ -119,6 +120,6 @@ public function getBaseUrl()
      */
     public function getSerializedCheckoutConfig()
     {
-        return $this->serializer->serialize($this->getCheckoutConfig());
+        return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
     }
 }
diff --git a/app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php b/app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php
index c7a5ddca50f..bc38809d070 100644
--- a/app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php
+++ b/app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php
@@ -10,8 +10,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class PrepareInitialCheckoutConfiguration
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
index e419a153520..302188224b9 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
@@ -99,9 +99,6 @@ public function testGetJsLayout()
             ->with($this->layout)
             ->willReturn($layoutProcessed);
 
-        $this->serializer->expects($this->once())->method('serialize')->will(
-            $this->returnValue($jsonLayoutProcessed)
-        );
         $this->assertEquals(
             $jsonLayoutProcessed,
             $this->model->getJsLayout()
@@ -121,9 +118,6 @@ public function testGetSerializedCheckoutConfig()
     {
         $checkoutConfig = ['checkout', 'config'];
         $this->configProvider->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
-        $this->serializer->expects($this->once())->method('serialize')->will(
-            $this->returnValue(json_encode($checkoutConfig))
-        );
 
         $this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
     }
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index e47fac06d80..54f77c95148 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -93,9 +93,6 @@ public function testGetJsLayout()
         $processedLayout = ['layout' => ['processed' => true]];
         $jsonLayout = '{"layout":{"processed":true}}';
         $this->layoutProcessorMock->expects($this->once())->method('process')->with([])->willReturn($processedLayout);
-        $this->serializer->expects($this->once())->method('serialize')->will(
-            $this->returnValue(json_encode($processedLayout))
-        );
 
         $this->assertEquals($jsonLayout, $this->model->getJsLayout());
     }
@@ -104,9 +101,6 @@ public function testGetSerializedCheckoutConfig()
     {
         $checkoutConfig = ['checkout', 'config'];
         $this->configProviderMock->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
-        $this->serializer->expects($this->once())->method('serialize')->will(
-            $this->returnValue(json_encode($checkoutConfig))
-        );
 
         $this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
     }
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
index 02c969f8490..0567c61f0db 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
@@ -90,7 +90,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                 <div class="control qty">
                     <input id="cart-<?= /* @escapeNotVerified */ $_item->getId() ?>-qty"
                            name="cart[<?= /* @escapeNotVerified */ $_item->getId() ?>][qty]"
-                           data-cart-item-id="<?= /* @escapeNotVerified */ $_item->getSku() ?>"
+                           data-cart-item-id="<?= $block->escapeHtml($_item->getSku()) ?>"
                            value="<?= /* @escapeNotVerified */ $block->getQty() ?>"
                            type="number"
                            size="4"
diff --git a/app/code/Magento/CheckoutAgreements/etc/db_schema.xml b/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
index 41bd8dffb4b..31b3111df98 100644
--- a/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="checkout_agreement" resource="default" engine="innodb" comment="Checkout Agreement">
         <column xsi:type="int" name="agreement_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Agreement Id"/>
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
index 3eb790c83ad..4332e2edd70 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
@@ -7,10 +7,12 @@
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
 use Magento\Backend\App\Action\Context;
+use Magento\Cms\Api\BlockRepositoryInterface;
 use Magento\Cms\Model\Block;
+use Magento\Cms\Model\BlockFactory;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\TestFramework\Inspection\Exception;
+use Magento\Framework\Registry;
 
 class Save extends \Magento\Cms\Controller\Adminhtml\Block
 {
@@ -19,17 +21,35 @@ class Save extends \Magento\Cms\Controller\Adminhtml\Block
      */
     protected $dataPersistor;
 
+    /**
+     * @var BlockFactory
+     */
+    private $blockFactory;
+
+    /**
+     * @var BlockRepositoryInterface
+     */
+    private $blockRepository;
+
     /**
      * @param Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
+     * @param Registry $coreRegistry
      * @param DataPersistorInterface $dataPersistor
+     * @param BlockFactory|null $blockFactory
+     * @param BlockRepositoryInterface|null $blockRepository
      */
     public function __construct(
         Context $context,
-        \Magento\Framework\Registry $coreRegistry,
-        DataPersistorInterface $dataPersistor
+        Registry $coreRegistry,
+        DataPersistorInterface $dataPersistor,
+        BlockFactory $blockFactory = null,
+        BlockRepositoryInterface $blockRepository = null
     ) {
         $this->dataPersistor = $dataPersistor;
+        $this->blockFactory = $blockFactory
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(BlockFactory::class);
+        $this->blockRepository = $blockRepository
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(BlockRepositoryInterface::class);
         parent::__construct($context, $coreRegistry);
     }
 
@@ -45,8 +65,6 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
         $data = $this->getRequest()->getPostValue();
         if ($data) {
-            $id = $this->getRequest()->getParam('block_id');
-
             if (isset($data['is_active']) && $data['is_active'] === 'true') {
                 $data['is_active'] = Block::STATUS_ENABLED;
             }
@@ -55,27 +73,32 @@ public function execute()
             }
 
             /** @var \Magento\Cms\Model\Block $model */
-            $model = $this->_objectManager->create(\Magento\Cms\Model\Block::class)->load($id);
-            if (!$model->getId() && $id) {
-                $this->messageManager->addError(__('This block no longer exists.'));
-                return $resultRedirect->setPath('*/*/');
+            $model = $this->blockFactory->create();
+
+            $id = $this->getRequest()->getParam('block_id');
+            if ($id) {
+                try {
+                    $model = $this->blockRepository->getById($id);
+                } catch (LocalizedException $e) {
+                    $this->messageManager->addErrorMessage(__('This block no longer exists.'));
+                    return $resultRedirect->setPath('*/*/');
+                }
             }
 
             $model->setData($data);
 
             try {
-                $model->save();
-                $this->messageManager->addSuccess(__('You saved the block.'));
+                $this->blockRepository->save($model);
+                $this->messageManager->addSuccessMessage(__('You saved the block.'));
                 $this->dataPersistor->clear('cms_block');
-
                 if ($this->getRequest()->getParam('back')) {
                     return $resultRedirect->setPath('*/*/edit', ['block_id' => $model->getId()]);
                 }
                 return $resultRedirect->setPath('*/*/');
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('Something went wrong while saving the block.'));
+                $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the block.'));
             }
 
             $this->dataPersistor->set('cms_block', $data);
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
index 5644e25dd4c..1364e618167 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -46,7 +46,6 @@ class Save extends \Magento\Backend\App\Action
      * @param DataPersistorInterface $dataPersistor
      * @param \Magento\Cms\Model\PageFactory $pageFactory
      * @param \Magento\Cms\Api\PageRepositoryInterface $pageRepository
-     *
      */
     public function __construct(
         Action\Context $context,
@@ -90,11 +89,10 @@ public function execute()
 
             $id = $this->getRequest()->getParam('page_id');
             if ($id) {
-                $model->load($id);
-                if (!$model->getId()) {
+                try {
+                    $model = $this->pageRepository->getById($id);
+                } catch (LocalizedException $e) {
                     $this->messageManager->addErrorMessage(__('This page no longer exists.'));
-                    /** \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-                    $resultRedirect = $this->resultRedirectFactory->create();
                     return $resultRedirect->setPath('*/*/');
                 }
             }
diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
index c8bab43fe8a..3e410799906 100644
--- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
@@ -207,7 +207,13 @@ public function getImageHtmlDeclaration($filename, $renderAsTag = false)
                 $html = $fileUrl;
             } else {
                 $directive = $this->urlEncoder->encode($directive);
-                $html = $this->_backendData->getUrl('cms/wysiwyg/directive', ['___directive' => $directive]);
+                $html = $this->_backendData->getUrl(
+                    'cms/wysiwyg/directive',
+                    [
+                        '___directive' => $directive,
+                        '_escape_params' => false,
+                    ]
+                );
             }
         }
         return $html;
diff --git a/app/code/Magento/Cms/Setup/Patch/Data/ConvertWidgetConditionsToJson.php b/app/code/Magento/Cms/Setup/Patch/Data/ConvertWidgetConditionsToJson.php
index d36623fea60..61f26c9bd07 100644
--- a/app/code/Magento/Cms/Setup/Patch/Data/ConvertWidgetConditionsToJson.php
+++ b/app/code/Magento/Cms/Setup/Patch/Data/ConvertWidgetConditionsToJson.php
@@ -10,8 +10,8 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Framework\DB\AggregatedFieldDataConverter;
 use Magento\Framework\DB\FieldToConvert;
 use Magento\Framework\EntityManager\MetadataPool;
diff --git a/app/code/Magento/Cms/Setup/Patch/Data/CreateDefaultPages.php b/app/code/Magento/Cms/Setup/Patch/Data/CreateDefaultPages.php
index d097ed5c817..615cdb144fd 100644
--- a/app/code/Magento/Cms/Setup/Patch/Data/CreateDefaultPages.php
+++ b/app/code/Magento/Cms/Setup/Patch/Data/CreateDefaultPages.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Cms\Setup\Patch\Data;
 
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Framework\Module\Setup\Migration;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 
diff --git a/app/code/Magento/Cms/Setup/Patch/Data/UpdatePrivacyPolicyPage.php b/app/code/Magento/Cms/Setup/Patch/Data/UpdatePrivacyPolicyPage.php
index ced4d9d7ffc..dff931bfd63 100644
--- a/app/code/Magento/Cms/Setup/Patch/Data/UpdatePrivacyPolicyPage.php
+++ b/app/code/Magento/Cms/Setup/Patch/Data/UpdatePrivacyPolicyPage.php
@@ -7,8 +7,8 @@
 namespace Magento\Cms\Setup\Patch\Data;
 
 use Magento\Cms\Model\PageFactory;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdatePrivacyPolicyPage
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php
index f6b709a5c96..40ed379e9d7 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php
@@ -65,6 +65,16 @@ class SaveTest extends \PHPUnit\Framework\TestCase
      */
     protected $saveController;
 
+    /**
+     * @var \Magento\Cms\Model\BlockFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $blockFactory;
+
+    /**
+     * @var \Magento\Cms\Api\BlockRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $blockRepository;
+
     /**
      * @var int
      */
@@ -129,11 +139,22 @@ protected function setUp()
             ->method('getResultRedirectFactory')
             ->willReturn($this->resultRedirectFactory);
 
+        $this->blockFactory = $this->getMockBuilder(\Magento\Cms\Model\BlockFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->blockRepository = $this->getMockBuilder(\Magento\Cms\Api\BlockRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->saveController = $this->objectManager->getObject(
             \Magento\Cms\Controller\Adminhtml\Block\Save::class,
             [
                 'context' => $this->contextMock,
                 'dataPersistor' => $this->dataPersistorMock,
+                'blockFactory' => $this->blockFactory,
+                'blockRepository' => $this->blockRepository,
             ]
         );
     }
@@ -158,26 +179,24 @@ public function testSaveAction()
                 ]
             );
 
-        $this->objectManagerMock->expects($this->atLeastOnce())
+        $this->blockFactory->expects($this->atLeastOnce())
             ->method('create')
-            ->with($this->equalTo(\Magento\Cms\Model\Block::class))
             ->willReturn($this->blockMock);
 
-        $this->blockMock->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $this->blockMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->blockRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willReturn($this->blockMock);
+
         $this->blockMock->expects($this->once())->method('setData');
-        $this->blockMock->expects($this->once())->method('save');
+        $this->blockRepository->expects($this->once())->method('save')->with($this->blockMock);
 
         $this->dataPersistorMock->expects($this->any())
             ->method('clear')
             ->with('cms_block');
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You saved the block.'));
 
         $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
@@ -204,20 +223,17 @@ public function testSaveActionNoId()
                 ]
             );
 
-        $this->objectManagerMock->expects($this->atLeastOnce())
+        $this->blockFactory->expects($this->atLeastOnce())
             ->method('create')
-            ->with($this->equalTo(\Magento\Cms\Model\Block::class))
             ->willReturn($this->blockMock);
 
-        $this->blockMock->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $this->blockMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(false);
+        $this->blockRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('Error message')));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('This block no longer exists.'));
 
         $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
@@ -237,22 +253,20 @@ public function testSaveAndContinue()
                 ]
             );
 
-        $this->objectManagerMock->expects($this->atLeastOnce())
+        $this->blockFactory->expects($this->atLeastOnce())
             ->method('create')
-            ->with($this->equalTo(\Magento\Cms\Model\Block::class))
             ->willReturn($this->blockMock);
 
-        $this->blockMock->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $this->blockMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->blockRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willReturn($this->blockMock);
+
         $this->blockMock->expects($this->once())->method('setData');
-        $this->blockMock->expects($this->once())->method('save');
+        $this->blockRepository->expects($this->once())->method('save')->with($this->blockMock);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You saved the block.'));
 
         $this->dataPersistorMock->expects($this->any())
@@ -279,24 +293,24 @@ public function testSaveActionThrowsException()
                 ]
             );
 
-        $this->objectManagerMock->expects($this->atLeastOnce())
+        $this->blockFactory->expects($this->atLeastOnce())
             ->method('create')
-            ->with($this->equalTo(\Magento\Cms\Model\Block::class))
             ->willReturn($this->blockMock);
 
-        $this->blockMock->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $this->blockMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->blockRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willReturn($this->blockMock);
+
         $this->blockMock->expects($this->once())->method('setData');
-        $this->blockMock->expects($this->once())->method('save')->willThrowException(new \Exception('Error message.'));
+        $this->blockRepository->expects($this->once())->method('save')
+            ->with($this->blockMock)
+            ->willThrowException(new \Exception('Error message.'));
 
         $this->messageManagerMock->expects($this->never())
-            ->method('addSuccess');
+            ->method('addSuccessMessage');
         $this->messageManagerMock->expects($this->once())
-            ->method('addException');
+            ->method('addExceptionMessage');
 
         $this->dataPersistorMock->expects($this->any())
             ->method('set')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
index 03a8fc09690..a98dd392f62 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
@@ -153,12 +153,7 @@ public function testSaveAction()
             ->method('create')
             ->willReturn($page);
 
-        $page->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $page->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->pageRepository->expects($this->once())->method('getById')->with($this->pageId)->willReturn($page);
         $page->expects($this->once())->method('setData');
         $this->pageRepository->expects($this->once())->method('save')->with($page);
 
@@ -182,6 +177,36 @@ public function testSaveActionWithoutData()
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
 
+    public function testSaveActionNoId()
+    {
+        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(['page_id' => 1]);
+        $this->requestMock->expects($this->atLeastOnce())
+            ->method('getParam')
+            ->willReturnMap(
+                [
+                    ['page_id', null, 1],
+                    ['back', null, false],
+                ]
+            );
+
+        $page = $this->getMockBuilder(\Magento\Cms\Model\Page::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->pageFactory->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($page);
+        $this->pageRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->pageId)
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('Error message')));
+        $this->messageManagerMock->expects($this->once())
+            ->method('addErrorMessage')
+            ->with(__('This page no longer exists.'));
+        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
+        $this->assertSame($this->resultRedirect, $this->saveController->execute());
+    }
+
     public function testSaveAndContinue()
     {
         $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(['page_id' => $this->pageId]);
@@ -204,12 +229,7 @@ public function testSaveAndContinue()
             ->method('create')
             ->willReturn($page);
 
-        $page->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $page->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->pageRepository->expects($this->once())->method('getById')->with($this->pageId)->willReturn($page);
         $page->expects($this->once())->method('setData');
         $this->pageRepository->expects($this->once())->method('save')->with($page);
 
@@ -251,12 +271,7 @@ public function testSaveActionThrowsException()
             ->method('create')
             ->willReturn($page);
 
-        $page->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
-        $page->expects($this->any())
-            ->method('getId')
-            ->willReturn(true);
+        $this->pageRepository->expects($this->once())->method('getById')->with($this->pageId)->willReturn($page);
         $page->expects($this->once())->method('setData');
         $this->pageRepository->expects($this->once())->method('save')->with($page)
             ->willThrowException(new \Exception('Error message.'));
diff --git a/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php b/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php
index add8c7ce79c..fc5eaf998c7 100644
--- a/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php
@@ -482,7 +482,7 @@ public function testGetImageHtmlDeclaration($baseUrl, $fileName, $isUsingStaticU
 
         $this->backendDataMock->expects($this->any())
             ->method('getUrl')
-            ->with('cms/wysiwyg/directive', ['___directive' => $directive])
+            ->with('cms/wysiwyg/directive', ['___directive' => $directive, '_escape_params' => false])
             ->willReturn($directive);
 
         $this->assertEquals($expectedHtml, $this->imagesHelper->getImageHtmlDeclaration($fileName));
diff --git a/app/code/Magento/Cms/etc/db_schema.xml b/app/code/Magento/Cms/etc/db_schema.xml
index b108dc1b63c..2b825544f56 100644
--- a/app/code/Magento/Cms/etc/db_schema.xml
+++ b/app/code/Magento/Cms/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="cms_block" resource="default" engine="innodb" comment="CMS Block Table">
         <column xsi:type="smallint" name="block_id" padding="6" unsigned="false" nullable="false" identity="true"
                 comment="Entity Id"/>
diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index ed645bb63fe..4f6d9c14346 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -141,7 +141,7 @@ public function get($path = '')
         $pathParts = explode('/', $path);
         if (count($pathParts) === 1 && $pathParts[0] !== 'default') {
             if (!isset($this->data[$pathParts[0]])) {
-                $data = $this->reader->read();
+                $data = $this->readData();
                 $this->data = array_replace_recursive($data, $this->data);
             }
             return $this->data[$pathParts[0]];
@@ -171,7 +171,7 @@ private function loadAllData()
     {
         $cachedData = $this->cache->load($this->configType);
         if ($cachedData === false) {
-            $data = $this->reader->read();
+            $data = $this->readData();
         } else {
             $data = $this->serializer->unserialize($cachedData);
         }
@@ -188,7 +188,7 @@ private function loadDefaultScopeData($scopeType)
     {
         $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
         if ($cachedData === false) {
-            $data = $this->reader->read();
+            $data = $this->readData();
             $this->cacheData($data);
         } else {
             $data = [$scopeType => $this->serializer->unserialize($cachedData)];
@@ -216,7 +216,7 @@ private function loadScopeData($scopeType, $scopeId)
             if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
                 return [$scopeType => [$scopeId => []]];
             }
-            $data = $this->reader->read();
+            $data = $this->readData();
             $this->cacheData($data);
         } else {
             $data = [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]];
@@ -282,6 +282,21 @@ private function getDataByPathParts($data, $pathParts)
         return $data;
     }
 
+    /**
+     * The freshly read data.
+     *
+     * @return array
+     */
+    private function readData(): array
+    {
+        $this->data = $this->reader->read();
+        $this->data = $this->postProcessor->process(
+            $this->data
+        );
+
+        return $this->data;
+    }
+
     /**
      * Clean cache and global variables cache
      *
diff --git a/app/code/Magento/Config/App/Config/Type/System/Reader.php b/app/code/Magento/Config/App/Config/Type/System/Reader.php
index d5a0f09cdd6..9916b795a53 100644
--- a/app/code/Magento/Config/App/Config/Type/System/Reader.php
+++ b/app/code/Magento/Config/App/Config/Type/System/Reader.php
@@ -27,17 +27,13 @@ class Reader
      */
     private $preProcessor;
 
-    /**
-     * @var \Magento\Framework\App\Config\Spi\PostProcessorInterface
-     */
-    private $postProcessor;
-
     /**
      * Reader constructor.
      * @param \Magento\Framework\App\Config\ConfigSourceInterface $source
      * @param \Magento\Store\Model\Config\Processor\Fallback $fallback
      * @param \Magento\Framework\App\Config\Spi\PreProcessorInterface $preProcessor
      * @param \Magento\Framework\App\Config\Spi\PostProcessorInterface $postProcessor
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\App\Config\ConfigSourceInterface $source,
@@ -48,7 +44,6 @@ public function __construct(
         $this->source = $source;
         $this->fallback = $fallback;
         $this->preProcessor = $preProcessor;
-        $this->postProcessor = $postProcessor;
     }
 
     /**
@@ -60,11 +55,9 @@ public function __construct(
      */
     public function read()
     {
-        return $this->postProcessor->process(
-            $this->fallback->process(
-                $this->preProcessor->process(
-                    $this->source->get()
-                )
+        return $this->fallback->process(
+            $this->preProcessor->process(
+                $this->source->get()
             )
         );
     }
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php b/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php
index b884fc2d91f..1b287573a92 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php
@@ -28,7 +28,14 @@ class ConfigSetProcessorFactory
      * lock - save and lock configuration
      */
     const TYPE_DEFAULT = 'default';
+    
+    /**
+     * @deprecated
+     * @see TYPE_LOCK_ENV or TYPE_LOCK_CONFIG
+     */
     const TYPE_LOCK = 'lock';
+    const TYPE_LOCK_ENV = 'lock-env';
+    const TYPE_LOCK_CONFIG = 'lock-config';
     /**#@-*/
 
     /**#@-*/
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index 2f5c10037ef..d7d513bfad4 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -72,7 +72,7 @@ public function process($path, $value, $scope, $scopeCode)
             throw new CouldNotSaveException(
                 __(
                     'The value you set has already been locked. To change the value, use the --%1 option.',
-                    ConfigSetCommand::OPTION_LOCK
+                    ConfigSetCommand::OPTION_LOCK_ENV
                 )
             );
         }
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/LockProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/LockProcessor.php
index 0bd28f0f78d..6fe2adde3c4 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/LockProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/LockProcessor.php
@@ -16,7 +16,8 @@
 
 /**
  * Processes file lock flow of config:set command.
- * This processor saves the value of configuration and lock it for editing in Admin interface.
+ * This processor saves the value of configuration into app/etc/env.php
+ * and locks it for editing in Admin interface.
  *
  * {@inheritdoc}
  */
@@ -49,23 +50,30 @@ class LockProcessor implements ConfigSetProcessorInterface
      * @var ConfigPathResolver
      */
     private $configPathResolver;
+    /**
+     * @var string
+     */
+    private $target;
 
     /**
      * @param PreparedValueFactory $preparedValueFactory The factory for prepared value
      * @param DeploymentConfig\Writer $writer The deployment configuration writer
      * @param ArrayManager $arrayManager An array manager for different manipulations with arrays
      * @param ConfigPathResolver $configPathResolver The resolver for configuration paths according to source type
+     * @param string $target
      */
     public function __construct(
         PreparedValueFactory $preparedValueFactory,
         DeploymentConfig\Writer $writer,
         ArrayManager $arrayManager,
-        ConfigPathResolver $configPathResolver
+        ConfigPathResolver $configPathResolver,
+        $target = ConfigFilePool::APP_ENV
     ) {
         $this->preparedValueFactory = $preparedValueFactory;
         $this->deploymentConfigWriter = $writer;
         $this->arrayManager = $arrayManager;
         $this->configPathResolver = $configPathResolver;
+        $this->target = $target;
     }
 
     /**
@@ -97,7 +105,7 @@ public function process($path, $value, $scope, $scopeCode)
                  * we'll write value just after all validations are triggered.
                  */
                 $this->deploymentConfigWriter->saveConfig(
-                    [ConfigFilePool::APP_ENV => $this->arrayManager->set($configPath, [], $value)],
+                    [$this->target => $this->arrayManager->set($configPath, [], $value)],
                     false
                 );
             }
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php b/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
index 06a01c6686b..fcd7c0d5335 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
@@ -9,6 +9,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
 use Magento\Config\Model\Config\PathValidator;
+use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\Exception\CouldNotSaveException;
@@ -98,12 +99,35 @@ public function __construct(
      * @param boolean $lock The lock flag
      * @return string Processor response message
      * @throws ValidatorException If some validation is wrong
-     * @throws CouldNotSaveException If cannot save config value
-     * @throws ConfigurationMismatchException If processor can not be instantiated
      * @since 100.2.0
+     * @deprecated
+     * @see processWithLockTarget()
      */
     public function process($path, $value, $scope, $scopeCode, $lock)
     {
+        return $this->processWithLockTarget($path, $value, $scope, $scopeCode, $lock);
+    }
+
+    /**
+     * Processes config:set command with the option to set a target file.
+     *
+     * @param string $path The configuration path in format section/group/field_name
+     * @param string $value The configuration value
+     * @param string $scope The configuration scope (default, website, or store)
+     * @param string $scopeCode The scope code
+     * @param boolean $lock The lock flag
+     * @param string $lockTarget
+     * @return string Processor response message
+     * @throws ValidatorException If some validation is wrong
+     */
+    public function processWithLockTarget(
+        $path,
+        $value,
+        $scope,
+        $scopeCode,
+        $lock,
+        $lockTarget = ConfigFilePool::APP_ENV
+    ) {
         try {
             $this->scopeValidator->isValid($scope, $scopeCode);
             $this->pathValidator->validate($path);
@@ -111,14 +135,24 @@ public function process($path, $value, $scope, $scopeCode, $lock)
             throw new ValidatorException(__($exception->getMessage()), $exception);
         }
 
-        $processor = $lock
-            ? $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_LOCK)
-            : $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_DEFAULT);
-        $message = $lock
-            ? 'Value was saved and locked.'
-            : 'Value was saved.';
+        $processor =
+            $lock
+                ? ( $lockTarget == ConfigFilePool::APP_ENV
+                    ? $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_LOCK_ENV)
+                    : $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_LOCK_CONFIG)
+                )
+                : $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_DEFAULT)
+            ;
+
+        $message =
+            $lock
+                ? ( $lockTarget == ConfigFilePool::APP_ENV
+                    ? 'Value was saved in app/etc/env.php and locked.'
+                    : 'Value was saved in app/etc/config.php and locked.'
+                )
+                : 'Value was saved.';
 
-        // The processing flow depends on --lock option.
+        // The processing flow depends on --lock and --share options.
         $processor->process($path, $value, $scope, $scopeCode);
 
         $this->hash->regenerate(System::CONFIG_TYPE);
diff --git a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
index 1df1b3c4bed..cb79daddbf5 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\Console\Command;
 
 use Magento\Config\App\Config\Type\System;
@@ -10,6 +11,7 @@
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -34,6 +36,8 @@ class ConfigSetCommand extends Command
     const OPTION_SCOPE = 'scope';
     const OPTION_SCOPE_CODE = 'scope-code';
     const OPTION_LOCK = 'lock';
+    const OPTION_LOCK_ENV = 'lock-env';
+    const OPTION_LOCK_CONFIG = 'lock-config';
     /**#@-*/
 
     /**#@-*/
@@ -108,11 +112,24 @@ protected function configure()
                     InputArgument::OPTIONAL,
                     'Scope code (required only if scope is not \'default\')'
                 ),
+                new InputOption(
+                    static::OPTION_LOCK_ENV,
+                    'le',
+                    InputOption::VALUE_NONE,
+                    'Lock value which prevents modification in the Admin (will be saved in app/etc/env.php)'
+                ),
+                new InputOption(
+                    static::OPTION_LOCK_CONFIG,
+                    'lc',
+                    InputOption::VALUE_NONE,
+                    'Lock and share value with other installations, prevents modification in the Admin '
+                    . '(will be saved in app/etc/config.php)'
+                ),
                 new InputOption(
                     static::OPTION_LOCK,
                     'l',
                     InputOption::VALUE_NONE,
-                    'Lock value which prevents modification in the Admin'
+                    'Deprecated, use the --' . static::OPTION_LOCK_ENV . ' option instead.'
                 ),
             ]);
 
@@ -146,12 +163,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         try {
             $message = $this->emulatedAreaProcessor->process(function () use ($input) {
-                return $this->processorFacadeFactory->create()->process(
+
+                $lock = $input->getOption(static::OPTION_LOCK_ENV)
+                    || $input->getOption(static::OPTION_LOCK_CONFIG)
+                    || $input->getOption(static::OPTION_LOCK);
+
+                $lockTargetPath = ConfigFilePool::APP_ENV;
+                if ($input->getOption(static::OPTION_LOCK_CONFIG)) {
+                    $lockTargetPath = ConfigFilePool::APP_CONFIG;
+                }
+
+                return $this->processorFacadeFactory->create()->processWithLockTarget(
                     $input->getArgument(static::ARG_PATH),
                     $input->getArgument(static::ARG_VALUE),
                     $input->getOption(static::OPTION_SCOPE),
                     $input->getOption(static::OPTION_SCOPE_CODE),
-                    $input->getOption(static::OPTION_LOCK)
+                    $lock,
+                    $lockTargetPath
                 );
             });
 
diff --git a/app/code/Magento/Config/Setup/Patch/Data/UpdateClassAliases.php b/app/code/Magento/Config/Setup/Patch/Data/UpdateClassAliases.php
index 22d29774673..8986f624c16 100644
--- a/app/code/Magento/Config/Setup/Patch/Data/UpdateClassAliases.php
+++ b/app/code/Magento/Config/Setup/Patch/Data/UpdateClassAliases.php
@@ -7,8 +7,8 @@
 namespace Magento\Config\Setup\Patch\Data;
 
 use Magento\Framework\Module\Setup\Migration;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateClassAliases
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php
index 7fb126a00ff..9ec2d9bb9a1 100644
--- a/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php
@@ -84,10 +84,6 @@ public function testGetCachedWithLoadDefaultScopeData()
             ->method('process')
             ->with($data)
             ->willReturn($data);
-        $this->postProcessor->expects($this->once())
-            ->method('process')
-            ->with($data)
-            ->willReturn($data);
         $this->assertEquals($data, $this->model->read());
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
index 74315af4482..40aa110382e 100644
--- a/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
@@ -170,7 +170,12 @@ public function testGetNotCached()
         $this->reader->expects($this->once())
             ->method('read')
             ->willReturn($data);
+        $this->postProcessor->expects($this->once())
+            ->method('process')
+            ->with($data)
+            ->willReturn($data);
 
         $this->assertEquals($url, $this->configType->get($path));
+        $this->assertEquals($url, $this->configType->get($path));
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ConfigSetProcessorFactoryTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ConfigSetProcessorFactoryTest.php
index decb7d52a5e..12b97eb254d 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ConfigSetProcessorFactoryTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ConfigSetProcessorFactoryTest.php
@@ -41,7 +41,7 @@ protected function setUp()
         $this->model = new ConfigSetProcessorFactory(
             $this->objectManagerMock,
             [
-                ConfigSetProcessorFactory::TYPE_LOCK => LockProcessor::class,
+                ConfigSetProcessorFactory::TYPE_LOCK_ENV => LockProcessor::class,
                 ConfigSetProcessorFactory::TYPE_DEFAULT => DefaultProcessor::class,
                 'wrongType' => \stdClass::class,
             ]
@@ -59,7 +59,7 @@ public function testCreate()
 
         $this->assertInstanceOf(
             ConfigSetProcessorInterface::class,
-            $this->model->create(ConfigSetProcessorFactory::TYPE_LOCK)
+            $this->model->create(ConfigSetProcessorFactory::TYPE_LOCK_ENV)
         );
     }
 
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
index 066b0fbe84b..984e0fe8426 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
@@ -166,7 +166,9 @@ private function configMockForProcessTest($path, $scope, $scopeCode)
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The value you set has already been locked. To change the value, use the --lock option.
+     * @codingStandardsIgnoreStart
+     * @expectedExceptionMessage The value you set has already been locked. To change the value, use the --lock-env option.
+     * @codingStandardsIgnoreEnd
      */
     public function testProcessLockedValue()
     {
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockConfigProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockConfigProcessorTest.php
new file mode 100644
index 00000000000..c727184efb4
--- /dev/null
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockConfigProcessorTest.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Test\Unit\Console\Command\ConfigSet;
+
+use Magento\Config\Console\Command\ConfigSet\LockProcessor;
+use Magento\Config\Model\PreparedValueFactory;
+use Magento\Framework\App\Config\ConfigPathResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
+
+/**
+ * Test for ShareProcessor.
+ *
+ * @see ShareProcessor
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class LockConfigProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var LockProcessor
+     */
+    private $model;
+
+    /**
+     * @var PreparedValueFactory|Mock
+     */
+    private $preparedValueFactory;
+
+    /**
+     * @var DeploymentConfig\Writer|Mock
+     */
+    private $deploymentConfigWriterMock;
+
+    /**
+     * @var ArrayManager|Mock
+     */
+    private $arrayManagerMock;
+
+    /**
+     * @var ConfigPathResolver|Mock
+     */
+    private $configPathResolver;
+
+    /**
+     * @var Value|Mock
+     */
+    private $valueMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->preparedValueFactory = $this->getMockBuilder(PreparedValueFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->deploymentConfigWriterMock = $this->getMockBuilder(DeploymentConfig\Writer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->arrayManagerMock = $this->getMockBuilder(ArrayManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configPathResolver = $this->getMockBuilder(ConfigPathResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->valueMock = $this->getMockBuilder(Value::class)
+            ->setMethods(['validateBeforeSave', 'beforeSave', 'setValue', 'getValue', 'afterSave'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = new LockProcessor(
+            $this->preparedValueFactory,
+            $this->deploymentConfigWriterMock,
+            $this->arrayManagerMock,
+            $this->configPathResolver,
+            ConfigFilePool::APP_CONFIG
+        );
+    }
+
+    /**
+     * Tests process of share flow.
+     *
+     * @param string $path
+     * @param string $value
+     * @param string $scope
+     * @param string|null $scopeCode
+     * @dataProvider processDataProvider
+     */
+    public function testProcess($path, $value, $scope, $scopeCode)
+    {
+        $this->preparedValueFactory->expects($this->once())
+            ->method('create')
+            ->with($path, $value, $scope, $scopeCode)
+            ->willReturn($this->valueMock);
+        $this->configPathResolver->expects($this->once())
+            ->method('resolve')
+            ->willReturn('system/default/test/test/test');
+        $this->arrayManagerMock->expects($this->once())
+            ->method('set')
+            ->with('system/default/test/test/test', [], $value)
+            ->willReturn([
+                'system' => [
+                    'default' => [
+                        'test' => [
+                            'test' => [
+                                'test' => $value
+                            ]
+                        ]
+                    ]
+                ]
+            ]);
+        $this->valueMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn($value);
+        $this->deploymentConfigWriterMock->expects($this->once())
+            ->method('saveConfig')
+            ->with(
+                [
+                    ConfigFilePool::APP_CONFIG => [
+                        'system' => [
+                            'default' => [
+                                'test' => [
+                                    'test' => [
+                                        'test' => $value
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                false
+            );
+        $this->valueMock->expects($this->once())
+            ->method('validateBeforeSave');
+        $this->valueMock->expects($this->once())
+            ->method('beforeSave');
+        $this->valueMock->expects($this->once())
+            ->method('afterSave');
+
+        $this->model->process($path, $value, $scope, $scopeCode);
+    }
+
+    /**
+     * @return array
+     */
+    public function processDataProvider()
+    {
+        return [
+            ['test/test/test', 'value', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null],
+            ['test/test/test', 'value', ScopeInterface::SCOPE_WEBSITE, 'base'],
+            ['test/test/test', 'value', ScopeInterface::SCOPE_STORE, 'test'],
+        ];
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Filesystem is not writable.
+     */
+    public function testProcessNotReadableFs()
+    {
+        $path = 'test/test/test';
+        $value = 'value';
+
+        $this->preparedValueFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->valueMock);
+        $this->valueMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn($value);
+        $this->configPathResolver->expects($this->once())
+            ->method('resolve')
+            ->willReturn('system/default/test/test/test');
+        $this->arrayManagerMock->expects($this->once())
+            ->method('set')
+            ->with('system/default/test/test/test', [], $value)
+            ->willReturn(null);
+        $this->deploymentConfigWriterMock->expects($this->once())
+            ->method('saveConfig')
+            ->willThrowException(new FileSystemException(__('Filesystem is not writable.')));
+
+        $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Invalid values
+     */
+    public function testCustomException()
+    {
+        $path = 'test/test/test';
+        $value = 'value';
+
+        $this->configPathResolver->expects($this->once())
+            ->method('resolve')
+            ->willReturn('system/default/test/test/test');
+        $this->preparedValueFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->valueMock);
+        $this->arrayManagerMock->expects($this->never())
+            ->method('set');
+        $this->valueMock->expects($this->once())
+            ->method('getValue');
+        $this->valueMock->expects($this->once())
+            ->method('afterSave')
+            ->willThrowException(new \Exception('Invalid values'));
+        $this->deploymentConfigWriterMock->expects($this->never())
+            ->method('saveConfig');
+
+        $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
+    }
+}
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockEnvProcessorTest.php
similarity index 98%
rename from app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockProcessorTest.php
rename to app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockEnvProcessorTest.php
index 4535e9ad888..4e0248f8860 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockProcessorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/LockEnvProcessorTest.php
@@ -23,7 +23,7 @@
  * @see LockProcessor
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class LockProcessorTest extends \PHPUnit\Framework\TestCase
+class LockEnvProcessorTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var LockProcessor
@@ -81,7 +81,8 @@ protected function setUp()
             $this->preparedValueFactory,
             $this->deploymentConfigWriterMock,
             $this->arrayManagerMock,
-            $this->configPathResolver
+            $this->configPathResolver,
+            ConfigFilePool::APP_ENV
         );
     }
 
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
index 4e65ab3f4cc..ac4dda2a985 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
 use Magento\Config\Model\Config\PathValidator;
+use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Exception\CouldNotSaveException;
@@ -122,7 +123,13 @@ public function testProcess()
 
         $this->assertSame(
             'Value was saved.',
-            $this->model->process('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, false)
+            $this->model->processWithLockTarget(
+                'test/test/test',
+                'test',
+                ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                null,
+                false
+            )
         );
     }
 
@@ -132,12 +139,19 @@ public function testProcess()
      */
     public function testProcessWithValidatorException(LocalizedException $exception)
     {
-        $this->expectException(ValidatorException::class, 'Some error');
+        $this->expectException(ValidatorException::class);
+        $this->expectExceptionMessage('Some error');
         $this->scopeValidatorMock->expects($this->once())
             ->method('isValid')
             ->willThrowException($exception);
 
-        $this->model->process('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, false);
+        $this->model->processWithLockTarget(
+            'test/test/test',
+            'test',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            null,
+            false
+        );
     }
 
     /**
@@ -172,7 +186,13 @@ public function testProcessWithConfigurationMismatchException()
         $this->configMock->expects($this->never())
             ->method('clean');
 
-        $this->model->process('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, false);
+        $this->model->processWithLockTarget(
+            'test/test/test',
+            'test',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            null,
+            false
+        );
     }
 
     /**
@@ -198,17 +218,50 @@ public function testProcessWithCouldNotSaveException()
         $this->configMock->expects($this->never())
             ->method('clean');
 
-        $this->model->process('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, false);
+        $this->model->processWithLockTarget(
+            'test/test/test',
+            'test',
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            null,
+            false
+        );
+    }
+
+    public function testExecuteLockEnv()
+    {
+        $this->scopeValidatorMock->expects($this->once())
+            ->method('isValid')
+            ->willReturn(true);
+        $this->configSetProcessorFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(ConfigSetProcessorFactory::TYPE_LOCK_ENV)
+            ->willReturn($this->processorMock);
+        $this->processorMock->expects($this->once())
+            ->method('process')
+            ->with('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
+        $this->configMock->expects($this->once())
+            ->method('clean');
+
+        $this->assertSame(
+            'Value was saved in app/etc/env.php and locked.',
+            $this->model->processWithLockTarget(
+                'test/test/test',
+                'test',
+                ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                null,
+                true
+            )
+        );
     }
 
-    public function testExecuteLock()
+    public function testExecuteLockConfig()
     {
         $this->scopeValidatorMock->expects($this->once())
             ->method('isValid')
             ->willReturn(true);
         $this->configSetProcessorFactoryMock->expects($this->once())
             ->method('create')
-            ->with(ConfigSetProcessorFactory::TYPE_LOCK)
+            ->with(ConfigSetProcessorFactory::TYPE_LOCK_CONFIG)
             ->willReturn($this->processorMock);
         $this->processorMock->expects($this->once())
             ->method('process')
@@ -217,8 +270,15 @@ public function testExecuteLock()
             ->method('clean');
 
         $this->assertSame(
-            'Value was saved and locked.',
-            $this->model->process('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, true)
+            'Value was saved in app/etc/config.php and locked.',
+            $this->model->processWithLockTarget(
+                'test/test/test',
+                'test',
+                ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                null,
+                true,
+                ConfigFilePool::APP_CONFIG
+            )
         );
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php
index 0271de0da81..cb3a401e6f1 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php
@@ -95,7 +95,7 @@ public function testExecute()
             ->method('create')
             ->willReturn($this->processorFacadeMock);
         $this->processorFacadeMock->expects($this->once())
-            ->method('process')
+            ->method('processWithLockTarget')
             ->willReturn('Some message');
         $this->emulatedAreProcessorMock->expects($this->once())
             ->method('process')
@@ -171,9 +171,7 @@ public function testExecuteWithException()
             ->willReturn(false);
         $this->emulatedAreProcessorMock->expects($this->once())
             ->method('process')
-            ->willThrowException(
-                new ValidatorException(__('The "test/test/test" path doesn\'t exist. Verify and try again.'))
-            );
+            ->willThrowException(new ValidatorException(__('The "test/test/test" path does not exists')));
 
         $tester = new CommandTester($this->command);
         $tester->execute([
@@ -182,7 +180,7 @@ public function testExecuteWithException()
         ]);
 
         $this->assertContains(
-            __('The "test/test/test" path doesn\'t exist. Verify and try again.')->render(),
+            __('The "test/test/test" path does not exists')->render(),
             $tester->getDisplay()
         );
         $this->assertSame(Cli::RETURN_FAILURE, $tester->getStatusCode());
diff --git a/app/code/Magento/Config/etc/db_schema.xml b/app/code/Magento/Config/etc/db_schema.xml
index e7be05d4a8c..3f55d582776 100644
--- a/app/code/Magento/Config/etc/db_schema.xml
+++ b/app/code/Magento/Config/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="core_config_data" resource="default" engine="innodb" comment="Config Data">
         <column xsi:type="int" name="config_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Config Id"/>
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index bcddd8ceaf2..a5dd18097fb 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -296,10 +296,21 @@
         <arguments>
             <argument name="processors" xsi:type="array">
                 <item name="default" xsi:type="string">Magento\Config\Console\Command\ConfigSet\DefaultProcessor</item>
-                <item name="lock" xsi:type="string">Magento\Config\Console\Command\ConfigSet\LockProcessor</item>
+                <item name="lock-env" xsi:type="string">Magento\Config\Console\Command\ConfigSet\VirtualLockEnvProcessor</item>
+                <item name="lock-config" xsi:type="string">Magento\Config\Console\Command\ConfigSet\VirtualLockConfigProcessor</item>
             </argument>
         </arguments>
     </type>
+    <virtualType name="Magento\Config\Console\Command\ConfigSet\VirtualLockEnvProcessor" type="Magento\Config\Console\Command\ConfigSet\LockProcessor">
+        <arguments>
+            <argument name="target" xsi:type="string">app_env</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Config\Console\Command\ConfigSet\VirtualLockConfigProcessor" type="Magento\Config\Console\Command\ConfigSet\LockProcessor">
+        <arguments>
+            <argument name="target" xsi:type="string">app_config</argument>
+        </arguments>
+    </virtualType>
     <type name="Magento\Deploy\Model\DeploymentConfig\ImporterPool">
         <arguments>
             <argument name="importers" xsi:type="array">
diff --git a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
index d9f11c6f910..c9fea3e74d3 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
@@ -10,8 +10,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
diff --git a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateTierPriceAttribute.php b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateTierPriceAttribute.php
index 4d04fb4db5b..325fb447d22 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateTierPriceAttribute.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/UpdateTierPriceAttribute.php
@@ -10,8 +10,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
diff --git a/app/code/Magento/ConfigurableProduct/etc/db_schema.xml b/app/code/Magento/ConfigurableProduct/etc/db_schema.xml
index d45c06bea1c..7c6661a5f39 100644
--- a/app/code/Magento/ConfigurableProduct/etc/db_schema.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalog_product_super_attribute" resource="default" engine="innodb"
            comment="Catalog Product Super Attribute Table">
         <column xsi:type="int" name="product_super_attribute_id" padding="10" unsigned="true" nullable="false"
diff --git a/app/code/Magento/Cron/etc/db_schema.xml b/app/code/Magento/Cron/etc/db_schema.xml
index 9f019d108b2..deff05d3eec 100644
--- a/app/code/Magento/Cron/etc/db_schema.xml
+++ b/app/code/Magento/Cron/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="cron_schedule" resource="default" engine="innodb" comment="Cron Schedule">
         <column xsi:type="int" name="schedule_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Schedule Id"/>
diff --git a/app/code/Magento/CurrencySymbol/Setup/Patch/Data/ConvertSerializedCustomCurrencySymbolToJson.php b/app/code/Magento/CurrencySymbol/Setup/Patch/Data/ConvertSerializedCustomCurrencySymbolToJson.php
index dd5e59c4d9d..be2f2c51471 100644
--- a/app/code/Magento/CurrencySymbol/Setup/Patch/Data/ConvertSerializedCustomCurrencySymbolToJson.php
+++ b/app/code/Magento/CurrencySymbol/Setup/Patch/Data/ConvertSerializedCustomCurrencySymbolToJson.php
@@ -12,8 +12,8 @@
 use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ConvertSerializedCustomCurrencySymbolToJson
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index 711fab9e608..20d330354bc 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -132,30 +132,15 @@ public function __construct(
      */
     public function execute()
     {
-        $file = null;
-        $plain = false;
-        if ($this->getRequest()->getParam('file')) {
-            // download file
-            $file = $this->urlDecoder->decode(
-                $this->getRequest()->getParam('file')
-            );
-        } elseif ($this->getRequest()->getParam('image')) {
-            // show plain image
-            $file = $this->urlDecoder->decode(
-                $this->getRequest()->getParam('image')
-            );
-            $plain = true;
-        } else {
-            throw new NotFoundException(__('Page not found.'));
-        }
+        list($file, $plain) = $this->getFileParams();
 
         /** @var \Magento\Framework\Filesystem $filesystem */
         $filesystem = $this->_objectManager->get(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
         $fileName = CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER . '/' . ltrim($file, '/');
         $path = $directory->getAbsolutePath($fileName);
-        if (!$directory->isFile($fileName)
-            && !$this->_objectManager->get(\Magento\MediaStorage\Helper\File\Storage::class)->processStorageFile($path)
+        if (mb_strpos($path, '..') !== false || (!$directory->isFile($fileName)
+            && !$this->_objectManager->get(\Magento\MediaStorage\Helper\File\Storage::class)->processStorageFile($path))
         ) {
             throw new NotFoundException(__('Page not found.'));
         }
@@ -198,4 +183,32 @@ public function execute()
             );
         }
     }
+
+    /**
+     * Get parameters from request.
+     *
+     * @return array
+     * @throws NotFoundException
+     */
+    private function getFileParams()
+    {
+        $file = null;
+        $plain = false;
+        if ($this->getRequest()->getParam('file')) {
+            // download file
+            $file = $this->urlDecoder->decode(
+                $this->getRequest()->getParam('file')
+            );
+        } elseif ($this->getRequest()->getParam('image')) {
+            // show plain image
+            $file = $this->urlDecoder->decode(
+                $this->getRequest()->getParam('image')
+            );
+            $plain = true;
+        } else {
+            throw new NotFoundException(__('Page not found.'));
+        }
+
+        return [$file, $plain];
+    }
 }
diff --git a/app/code/Magento/Customer/Model/Account/Redirect.php b/app/code/Magento/Customer/Model/Account/Redirect.php
index 2e8d596474e..2ccaaea4568 100644
--- a/app/code/Magento/Customer/Model/Account/Redirect.php
+++ b/app/code/Magento/Customer/Model/Account/Redirect.php
@@ -74,6 +74,11 @@ class Redirect
      */
     private $hostChecker;
 
+    /**
+     * @var Session
+     */
+    private $session;
+
     /**
      * @param RequestInterface $request
      * @param Session $customerSession
@@ -206,6 +211,10 @@ protected function processLoggedCustomer()
             $referer = $this->request->getParam(CustomerUrl::REFERER_QUERY_PARAM_NAME);
             if ($referer) {
                 $referer = $this->urlDecoder->decode($referer);
+                preg_match('/logoutSuccess\//', $referer, $matches, PREG_OFFSET_CAPTURE);
+                if (!empty($matches)) {
+                    $referer = str_replace('logoutSuccess/', '', $referer);
+                }
                 if ($this->hostChecker->isOwnOrigin($referer)) {
                     $this->applyRedirect($referer);
                 }
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php b/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
index d9103959e02..bad5735bc3e 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
@@ -10,8 +10,8 @@
 use Magento\Customer\Setup\CustomerSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class AddCustomerUpdatedAtAttribute
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php b/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
index e5c80e08542..ba50f6e17dd 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
@@ -21,8 +21,8 @@
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class AddNonSpecifiedGenderAttributeOption
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
index afc8b570ca3..b066d14a3c6 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
@@ -10,8 +10,8 @@
 use Magento\Customer\Setup\CustomerSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class AddSecurityTrackingAttributes
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php b/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
index a6c5087a86b..83c5fe7ae6d 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
@@ -10,8 +10,8 @@
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ConvertValidationRulesFromSerializedToJson
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
index d37acd2fd7e..6e61b66f3c9 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
@@ -11,8 +11,8 @@
 use Magento\Framework\Module\Setup\Migration;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class DefaultCustomerGroupsAndAttributes
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php b/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
index e9dc08912f3..7488f3fd4a9 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
@@ -11,8 +11,8 @@
 use Magento\Directory\Model\AllowedCountriesFactory;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
index 1895f1f6c47..51f54dc4a43 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
@@ -21,8 +21,8 @@
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class RemoveCheckoutRegisterAndUpdateAttributes
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
index bbd0d2b66e6..30435ace54d 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateAutocompleteOnStorefrontCOnfigPath
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
index 9df78ff182e..938cd3cd52e 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
@@ -9,8 +9,8 @@
 use Magento\Customer\Setup\CustomerSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateCustomerAttributeInputFilters
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributesMetadata.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributesMetadata.php
index 5863803f79f..5f4d9952590 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributesMetadata.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributesMetadata.php
@@ -9,8 +9,8 @@
 use Magento\Customer\Setup\CustomerSetup;
 use Magento\Customer\Setup\CustomerSetupFactory;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateCustomerAttributesMetadata
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
index e0b92b34271..7d0cad768d6 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
@@ -9,8 +9,8 @@
 use Magento\Customer\Setup\CustomerSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateIdentifierCustomerAttributesVisibility
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
index e61d204bcac..d31301eedf4 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
@@ -21,8 +21,8 @@
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class UpdateVATNumber implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php b/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
index 16c74405e78..3b8f96a0373 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
@@ -10,8 +10,8 @@
 use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpgradePasswordHashAndAddress
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
index 59c940bb852..8e1aeaa87a1 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
@@ -206,4 +206,53 @@ public function testExecuteGetParamImage()
         );
         $this->assertSame($this->resultRawMock, $controller->execute());
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\NotFoundException
+     * @expectedExceptionMessage Page not found.
+     */
+    public function testExecuteInvalidFile()
+    {
+        $file = '../../../app/etc/env.php';
+        $decodedFile = base64_encode($file);
+        $fileName = 'customer/' . $file;
+        $path = 'path';
+
+        $this->requestMock->expects($this->atLeastOnce())->method('getParam')->with('file')->willReturn($decodedFile);
+
+        $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($fileName)->willReturn($path);
+
+        $this->fileSystemMock->expects($this->once())->method('getDirectoryRead')
+            ->with(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA)
+            ->willReturn($this->directoryMock);
+
+        $this->storage->expects($this->once())->method('processStorageFile')->with($path)->willReturn(false);
+
+        $this->objectManagerMock->expects($this->any())->method('get')
+            ->willReturnMap(
+                [
+                    [\Magento\Framework\Filesystem::class, $this->fileSystemMock],
+                    [\Magento\MediaStorage\Helper\File\Storage::class, $this->storage],
+                ]
+            );
+
+        $this->urlDecoderMock->expects($this->once())->method('decode')->with($decodedFile)->willReturn($file);
+        $fileFactoryMock = $this->createMock(
+            \Magento\Framework\App\Response\Http\FileFactory::class,
+            [],
+            [],
+            '',
+            false
+        );
+
+        $controller = $this->objectManager->getObject(
+            \Magento\Customer\Controller\Adminhtml\Index\Viewfile::class,
+            [
+                'context' => $this->contextMock,
+                'urlDecoder' => $this->urlDecoderMock,
+                'fileFactory' => $fileFactoryMock,
+            ]
+        );
+        $controller->execute();
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php b/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
index e63ce964c15..0138c6c709b 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
@@ -11,9 +11,9 @@
 use Magento\Customer\Model\Account\Redirect;
 use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Url\HostChecker;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -147,15 +147,15 @@ protected function setUp()
         $this->model = $objectManager->getObject(
             \Magento\Customer\Model\Account\Redirect::class,
             [
-                'request'               => $this->request,
-                'customerSession'       => $this->customerSession,
-                'scopeConfig'           => $this->scopeConfig,
-                'storeManager'          => $this->storeManager,
-                'url'                   => $this->url,
-                'urlDecoder'            => $this->urlDecoder,
-                'customerUrl'           => $this->customerUrl,
-                'resultFactory'         => $this->resultFactory,
-                'hostChecker' => $this->hostChecker
+                'request' => $this->request,
+                'customerSession' => $this->customerSession,
+                'scopeConfig' => $this->scopeConfig,
+                'storeManager' => $this->storeManager,
+                'url' => $this->url,
+                'urlDecoder' => $this->urlDecoder,
+                'customerUrl' => $this->customerUrl,
+                'resultFactory' => $this->resultFactory,
+                'hostChecker' => $this->hostChecker,
             ]
         );
     }
@@ -191,57 +191,31 @@ public function testGetRedirect(
         $redirectToDashboard
     ) {
         // Preparations for method updateLastCustomerId()
-        $this->customerSession->expects($this->once())
-            ->method('getLastCustomerId')
-            ->willReturn($customerId);
-        $this->customerSession->expects($this->any())
-            ->method('isLoggedIn')
-            ->willReturn($customerLoggedIn);
-        $this->customerSession->expects($this->any())
-            ->method('getId')
-            ->willReturn($lastCustomerId);
-        $this->customerSession->expects($this->any())
-            ->method('unsBeforeAuthUrl')
-            ->willReturnSelf();
+        $this->customerSession->expects($this->once())->method('getLastCustomerId')->willReturn($customerId);
+        $this->customerSession->expects($this->any())->method('isLoggedIn')->willReturn($customerLoggedIn);
+        $this->customerSession->expects($this->any())->method('getId')->willReturn($lastCustomerId);
+        $this->customerSession->expects($this->any())->method('unsBeforeAuthUrl')->willReturnSelf();
         $this->customerSession->expects($this->any())
             ->method('setLastCustomerId')
             ->with($lastCustomerId)
             ->willReturnSelf();
 
         // Preparations for method prepareRedirectUrl()
-        $this->store->expects($this->once())
-            ->method('getBaseUrl')
-            ->willReturn($baseUrl);
+        $this->store->expects($this->once())->method('getBaseUrl')->willReturn($baseUrl);
 
-        $this->customerSession->expects($this->any())
-            ->method('getBeforeAuthUrl')
-            ->willReturn($beforeAuthUrl);
-        $this->customerSession->expects($this->any())
-            ->method('setBeforeAuthUrl')
-            ->willReturnSelf();
-        $this->customerSession->expects($this->any())
-            ->method('getAfterAuthUrl')
-            ->willReturn($afterAuthUrl);
+        $this->customerSession->expects($this->any())->method('getBeforeAuthUrl')->willReturn($beforeAuthUrl);
+        $this->customerSession->expects($this->any())->method('setBeforeAuthUrl')->willReturnSelf();
+        $this->customerSession->expects($this->any())->method('getAfterAuthUrl')->willReturn($afterAuthUrl);
         $this->customerSession->expects($this->any())
             ->method('setAfterAuthUrl')
             ->with($beforeAuthUrl)
             ->willReturnSelf();
-        $this->customerSession->expects($this->any())
-            ->method('getBeforeRequestParams')
-            ->willReturn(false);
-
-        $this->customerUrl->expects($this->any())
-            ->method('getAccountUrl')
-            ->willReturn($accountUrl);
-        $this->customerUrl->expects($this->any())
-            ->method('getLoginUrl')
-            ->willReturn($loginUrl);
-        $this->customerUrl->expects($this->any())
-            ->method('getLogoutUrl')
-            ->willReturn($logoutUrl);
-        $this->customerUrl->expects($this->any())
-            ->method('getDashboardUrl')
-            ->willReturn($dashboardUrl);
+        $this->customerSession->expects($this->any())->method('getBeforeRequestParams')->willReturn(false);
+
+        $this->customerUrl->expects($this->any())->method('getAccountUrl')->willReturn($accountUrl);
+        $this->customerUrl->expects($this->any())->method('getLoginUrl')->willReturn($loginUrl);
+        $this->customerUrl->expects($this->any())->method('getLogoutUrl')->willReturn($logoutUrl);
+        $this->customerUrl->expects($this->any())->method('getDashboardUrl')->willReturn($dashboardUrl);
 
         $this->scopeConfig->expects($this->any())
             ->method('isSetFlag')
@@ -253,25 +227,19 @@ public function testGetRedirect(
             ->with(CustomerUrl::REFERER_QUERY_PARAM_NAME)
             ->willReturn($referer);
 
-        $this->urlDecoder->expects($this->any())
-            ->method('decode')
-            ->with($referer)
-            ->willReturn($referer);
+        $this->urlDecoder->expects($this->any())->method('decode')->with($referer)->willReturn($referer);
 
-        $this->url->expects($this->any())
-            ->method('isOwnOriginUrl')
-            ->willReturn(true);
+        $this->url->expects($this->any())->method('isOwnOriginUrl')->willReturn(true);
 
-        $this->resultRedirect->expects($this->once())
-            ->method('setUrl')
-            ->with($beforeAuthUrl)
-            ->willReturnSelf();
+        $this->resultRedirect->expects($this->once())->method('setUrl')->with($beforeAuthUrl)->willReturnSelf();
 
         $this->resultFactory->expects($this->once())
             ->method('create')
             ->with(ResultFactory::TYPE_REDIRECT)
             ->willReturn($this->resultRedirect);
 
+        $this->hostChecker->expects($this->any())->method('isOwnOrigin')->willReturn(true);
+
         $this->model->getRedirect();
     }
 
@@ -306,6 +274,21 @@ public function getRedirectDataProvider()
             [1, 2, 'referer', 'base', 'logout', '', 'account', 'login', 'logout', 'dashboard', false, true],
             // Default redirect
             [1, 2, 'referer', 'base', 'defined', '', 'account', 'login', 'logout', 'dashboard', true, true],
+            // Logout, Without Redirect to Dashboard
+            [
+                'customer_id' => 1,
+                'last_customer_id' => 2,
+                'referer' => 'http://base.com/customer/account/logoutSuccess/',
+                'base_url' => 'http://base.com/',
+                'before_auth_url' => 'http://base.com/',
+                'after_auth_url' => 'http://base.com/customer/account/',
+                'account_url' => 'account',
+                'login_url' => 'login',
+                'logout_url' => 'logout',
+                'dashboard_url' => 'dashboard',
+                'is_customer_logged_id_flag' => true,
+                'redirect_to_dashboard_flag' => false,
+            ],
         ];
     }
 
diff --git a/app/code/Magento/Customer/etc/db_schema.xml b/app/code/Magento/Customer/etc/db_schema.xml
index 490211e4307..368ca417432 100644
--- a/app/code/Magento/Customer/etc/db_schema.xml
+++ b/app/code/Magento/Customer/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="customer_entity" resource="default" engine="innodb" comment="Customer Entity">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Entity Id"/>
diff --git a/app/code/Magento/Deploy/Console/ConsoleLogger.php b/app/code/Magento/Deploy/Console/ConsoleLogger.php
index a7d3b48fde1..0ca34439c7d 100644
--- a/app/code/Magento/Deploy/Console/ConsoleLogger.php
+++ b/app/code/Magento/Deploy/Console/ConsoleLogger.php
@@ -82,8 +82,8 @@ class ConsoleLogger extends AbstractLogger
         LogLevel::CRITICAL => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::ERROR => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::WARNING => OutputInterface::VERBOSITY_NORMAL,
-        LogLevel::NOTICE => OutputInterface::VERBOSITY_VERBOSE,
-        LogLevel::INFO => OutputInterface::VERBOSITY_VERY_VERBOSE,
+        LogLevel::NOTICE => OutputInterface::VERBOSITY_NORMAL,
+        LogLevel::INFO => OutputInterface::VERBOSITY_VERBOSE,
         LogLevel::DEBUG => OutputInterface::VERBOSITY_DEBUG
     ];
 
diff --git a/app/code/Magento/Deploy/Model/Mode.php b/app/code/Magento/Deploy/Model/Mode.php
index c7ee9b68496..d4ae72d63bc 100644
--- a/app/code/Magento/Deploy/Model/Mode.php
+++ b/app/code/Magento/Deploy/Model/Mode.php
@@ -236,7 +236,7 @@ private function saveAppConfigs($mode)
         $configs = $this->configProvider->getConfigs($this->getMode(), $mode);
         foreach ($configs as $path => $item) {
             $this->emulatedAreaProcessor->process(function () use ($path, $item) {
-                $this->processorFacadeFactory->create()->process(
+                $this->processorFacadeFactory->create()->processWithLockTarget(
                     $path,
                     $item['value'],
                     ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
index e5e10c8f54a..75b21b2b7fb 100644
--- a/app/code/Magento/Deploy/Process/Queue.php
+++ b/app/code/Magento/Deploy/Process/Queue.php
@@ -161,7 +161,7 @@ public function process()
             foreach ($packages as $name => $packageJob) {
                 $this->assertAndExecute($name, $packages, $packageJob);
             }
-            $this->logger->notice('.');
+            $this->logger->info('.');
             sleep(3);
             foreach ($this->inProgress as $name => $package) {
                 if ($this->isDeployed($package)) {
@@ -214,7 +214,7 @@ private function awaitForAllProcesses()
                     unset($this->inProgress[$name]);
                 }
             }
-            $this->logger->notice('.');
+            $this->logger->info('.');
             sleep(5);
         }
         if ($this->isCanBeParalleled()) {
diff --git a/app/code/Magento/Deploy/Service/DeployPackage.php b/app/code/Magento/Deploy/Service/DeployPackage.php
index 2e7b10a159c..7a5eb099124 100644
--- a/app/code/Magento/Deploy/Service/DeployPackage.php
+++ b/app/code/Magento/Deploy/Service/DeployPackage.php
@@ -267,7 +267,7 @@ private function register(Package $package, PackageFile $file = null, $skipLoggi
         $this->deployStaticFile->writeTmpFile('info.json', $package->getPath(), json_encode($info));
 
         if (!$skipLogging) {
-            $this->logger->notice($logMessage);
+            $this->logger->info($logMessage);
         }
     }
 }
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php b/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php
index 25625eaa5e2..50725a33820 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php
@@ -241,7 +241,7 @@ public function testEnableProductionModeMinimal()
             ->willReturn($this->processorFacade);
         $this->processorFacade
             ->expects($this->once())
-            ->method('process')
+            ->method('processWithLockTarget')
             ->with(
                 'dev/debug/debug_logging',
                 0,
diff --git a/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php b/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
index 3313b7ef68a..6715ecd681e 100644
--- a/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
+++ b/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
@@ -8,8 +8,9 @@
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Config\FileResolverByModule;
 use Magento\Framework\Module\Dir;
+use Magento\Framework\Setup\Declaration\Schema\Diff\Diff;
 use Magento\Framework\Setup\JsonPersistor;
-use Magento\Setup\Model\Declaration\Schema\Declaration\ReaderComposite;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -103,7 +104,7 @@ private function persistModule($moduleName)
             . DIRECTORY_SEPARATOR
             . Dir::MODULE_ETC_DIR
             . DIRECTORY_SEPARATOR
-            . self::GENERATED_FILE_NAME;
+            . Diff::GENERATED_WHITELIST_FILE_NAME;
         //We need to load whitelist file and update it with new revision of code.
         if (file_exists($whiteListFileName)) {
             $content = json_decode(file_get_contents($whiteListFileName), true);
diff --git a/app/code/Magento/Developer/Console/Command/patch_template.php.dist b/app/code/Magento/Developer/Console/Command/patch_template.php.dist
index cbb6b4dd5d7..c1b07246e64 100644
--- a/app/code/Magento/Developer/Console/Command/patch_template.php.dist
+++ b/app/code/Magento/Developer/Console/Command/patch_template.php.dist
@@ -6,18 +6,16 @@
 
 namespace %moduleName%\Setup\Patch\%patchType%;
 
-use Magento\Setup\Model\Patch\PatchVersionInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\SchemaPatchInterface;
-use Magento\Setup\Model\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 
 /**
 * Patch is mechanism, that allows to do atomic upgrade data changes
 */
 class %class% implements
-    %patchInterface%,
-    PatchVersionInterface
+    %patchInterface%
 {
     /**
      * @var ModuleDataSetupInterface $moduleDataSetup
@@ -58,13 +56,4 @@ class %class% implements
 
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getVersion()
-    {
-        return '';
-    }
-
 }
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/TablesWhitelistGenerateCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/TablesWhitelistGenerateCommandTest.php
index 49235e19cc0..66fd7e3eec6 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/TablesWhitelistGenerateCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/TablesWhitelistGenerateCommandTest.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Setup\JsonPersistor;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Setup\Model\Declaration\Schema\Declaration\ReaderComposite;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
 use Symfony\Component\Console\Tester\CommandTester;
 
 /**
diff --git a/app/code/Magento/Dhl/Setup/Patch/Data/PrepareShipmentDays.php b/app/code/Magento/Dhl/Setup/Patch/Data/PrepareShipmentDays.php
index ce026c3e643..8b91b842c36 100644
--- a/app/code/Magento/Dhl/Setup/Patch/Data/PrepareShipmentDays.php
+++ b/app/code/Magento/Dhl/Setup/Patch/Data/PrepareShipmentDays.php
@@ -10,8 +10,8 @@
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class PrepareShipmentDays
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForCroatia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForCroatia.php
index 000d8034467..eb9d4f4018b 100644
--- a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForCroatia.php
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForCroatia.php
@@ -9,8 +9,8 @@
 use Magento\Directory\Setup\DataInstaller;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class AddDataForCroatia
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
index 0e4532c636f..69d500960d3 100644
--- a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
@@ -9,8 +9,8 @@
 use Magento\Directory\Setup\DataInstaller;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class AddDataForIndia
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php b/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php
index 3226a693a29..79ac53d3a44 100644
--- a/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php
+++ b/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php
@@ -8,8 +8,8 @@
 
 use Magento\Directory\Helper\Data;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InitializeDirectoryData
diff --git a/app/code/Magento/Directory/etc/db_schema.xml b/app/code/Magento/Directory/etc/db_schema.xml
index 769c253d45f..72fd929b98a 100644
--- a/app/code/Magento/Directory/etc/db_schema.xml
+++ b/app/code/Magento/Directory/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="directory_country" resource="default" engine="innodb" comment="Directory Country">
         <column xsi:type="varchar" name="country_id" nullable="false" length="2" comment="Country Id in ISO-2"/>
         <column xsi:type="varchar" name="iso2_code" nullable="true" length="2" comment="Country ISO-2 format"/>
diff --git a/app/code/Magento/Downloadable/Setup/Patch/Data/InstallDownloadableAttributes.php b/app/code/Magento/Downloadable/Setup/Patch/Data/InstallDownloadableAttributes.php
index 11dae04d6a9..9c101425e49 100644
--- a/app/code/Magento/Downloadable/Setup/Patch/Data/InstallDownloadableAttributes.php
+++ b/app/code/Magento/Downloadable/Setup/Patch/Data/InstallDownloadableAttributes.php
@@ -10,8 +10,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallDownloadableAttributes
diff --git a/app/code/Magento/Downloadable/etc/db_schema.xml b/app/code/Magento/Downloadable/etc/db_schema.xml
index 675c9a5c856..ed25628bcff 100644
--- a/app/code/Magento/Downloadable/etc/db_schema.xml
+++ b/app/code/Magento/Downloadable/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="downloadable_link" resource="default" engine="innodb" comment="Downloadable Link Table">
         <column xsi:type="int" name="link_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Link ID"/>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
index 2515e5e3393..3ec6010218f 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -21,7 +21,7 @@
     <div class="admin__field" <?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '' ?>>
         <label class="admin__field-label" for="downloadable_links_title"><span><?= /* @escapeNotVerified */ __('Title') ?></span></label>
         <div class="admin__field-control">
-            <input type="text" class="admin__control-text" id="downloadable_links_title" name="product[links_title]" value="<?= /* @escapeNotVerified */ $block->getLinksTitle() ?>" <?= ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
+            <input type="text" class="admin__control-text" id="downloadable_links_title" name="product[links_title]" value="<?= $block->escapeHtml($block->getLinksTitle()) ?>" <?= ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
             <?php if ($_product->getStoreId()): ?>
                 <div class="admin__field admin__field-option">
                     <input id="link_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="links_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?= $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
@@ -158,9 +158,9 @@ require([
                         '<div id="downloadable_link_<%- data.id %>_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button form-buttons">'+
                             '<span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>' +
-                            '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?= /* @escapeNotVerified */ $block->getFileFieldName('links') ?>">' +
+                            '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?= $block->escapeHtml($block->getFileFieldName('links')) ?>">' +
                             '<script>' +
-                                'linksUploader("#downloadable_link_<%- data.id %>_file", "<?= /* @escapeNotVerified */ $block->getUploadUrl('links') ?>"); ' +
+                                'linksUploader("#downloadable_link_<%- data.id %>_file", "<?= $block->escapeUrl($block->getUploadUrl('links')) ?>"); ' +
                             '</scr'+'ipt>'+
                         '</div>'+
                     '</div>'+
@@ -184,9 +184,9 @@ require([
                         '<div id="downloadable_link_<%- data.id %>_sample_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button form-buttons">'+
                         '<span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>' +
-                        '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?= /* @escapeNotVerified */ $block->getFileFieldName('link_samples') ?>">' +
+                        '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?= $block->escapeHtml($block->getFileFieldName('link_samples'), '"') ?>">' +
                         '<script>'+
-                        'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?= /* @escapeNotVerified */ $block->getUploadUrl('link_samples') ?>"); ' +
+                        'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?= $block->escapeUrl($block->getUploadUrl('link_samples')) ?>"); ' +
                         '</scr'+'ipt>'+
                         '</div>'+
                     '</div>'+
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
index af4dee226f3..3645a184df2 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
@@ -21,7 +21,7 @@ $block->getConfigJson();
     <div class="admin__field"<?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '' ?>>
         <label class="admin__field-label" for="downloadable_samples_title"><span><?= /* @noEscape */ __('Title') ?></span></label>
         <div class="admin__field-control">
-            <input type="text" class="admin__control-text" id="downloadable_samples_title" name="product[samples_title]" value="<?= /* @noEscape */ $block->getSamplesTitle() ?>" <?= /* @noEscape */ ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
+            <input type="text" class="admin__control-text" id="downloadable_samples_title" name="product[samples_title]" value="<?= $block->escapeHtml($block->getSamplesTitle()) ?>" <?= /* @noEscape */ ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
             <?php if ($_product->getStoreId()): ?>
                 <div class="admin__field admin__field-option">
                     <input id="sample_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="samples_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?= /* @noEscape */ $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
@@ -93,7 +93,7 @@ require([
                         '<div id="downloadable_sample_<%- data.id %>_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button">'+
                             '<span><?= /* @noEscape */ __('Browse Files...') ?></span>' +
-                            '<input id="downloadable_sample_<%- data.id %>_file" type="file" name="<?= /* @noEscape */ $block->getConfig()->getFileField() ?>" data-url="<?= /* @noEscape */ $block->getConfig()->getUrl() ?>">' +
+                            '<input id="downloadable_sample_<%- data.id %>_file" type="file" name="<?= /* @noEscape */ $block->getConfig()->getFileField() ?>" data-url="<?= $block->escapeHtml($block->getConfig()->getUrl()) ?>">' +
                             '<script>' +
                             '/*<![CDATA[*/' +
                                 'sampleUploader("#downloadable_sample_<%- data.id %>_file"); ' +
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
index 8cc13533458..7438275bf58 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
@@ -14,7 +14,7 @@
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?= /* @escapeNotVerified */ $_option['label'] ?></dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                 <?= /* @escapeNotVerified */ $_option['value'] ?>
@@ -39,7 +39,7 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
+            <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
                 <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?></dd>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
index ef7e7627b7a..b00c4b4b453 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
@@ -14,7 +14,7 @@
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?= /* @escapeNotVerified */ $_option['label'] ?></dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                 <?= /* @escapeNotVerified */ $_option['value'] ?>
@@ -39,7 +39,7 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
+            <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
                 <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= /* @escapeNotVerified */ $_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited') ?>)</dd>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
index 5462008aab3..9e6a73263bf 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
@@ -17,7 +17,7 @@
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?= /* @escapeNotVerified */ $_option['label'] ?>:</dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                 <?= /* @escapeNotVerified */ $_option['value'] ?>
@@ -42,7 +42,7 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?>:</dt>
+            <dt><?= $block->escapeHtml($block->getLinksTitle()) ?>:</dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
                 <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= /* @escapeNotVerified */ $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U')) ?>)</dd>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
index fbc673ef910..5548279a111 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
@@ -13,9 +13,9 @@
     <?php $_links = $block->getLinks(); ?>
     <?php $_linksLength = 0; ?>
     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
-    <legend class="legend links-title"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></legend><br>
+    <legend class="legend links-title"><span><?= $block->escapeHtml($block->getLinksTitle()) ?></span></legend><br>
     <div class="field downloads<?php if ($_isRequired) echo ' required' ?><?php if (!$_linksPurchasedSeparately) echo ' downloads-no-separately' ?>">
-        <label class="label"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></label>
+        <label class="label"><span><?= $block->escapeHtml($block->getLinksTitle()) ?></span></label>
         <div class="control" id="downloadable-links-list"
              data-mage-init='{"downloadable":{
                  "linkElement":"input:checkbox[value]",
@@ -37,7 +37,7 @@
                         <span><?= $block->escapeHtml($_link->getTitle()) ?></span>
                         <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
                             <a class="sample link"
-                               href="<?= /* @escapeNotVerified */ $block->getLinkSampleUrl($_link) ?>" <?= $block->getIsOpenInNewWindow() ? 'target="_blank"' : '' ?>>
+                               href="<?= $block->escapeUrl($block->getLinkSampleUrl($_link)) ?>" <?= $block->getIsOpenInNewWindow() ? 'target="_blank"' : '' ?>>
                                 <?= /* @escapeNotVerified */ __('sample') ?>
                             </a>
                         <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
index 4371ffdfc29..c6b2281196e 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
@@ -15,11 +15,11 @@
 
 <?php if ($block->hasSamples()): ?>
     <dl class="items samples">
-        <dt class="item-title samples-item-title"><?= /* @escapeNotVerified */ $block->getSamplesTitle() ?></dt>
+        <dt class="item-title samples-item-title"><?= $block->escapeHtml($block->getSamplesTitle()) ?></dt>
         <?php $_samples = $block->getSamples() ?>
         <?php foreach ($_samples as $_sample): ?>
             <dd class="item samples-item">
-                <a href="<?= /* @escapeNotVerified */ $block->getSampleUrl($_sample) ?>" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>
+                <a href="<?= $block->escapeHtml($block->getSampleUrl($_sample)) ?>" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>
                    class="item-link samples-item-link">
                     <?= $block->escapeHtml($_sample->getTitle()) ?>
                 </a>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
index 278374969e0..49422e4d2e4 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -39,7 +39,7 @@
         <?php /* downloadable */?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
+                <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
index 0cf1bf84698..202f123a331 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
@@ -39,7 +39,7 @@
         <?php /* downloadable */ ?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
+                <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
index 40d965e5304..c10bb0db591 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
@@ -40,7 +40,7 @@
         <?php /* downloadable */ ?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
+                <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
index 9664cabc79b..e8970d2b421 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
@@ -307,4 +307,14 @@ public function setValidationRules(array $validationRules = null);
      * @return \Magento\Eav\Api\Data\AttributeExtensionInterface|null
      */
     public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object
+     *
+     * @param \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes
+    );
 }
diff --git a/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php b/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
index 5faebdfd5da..aa3b00126ee 100644
--- a/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
+++ b/app/code/Magento/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
@@ -7,6 +7,20 @@
 
 class Inputtype implements \Magento\Framework\Option\ArrayInterface
 {
+    /**
+     * @var array
+     */
+    private $optionsArray;
+
+    /**
+     * Inputtype constructor.
+     * @param array $optionsArray
+     */
+    public function __construct(array $optionsArray = [])
+    {
+        $this->optionsArray = $optionsArray;
+    }
+
     /**
      * Return array of options
      *
@@ -14,15 +28,9 @@ class Inputtype implements \Magento\Framework\Option\ArrayInterface
      */
     public function toOptionArray()
     {
-        return [
-            ['value' => 'text', 'label' => __('Text Field')],
-            ['value' => 'textarea', 'label' => __('Text Area')],
-            ['value' => 'texteditor', 'label' => __('Text Editor')],
-            ['value' => 'date', 'label' => __('Date')],
-            ['value' => 'boolean', 'label' => __('Yes/No')],
-            ['value' => 'multiselect', 'label' => __('Multiple Select')],
-            ['value' => 'select', 'label' => __('Dropdown')]
-        ];
+        //sort array elements using key value
+        ksort($this->optionsArray);
+        return $this->optionsArray;
     }
 
     /**
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 3a2bfad06db..1b20858a0c4 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -15,7 +15,6 @@
  *
  * @api
  * @method \Magento\Eav\Model\Entity\Attribute setOption($value)
- * @method \Magento\Eav\Api\Data\AttributeExtensionInterface getExtensionAttributes()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php
index 5ea8e97e700..156c0326f2b 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php
@@ -41,7 +41,7 @@ public function beforeSave($object)
     {
         // parent::beforeSave() is not called intentionally
         $attrCode = $this->getAttribute()->getAttributeCode();
-        if ($object->hasData($attrCode)) {
+        if ($object->hasData($attrCode) && !$this->isJsonEncoded($object->getData($attrCode))) {
             $object->setData($attrCode, $this->jsonSerializer->serialize($object->getData($attrCode)));
         }
         return $this;
@@ -61,4 +61,24 @@ public function afterLoad($object)
         $object->setData($attrCode, $this->jsonSerializer->unserialize($object->getData($attrCode) ?: '{}'));
         return $this;
     }
+
+    /**
+     * Returns true if given value is a valid json value, and false otherwise.
+     *
+     * @param string|int|float|bool|array|null $value
+     * @return bool
+     */
+    private function isJsonEncoded($value): bool
+    {
+        $result = is_string($value);
+        if ($result) {
+            try {
+                $this->jsonSerializer->unserialize($value);
+            } catch (\InvalidArgumentException $e) {
+                $result = false;
+            }
+        }
+
+        return $result;
+    }
 }
diff --git a/app/code/Magento/Eav/Setup/Patch/Data/InitializeAttributeModels.php b/app/code/Magento/Eav/Setup/Patch/Data/InitializeAttributeModels.php
index 260704ddd40..5cae23f8fd1 100644
--- a/app/code/Magento/Eav/Setup/Patch/Data/InitializeAttributeModels.php
+++ b/app/code/Magento/Eav/Setup/Patch/Data/InitializeAttributeModels.php
@@ -9,8 +9,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InitializeAttributeModels
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Adminhtml/System/Config/Source/InputtypeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Adminhtml/System/Config/Source/InputtypeTest.php
index 0fd50988b81..a851ab41610 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Adminhtml/System/Config/Source/InputtypeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Adminhtml/System/Config/Source/InputtypeTest.php
@@ -14,12 +14,20 @@ class InputtypeTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->model = new \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype();
+        $this->model = new \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype(
+            $this->getOptionsArray()
+        );
     }
 
     public function testToOptionArray()
     {
-        $expectedResult = [
+        $expectedResult = $this->getOptionsArray();
+        $this->assertEquals($expectedResult, $this->model->toOptionArray());
+    }
+
+    private function getOptionsArray()
+    {
+        return [
             ['value' => 'text', 'label' => 'Text Field'],
             ['value' => 'textarea', 'label' => 'Text Area'],
             ['value' => 'texteditor', 'label' => 'Text Editor'],
@@ -28,6 +36,5 @@ public function testToOptionArray()
             ['value' => 'multiselect', 'label' => 'Multiple Select'],
             ['value' => 'select', 'label' => 'Dropdown']
         ];
-        $this->assertEquals($expectedResult, $this->model->toOptionArray());
     }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php
index d94d25e7fd1..3388cbd3052 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php
@@ -82,6 +82,25 @@ public function testBeforeSave()
         $this->assertEquals(json_encode([1, 2, 3]), $product->getData('json_encoded'));
     }
 
+    /**
+     * Test before save handler with already encoded attribute value
+     */
+    public function testBeforeSaveWithAlreadyEncodedValue()
+    {
+        $product = new \Magento\Framework\DataObject(
+            [
+                'json_encoded' => [1, 2, 3]
+            ]
+        );
+
+        // save twice
+        $this->model->beforeSave($product);
+        $this->model->beforeSave($product);
+        
+        // check it is encoded only once
+        $this->assertEquals(json_encode([1, 2, 3]), $product->getData('json_encoded'));
+    }
+
     /**
      * Test after load handler
      */
diff --git a/app/code/Magento/Eav/etc/adminhtml/di.xml b/app/code/Magento/Eav/etc/adminhtml/di.xml
new file mode 100644
index 00000000000..7e8e13465b1
--- /dev/null
+++ b/app/code/Magento/Eav/etc/adminhtml/di.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype">
+        <arguments>
+            <argument name="optionsArray" xsi:type="array">
+                <item name="100" xsi:type="array">
+                    <item name="value" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Text Field</item>
+                </item>
+                <item name="200" xsi:type="array">
+                    <item name="value" xsi:type="string">textarea</item>
+                    <item name="label" xsi:type="string" translate="true">Text Area</item>
+                </item>
+                <item name="300" xsi:type="array">
+                    <item name="value" xsi:type="string">texteditor</item>
+                    <item name="label" xsi:type="string" translate="true">Text Editor</item>
+                </item>
+                <item name="400" xsi:type="array">
+                    <item name="value" xsi:type="string">date</item>
+                    <item name="label" xsi:type="string" translate="true">Date</item>
+                </item>
+                <item name="500" xsi:type="array">
+                    <item name="value" xsi:type="string">boolean</item>
+                    <item name="label" xsi:type="string" translate="true">Yes/No</item>
+                </item>
+                <item name="600" xsi:type="array">
+                    <item name="value" xsi:type="string">multiselect</item>
+                    <item name="label" xsi:type="string" translate="true">Multiple Select</item>
+                </item>
+                <item name="700" xsi:type="array">
+                    <item name="value" xsi:type="string">select</item>
+                    <item name="label" xsi:type="string" translate="true">Dropdown</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/Eav/etc/db_schema.xml b/app/code/Magento/Eav/etc/db_schema.xml
index 3acd1c28f08..24a9d405dd7 100644
--- a/app/code/Magento/Eav/etc/db_schema.xml
+++ b/app/code/Magento/Eav/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="eav_entity_type" resource="default" engine="innodb" comment="Eav Entity Type">
         <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="true"
                 comment="Entity Type Id"/>
diff --git a/app/code/Magento/Email/etc/db_schema.xml b/app/code/Magento/Email/etc/db_schema.xml
index 937cdefa5d7..53ef349a383 100644
--- a/app/code/Magento/Email/etc/db_schema.xml
+++ b/app/code/Magento/Email/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="email_template" resource="default" engine="innodb" comment="Email Templates">
         <column xsi:type="int" name="template_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Template ID"/>
diff --git a/app/code/Magento/Fedex/Setup/Patch/Data/ConfigureFedexDefaults.php b/app/code/Magento/Fedex/Setup/Patch/Data/ConfigureFedexDefaults.php
index 56cdf6c6093..c4e41ad7229 100644
--- a/app/code/Magento/Fedex/Setup/Patch/Data/ConfigureFedexDefaults.php
+++ b/app/code/Magento/Fedex/Setup/Patch/Data/ConfigureFedexDefaults.php
@@ -7,8 +7,8 @@
 namespace Magento\Fedex\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class ConfigureFedexDefaults implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/Framework/Test/Unit/Setup/SchemaPersistorTest.php b/app/code/Magento/Framework/Test/Unit/Setup/SchemaPersistorTest.php
index 94dfc50036c..56f04f4c7ba 100644
--- a/app/code/Magento/Framework/Test/Unit/Setup/SchemaPersistorTest.php
+++ b/app/code/Magento/Framework/Test/Unit/Setup/SchemaPersistorTest.php
@@ -145,7 +145,7 @@ public function schemaListenerTablesDataProvider()
                 ],
                 'XMLResult' => '<?xml version="1.0"?>
                         <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+                            xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
                             <table name="first_table" resource="default" engine="innodb">
                                 <column xmlns:xsi="xsi" xsi:type="integer" name="first_column" nullable="1" 
                                     unsigned="0"/>
diff --git a/app/code/Magento/GiftMessage/Setup/Patch/Data/AddGiftMessageAttributes.php b/app/code/Magento/GiftMessage/Setup/Patch/Data/AddGiftMessageAttributes.php
index aed7a4a73ed..bbaa9a883d8 100644
--- a/app/code/Magento/GiftMessage/Setup/Patch/Data/AddGiftMessageAttributes.php
+++ b/app/code/Magento/GiftMessage/Setup/Patch/Data/AddGiftMessageAttributes.php
@@ -10,8 +10,8 @@
 use Magento\Quote\Setup\QuoteSetupFactory;
 use Magento\Sales\Setup\SalesSetupFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class AddGiftMessageAttributes implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/GiftMessage/Setup/Patch/Data/MoveGiftMessageToGiftOptionsGroup.php b/app/code/Magento/GiftMessage/Setup/Patch/Data/MoveGiftMessageToGiftOptionsGroup.php
index f903346db60..1f2c533a978 100644
--- a/app/code/Magento/GiftMessage/Setup/Patch/Data/MoveGiftMessageToGiftOptionsGroup.php
+++ b/app/code/Magento/GiftMessage/Setup/Patch/Data/MoveGiftMessageToGiftOptionsGroup.php
@@ -12,8 +12,8 @@
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class MoveGiftMessageToGiftOptionsGroup implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/GiftMessage/Setup/Patch/Data/UpdateGiftMessageAttribute.php b/app/code/Magento/GiftMessage/Setup/Patch/Data/UpdateGiftMessageAttribute.php
index 8337ac3d896..dacd86a05c6 100644
--- a/app/code/Magento/GiftMessage/Setup/Patch/Data/UpdateGiftMessageAttribute.php
+++ b/app/code/Magento/GiftMessage/Setup/Patch/Data/UpdateGiftMessageAttribute.php
@@ -9,8 +9,8 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Setup\CategorySetupFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateGiftMessageAttribute
diff --git a/app/code/Magento/GiftMessage/etc/db_schema.xml b/app/code/Magento/GiftMessage/etc/db_schema.xml
index 62bb290b55e..ecd73bd8708 100644
--- a/app/code/Magento/GiftMessage/etc/db_schema.xml
+++ b/app/code/Magento/GiftMessage/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="gift_message" resource="default" engine="innodb" comment="Gift Message">
         <column xsi:type="int" name="gift_message_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="GiftMessage Id"/>
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
index 177ceb56d68..7d065ea50b3 100644
--- a/app/code/Magento/GoogleAnalytics/Block/Ga.php
+++ b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -128,8 +128,8 @@ public function getOrdersTrackingCode()
                         'price': '%s',
                         'quantity': %s
                     });",
-                    $this->escapeJs($item->getSku()),
-                    $this->escapeJs($item->getName()),
+                    $this->escapeJsQuote($item->getSku()),
+                    $this->escapeJsQuote($item->getName()),
                     $item->getPrice(),
                     $item->getQtyOrdered()
                 );
@@ -144,7 +144,7 @@ public function getOrdersTrackingCode()
                     'shipping': '%s'
                 });",
                 $order->getIncrementId(),
-                $this->escapeJs($this->_storeManager->getStore()->getFrontendName()),
+                $this->escapeJsQuote($this->_storeManager->getStore()->getFrontendName()),
                 $order->getGrandTotal(),
                 $order->getTaxAmount(),
                 $order->getShippingAmount()
@@ -234,15 +234,15 @@ public function getOrdersTrackingData()
         foreach ($collection as $order) {
             foreach ($order->getAllVisibleItems() as $item) {
                 $result['products'][] = [
-                    'id' => $this->escapeJs($item->getSku()),
-                    'name' =>  $this->escapeJs($item->getName()),
+                    'id' => $this->escapeJsQuote($item->getSku()),
+                    'name' =>  $this->escapeJsQuote($item->getName()),
                     'price' => $item->getPrice(),
                     'quantity' => $item->getQtyOrdered(),
                 ];
             }
             $result['orders'][] = [
                 'id' =>  $order->getIncrementId(),
-                'affiliation' => $this->escapeJs($this->_storeManager->getStore()->getFrontendName()),
+                'affiliation' => $this->escapeJsQuote($this->_storeManager->getStore()->getFrontendName()),
                 'revenue' => $order->getGrandTotal(),
                 'tax' => $order->getTaxAmount(),
                 'shipping' => $order->getShippingAmount(),
diff --git a/app/code/Magento/GoogleOptimizer/etc/db_schema.xml b/app/code/Magento/GoogleOptimizer/etc/db_schema.xml
index 82eff9219f5..ad3e03e490b 100644
--- a/app/code/Magento/GoogleOptimizer/etc/db_schema.xml
+++ b/app/code/Magento/GoogleOptimizer/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="googleoptimizer_code" resource="default" engine="innodb" comment="Google Experiment code">
         <column xsi:type="int" name="code_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Google experiment code id"/>
diff --git a/app/code/Magento/GroupedProduct/Setup/Patch/Data/InitializeGroupedProductLinks.php b/app/code/Magento/GroupedProduct/Setup/Patch/Data/InitializeGroupedProductLinks.php
index 757d02b6f3a..9f3e1a58267 100644
--- a/app/code/Magento/GroupedProduct/Setup/Patch/Data/InitializeGroupedProductLinks.php
+++ b/app/code/Magento/GroupedProduct/Setup/Patch/Data/InitializeGroupedProductLinks.php
@@ -10,8 +10,8 @@
 use Magento\Eav\Setup\EavSetup;
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InitializeGroupedProductLinks
diff --git a/app/code/Magento/GroupedProduct/Setup/Patch/Data/UpdateProductRelations.php b/app/code/Magento/GroupedProduct/Setup/Patch/Data/UpdateProductRelations.php
index 403be33a8b4..65a75099fff 100644
--- a/app/code/Magento/GroupedProduct/Setup/Patch/Data/UpdateProductRelations.php
+++ b/app/code/Magento/GroupedProduct/Setup/Patch/Data/UpdateProductRelations.php
@@ -10,8 +10,8 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\GroupedProduct\Model\ResourceModel\Product\Link;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateProductRelations
diff --git a/app/code/Magento/ImportExport/etc/db_schema.xml b/app/code/Magento/ImportExport/etc/db_schema.xml
index fb3e8cf540f..01f20daabf0 100644
--- a/app/code/Magento/ImportExport/etc/db_schema.xml
+++ b/app/code/Magento/ImportExport/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="importexport_importdata" resource="default" engine="innodb" comment="Import Data Table">
         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
         <column xsi:type="varchar" name="entity" nullable="false" length="50" comment="Entity"/>
diff --git a/app/code/Magento/Indexer/Setup/Patch/Data/InitializeIndexerState.php b/app/code/Magento/Indexer/Setup/Patch/Data/InitializeIndexerState.php
index fdb9b28ea0b..887f3311ee9 100644
--- a/app/code/Magento/Indexer/Setup/Patch/Data/InitializeIndexerState.php
+++ b/app/code/Magento/Indexer/Setup/Patch/Data/InitializeIndexerState.php
@@ -15,8 +15,8 @@
 use Magento\Indexer\Model\Indexer\State;
 use Magento\Indexer\Model\Indexer\StateFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InitializeIndexerState
diff --git a/app/code/Magento/Indexer/etc/db_schema.xml b/app/code/Magento/Indexer/etc/db_schema.xml
index 14ae9f75d4b..58c447f4d26 100644
--- a/app/code/Magento/Indexer/etc/db_schema.xml
+++ b/app/code/Magento/Indexer/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="indexer_state" resource="default" engine="innodb" comment="Indexer State">
         <column xsi:type="int" name="state_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Indexer State Id"/>
diff --git a/app/code/Magento/Integration/Setup/Patch/Data/RemoveInactiveTokens.php b/app/code/Magento/Integration/Setup/Patch/Data/RemoveInactiveTokens.php
index 1f5148dd2d2..c6d8d58d3e6 100644
--- a/app/code/Magento/Integration/Setup/Patch/Data/RemoveInactiveTokens.php
+++ b/app/code/Magento/Integration/Setup/Patch/Data/RemoveInactiveTokens.php
@@ -7,8 +7,8 @@
 namespace Magento\Integration\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class RemoveInactiveTokens
diff --git a/app/code/Magento/Integration/etc/db_schema.xml b/app/code/Magento/Integration/etc/db_schema.xml
index 252cdf16b99..0e95ef54e1b 100644
--- a/app/code/Magento/Integration/etc/db_schema.xml
+++ b/app/code/Magento/Integration/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="oauth_consumer" resource="default" engine="innodb" comment="OAuth Consumers">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Entity Id"/>
diff --git a/app/code/Magento/MessageQueue/Console/ConsumerListCommand.php b/app/code/Magento/MessageQueue/Console/ConsumerListCommand.php
new file mode 100644
index 00000000000..9248d50ee78
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Console/ConsumerListCommand.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Console;
+
+use Symfony\Component\Console\Command\Command;
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+
+/**
+ * Command for starting MessageQueue consumers.
+ */
+class ConsumerListCommand extends Command
+{
+    const COMMAND_QUEUE_CONSUMERS_LIST = 'queue:consumers:list';
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueConfig $queueConfig
+     * @param string|null $name
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(QueueConfig $queueConfig, $name = null)
+    {
+        parent::__construct($name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $consumers = $this->getConsumers();
+        $output->writeln($consumers);
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName(self::COMMAND_QUEUE_CONSUMERS_LIST);
+        $this->setDescription('List of MessageQueue consumers');
+        $this->setHelp(
+            <<<HELP
+This command shows list of MessageQueue consumers.
+HELP
+        );
+        parent::configure();
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getConsumers()
+    {
+        $consumerNames = [];
+        foreach ($this->getConsumerConfig()->getConsumers() as $consumer) {
+            $consumerNames[] = $consumer->getName();
+        }
+        return $consumerNames;
+    }
+
+    /**
+     * Get consumer config.
+     *
+     * @return ConsumerConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConsumerConfig()
+    {
+        if ($this->consumerConfig === null) {
+            $this->consumerConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(ConsumerConfig::class);
+        }
+        return $this->consumerConfig;
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php b/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php
new file mode 100644
index 00000000000..571b725e733
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Console;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\MessageQueue\ConsumerFactory;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+
+/**
+ * Command for starting MessageQueue consumers.
+ */
+class StartConsumerCommand extends Command
+{
+    const ARGUMENT_CONSUMER = 'consumer';
+    const OPTION_NUMBER_OF_MESSAGES = 'max-messages';
+    const OPTION_BATCH_SIZE = 'batch-size';
+    const OPTION_AREACODE = 'area-code';
+    const PID_FILE_PATH = 'pid-file-path';
+    const COMMAND_QUEUE_CONSUMERS_START = 'queue:consumers:start';
+
+    /**
+     * @var ConsumerFactory
+     */
+    private $consumerFactory;
+
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    private $appState;
+
+    /**
+     * @var PidConsumerManager
+     */
+    private $pidConsumerManager;
+
+    /**
+     * StartConsumerCommand constructor.
+     * {@inheritdoc}
+     *
+     * @param \Magento\Framework\App\State $appState
+     * @param ConsumerFactory $consumerFactory
+     * @param string $name
+     * @param PidConsumerManager $pidConsumerManager
+     */
+    public function __construct(
+        \Magento\Framework\App\State $appState,
+        ConsumerFactory $consumerFactory,
+        $name = null,
+        PidConsumerManager $pidConsumerManager = null
+    ) {
+        $this->appState = $appState;
+        $this->consumerFactory = $consumerFactory;
+        $this->pidConsumerManager = $pidConsumerManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(PidConsumerManager::class);
+        parent::__construct($name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $consumerName = $input->getArgument(self::ARGUMENT_CONSUMER);
+        $numberOfMessages = $input->getOption(self::OPTION_NUMBER_OF_MESSAGES);
+        $batchSize = (int)$input->getOption(self::OPTION_BATCH_SIZE);
+        $areaCode = $input->getOption(self::OPTION_AREACODE);
+        $pidFilePath = $input->getOption(self::PID_FILE_PATH);
+
+        if ($pidFilePath && $this->pidConsumerManager->isRun($pidFilePath)) {
+            $output->writeln('<error>Consumer with the same PID is running</error>');
+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+        }
+
+        if ($pidFilePath) {
+            $this->pidConsumerManager->savePid($pidFilePath);
+        }
+
+        if ($areaCode !== null) {
+            $this->appState->setAreaCode($areaCode);
+        } else {
+            $this->appState->setAreaCode('global');
+        }
+
+        $consumer = $this->consumerFactory->get($consumerName, $batchSize);
+        $consumer->process($numberOfMessages);
+        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName(self::COMMAND_QUEUE_CONSUMERS_START);
+        $this->setDescription('Start MessageQueue consumer');
+        $this->addArgument(
+            self::ARGUMENT_CONSUMER,
+            InputArgument::REQUIRED,
+            'The name of the consumer to be started.'
+        );
+        $this->addOption(
+            self::OPTION_NUMBER_OF_MESSAGES,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'The number of messages to be processed by the consumer before process termination. '
+            . 'If not specified - terminate after processing all queued messages.'
+        );
+        $this->addOption(
+            self::OPTION_BATCH_SIZE,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'The number of messages per batch. Applicable for the batch consumer only.'
+        );
+        $this->addOption(
+            self::OPTION_AREACODE,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'The preferred area (global, adminhtml, etc...) '
+            . 'default is global.'
+        );
+        $this->addOption(
+            self::PID_FILE_PATH,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'The file path for saving PID'
+        );
+        $this->setHelp(
+            <<<HELP
+This command starts MessageQueue consumer by its name.
+
+To start consumer which will process all queued messages and terminate execution:
+
+    <comment>%command.full_name% someConsumer</comment>
+
+To specify the number of messages which should be processed by consumer before its termination:
+
+    <comment>%command.full_name% someConsumer --max-messages=50</comment>
+
+To specify the number of messages per batch for the batch consumer:
+
+    <comment>%command.full_name% someConsumer --batch-size=500</comment>
+
+To specify the preferred area:
+
+    <comment>%command.full_name% someConsumer --area-code='adminhtml'</comment>
+
+To save PID enter path:
+
+    <comment>%command.full_name% someConsumer --pid-file-path='/var/someConsumer.pid'</comment>
+HELP
+        );
+        parent::configure();
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/ConsumerRunner.php b/app/code/Magento/MessageQueue/Model/ConsumerRunner.php
new file mode 100644
index 00000000000..92a0dcd4d77
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/ConsumerRunner.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model;
+
+use Magento\Framework\MessageQueue\ConsumerFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\MaintenanceMode;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Consumer runner class is used to run consumer, which name matches the magic method invoked on this class.
+ *
+ * Is used to schedule consumers execution in crontab.xml as follows:
+ * <code>
+ * <job name="consumerConsumerName" instance="Magento\MessageQueue\Model\ConsumerRunner" method="consumerName">
+ * </code>
+ * Where <i>consumerName</i> should be a valid name of consumer registered in some queue.xml
+ *
+ * @api
+ * @since 100.0.2
+ */
+class ConsumerRunner
+{
+    /**
+     * @var ConsumerFactory
+     */
+    private $consumerFactory;
+
+    /**
+     * @var MaintenanceMode
+     */
+    private $maintenanceMode;
+
+    /**
+     * @var integer
+     */
+    private $maintenanceSleepInterval;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConsumerFactory $consumerFactory
+     * @param MaintenanceMode $maintenanceMode
+     * @param integer $maintenanceSleepInterval
+     */
+    public function __construct(
+        ConsumerFactory $consumerFactory,
+        MaintenanceMode $maintenanceMode = null,
+        $maintenanceSleepInterval = 30
+    ) {
+        $this->consumerFactory = $consumerFactory;
+        $this->maintenanceMode = $maintenanceMode ?: ObjectManager::getInstance()->get(MaintenanceMode::class);
+        $this->maintenanceSleepInterval = $maintenanceSleepInterval;
+    }
+
+    /**
+     * Process messages in queue using consumer, which name is equal to the current magic method name.
+     *
+     * @param string $name
+     * @param array $arguments
+     * @throws LocalizedException
+     * @return void
+     */
+    public function __call($name, $arguments)
+    {
+        try {
+            $consumer = $this->consumerFactory->get($name);
+        } catch (\Exception $e) {
+            $errorMsg = '"%callbackMethod" callback method specified in crontab.xml '
+                . 'must have corresponding consumer declared in some queue.xml.';
+            throw new LocalizedException(__($errorMsg, ['callbackMethod' => $name]));
+        }
+        if (!$this->maintenanceMode->isOn()) {
+            $consumer->process();
+        } else {
+            sleep($this->maintenanceSleepInterval);
+        }
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
new file mode 100644
index 00000000000..c4620862b2e
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model\Cron;
+
+use Magento\Framework\ShellInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Symfony\Component\Process\PhpExecutableFinder;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+
+/**
+ * Class for running consumers processes by cron
+ */
+class ConsumersRunner
+{
+    /**
+     * Extension of PID file
+     */
+    const PID_FILE_EXT = '.pid';
+
+    /**
+     * Shell command line wrapper for executing command in background
+     *
+     * @var ShellInterface
+     */
+    private $shellBackground;
+
+    /**
+     * Consumer config provider
+     *
+     * @var ConsumerConfigInterface
+     */
+    private $consumerConfig;
+
+    /**
+     * Application deployment configuration
+     *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * The executable finder specifically designed for the PHP executable
+     *
+     * @var PhpExecutableFinder
+     */
+    private $phpExecutableFinder;
+
+    /**
+     * The class for checking status of process by PID
+     *
+     * @var PidConsumerManager
+     */
+    private $pidConsumerManager;
+
+    /**
+     * @param PhpExecutableFinder $phpExecutableFinder The executable finder specifically designed
+     *        for the PHP executable
+     * @param ConsumerConfigInterface $consumerConfig The consumer config provider
+     * @param DeploymentConfig $deploymentConfig The application deployment configuration
+     * @param ShellInterface $shellBackground The shell command line wrapper for executing command in background
+     * @param PidConsumerManager $pidConsumerManager The class for checking status of process by PID
+     */
+    public function __construct(
+        PhpExecutableFinder $phpExecutableFinder,
+        ConsumerConfigInterface $consumerConfig,
+        DeploymentConfig $deploymentConfig,
+        ShellInterface $shellBackground,
+        PidConsumerManager $pidConsumerManager
+    ) {
+        $this->phpExecutableFinder = $phpExecutableFinder;
+        $this->consumerConfig = $consumerConfig;
+        $this->deploymentConfig = $deploymentConfig;
+        $this->shellBackground = $shellBackground;
+        $this->pidConsumerManager = $pidConsumerManager;
+    }
+
+    /**
+     * Runs consumers processes
+     */
+    public function run()
+    {
+        $runByCron = $this->deploymentConfig->get('cron_consumers_runner/cron_run', true);
+
+        if (!$runByCron) {
+            return;
+        }
+
+        $maxMessages = (int) $this->deploymentConfig->get('cron_consumers_runner/max_messages', 10000);
+        $allowedConsumers = $this->deploymentConfig->get('cron_consumers_runner/consumers', []);
+        $php = $this->phpExecutableFinder->find() ?: 'php';
+
+        foreach ($this->consumerConfig->getConsumers() as $consumer) {
+            $consumerName = $consumer->getName();
+
+            if (!$this->canBeRun($consumerName, $allowedConsumers)) {
+                continue;
+            }
+
+            $arguments = [
+                $consumerName,
+                '--pid-file-path=' . $this->getPidFilePath($consumerName),
+            ];
+
+            if ($maxMessages) {
+                $arguments[] = '--max-messages=' . $maxMessages;
+            }
+
+            $command = $php . ' ' . BP . '/bin/magento queue:consumers:start %s %s'
+                . ($maxMessages ? ' %s' : '');
+
+            $this->shellBackground->execute($command, $arguments);
+        }
+    }
+
+    /**
+     * Checks that the consumer can be run
+     *
+     * @param string $consumerName The consumer name
+     * @param array $allowedConsumers The list of allowed consumers
+     *        If $allowedConsumers is empty it means that all consumers are allowed
+     * @return bool Returns true if the consumer can be run
+     */
+    private function canBeRun($consumerName, array $allowedConsumers = [])
+    {
+        $allowed = empty($allowedConsumers) ?: in_array($consumerName, $allowedConsumers);
+
+        return $allowed && !$this->pidConsumerManager->isRun($this->getPidFilePath($consumerName));
+    }
+
+    /**
+     * Returns default path to file with PID by consumers name
+     *
+     * @param string $consumerName The consumers name
+     * @return string The path to file with PID
+     */
+    private function getPidFilePath($consumerName)
+    {
+        return $consumerName . static::PID_FILE_EXT;
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner/PidConsumerManager.php b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner/PidConsumerManager.php
new file mode 100644
index 00000000000..d5f827320ac
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner/PidConsumerManager.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model\Cron\ConsumersRunner;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Exception\FileSystemException;
+
+/**
+ * The class for checking status of process by PID
+ */
+class PidConsumerManager
+{
+    /**
+     * Extension of PID file
+     * @deprecated Moved to the correct responsibility area
+     * @see \Magento\MessageQueue\Model\Cron\ConsumersRunner::PID_FILE_EXT
+     */
+    const PID_FILE_EXT = '.pid';
+
+    /**
+     * The class for working with FS
+     *
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @param Filesystem $filesystem The class for working with FS
+     */
+    public function __construct(Filesystem $filesystem)
+    {
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * Checks if consumer process is run by pid from pidFile
+     *
+     * @param string $pidFilePath The path to file with PID
+     * @return bool Returns true if consumer process is run
+     * @throws FileSystemException
+     */
+    public function isRun($pidFilePath)
+    {
+        $pid = $this->getPid($pidFilePath);
+        if ($pid) {
+            if (function_exists('posix_getpgid')) {
+                return (bool) posix_getpgid($pid);
+            } else {
+                return $this->checkIsProcessExists($pid);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks that process is running
+     *
+     * If php function exec is not available throws RuntimeException
+     * If shell command returns non-zero code and this code is not 1 throws RuntimeException
+     *
+     * @param int $pid A pid of process
+     * @return bool Returns true if consumer process is run
+     * @throws \RuntimeException
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function checkIsProcessExists($pid)
+    {
+        if (!function_exists('exec')) {
+            throw new \RuntimeException('Function exec is not available');
+        }
+
+        exec(escapeshellcmd('ps -p ' . $pid), $output, $code);
+
+        $code = (int) $code;
+
+        switch ($code) {
+            case 0:
+                return true;
+                break;
+            case 1:
+                return false;
+                break;
+            default:
+                throw new \RuntimeException('Exec returned non-zero code', $code);
+                break;
+        }
+    }
+
+    /**
+     * Returns pid by pidFile path
+     *
+     * @param string $pidFilePath The path to file with PID
+     * @return int Returns pid if pid file exists for consumer else returns 0
+     * @throws FileSystemException
+     */
+    public function getPid($pidFilePath)
+    {
+        /** @var ReadInterface $directory */
+        $directory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
+
+        if ($directory->isExist($pidFilePath)) {
+            return (int) $directory->readFile($pidFilePath);
+        }
+
+        return 0;
+    }
+
+    /**
+     * Saves pid of current process to file
+     *
+     * @param string $pidFilePath The path to file with pid
+     * @throws FileSystemException
+     */
+    public function savePid($pidFilePath)
+    {
+        /** @var WriteInterface $directory */
+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $directory->writeFile($pidFilePath, function_exists('posix_getpid') ? posix_getpid() : getmypid(), 'w');
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/Lock.php b/app/code/Magento/MessageQueue/Model/Lock.php
new file mode 100644
index 00000000000..e63a04fd1b0
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/Lock.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model;
+
+/**
+ * Class Lock to handle message lock transactions.
+ */
+class Lock extends \Magento\Framework\Model\AbstractModel
+{
+    /**
+     * Class constructor
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\MessageQueue\Model\ResourceModel\Lock::class);
+    }
+
+    /**
+     * Get message code
+     *
+     * @return string
+     */
+    public function getMessageCode()
+    {
+        return $this->_getData('message_code');
+    }
+
+    /**
+     * Set message code
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setMessageCode($value)
+    {
+        return $this->setData('message_code', $value);
+    }
+
+    /**
+     * Get lock date
+     *
+     * @return string
+     */
+    public function getCreatedAt()
+    {
+        return $this->_getData('created_at');
+    }
+
+    /**
+     * Set lock date
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setCreatedAt($value)
+    {
+        return $this->setData('created_at', $value);
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/Plugin/ResourceModel/Lock.php b/app/code/Magento/MessageQueue/Model/Plugin/ResourceModel/Lock.php
new file mode 100644
index 00000000000..30f275520fe
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/Plugin/ResourceModel/Lock.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MessageQueue\Model\Plugin\ResourceModel;
+
+/**
+ * Lock plugin to clear queue upon maintenance mode turning off.
+ */
+class Lock
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Lock\WriterInterface
+     */
+    private $lock;
+
+    /**
+     * Lock constructor.
+     *
+     * @param \Magento\Framework\MessageQueue\Lock\WriterInterface $lock
+     */
+    public function __construct(\Magento\Framework\MessageQueue\Lock\WriterInterface $lock)
+    {
+        $this->lock = $lock;
+    }
+
+    /**
+     * When maintenance mode is turned off, lock queue should be cleared
+     *
+     * @param \Magento\Framework\App\MaintenanceMode $subject
+     * @param boolean $result
+     * @return void
+     */
+    public function afterSet(\Magento\Framework\App\MaintenanceMode $subject, $result)
+    {
+        if (!$subject->isOn() && $result) {
+            $this->lock->releaseOutdatedLocks();
+        }
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/ResourceModel/Lock.php b/app/code/Magento/MessageQueue/Model/ResourceModel/Lock.php
new file mode 100644
index 00000000000..16c02a75056
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/ResourceModel/Lock.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model\ResourceModel;
+
+use \Magento\Framework\MessageQueue\Lock\ReaderInterface;
+use \Magento\Framework\MessageQueue\Lock\WriterInterface;
+
+/**
+ * Class Lock to handle database lock table db transactions.
+ */
+class Lock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements ReaderInterface, WriterInterface
+{
+    /**#@+
+     * Constants
+     */
+    const QUEUE_LOCK_TABLE = 'queue_lock';
+    /**#@-*/
+
+    /**#@-*/
+    private $dateTime;
+
+    /**
+     * @var \Magento\MessageQueue\Model\LockFactory
+     */
+    private $lockFactory;
+
+    /**
+     * @var integer
+     */
+    private $interval;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param \Magento\MessageQueue\Model\LockFactory $lockFactory
+     * @param null $connectionName
+     * @param integer $interval
+     */
+    public function __construct(
+        \Magento\Framework\Model\ResourceModel\Db\Context $context,
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
+        \Magento\MessageQueue\Model\LockFactory $lockFactory,
+        $connectionName = null,
+        $interval = 86400
+    ) {
+        $this->lockFactory = $lockFactory;
+        $this->interval = $interval;
+        $this->dateTime = $dateTime;
+        parent::__construct($context, $connectionName);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function _construct()
+    {
+        $this->_init(self::QUEUE_LOCK_TABLE, 'id');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function read(\Magento\Framework\MessageQueue\LockInterface $lock, $code)
+    {
+        $object = $this->lockFactory->create();
+        $object->load($code, 'message_code');
+        $lock->setId($object->getId());
+        $lock->setMessageCode($object->getMessageCode() ?: $code);
+        $lock->setCreatedAt($object->getCreatedAt());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function saveLock(\Magento\Framework\MessageQueue\LockInterface $lock)
+    {
+        $object = $this->lockFactory->create();
+        $object->setMessageCode($lock->getMessageCode());
+        $object->setCreatedAt($this->dateTime->gmtTimestamp());
+        $object->save();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function releaseOutdatedLocks()
+    {
+        $date = (new \DateTime())->setTimestamp($this->dateTime->gmtTimestamp());
+        $date->add(new \DateInterval('PT' . $this->interval . 'S'));
+        $this->getConnection()->delete($this->getTable(self::QUEUE_LOCK_TABLE), ['created_at <= ?' => $date]);
+    }
+}
diff --git a/app/code/Magento/MessageQueue/README.md b/app/code/Magento/MessageQueue/README.md
new file mode 100644
index 00000000000..78bb7944735
--- /dev/null
+++ b/app/code/Magento/MessageQueue/README.md
@@ -0,0 +1,3 @@
+# MessageQueue
+
+**MessageQueue** provides support of Advanced Message Queuing Protocol
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php b/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php
new file mode 100644
index 00000000000..922da3bfc87
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MessageQueue\Test\Unit\Console;
+
+use Magento\MessageQueue\Console\StartConsumerCommand;
+use Magento\Framework\Filesystem\File\WriteFactory;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+
+/**
+ * Unit tests for StartConsumerCommand.
+ */
+class StartConsumerCommandTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\ConsumerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $consumerFactory;
+
+    /**
+     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $appState;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var WriteFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $writeFactoryMock;
+
+    /**
+     * @var PidConsumerManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $pidConsumerManagerMock;
+
+    /**
+     * @var StartConsumerCommand
+     */
+    private $command;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->pidConsumerManagerMock = $this->getMockBuilder(PidConsumerManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consumerFactory = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerFactory::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->writeFactoryMock = $this->getMockBuilder(WriteFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->command = $this->objectManager->getObject(
+            \Magento\MessageQueue\Console\StartConsumerCommand::class,
+            [
+                'consumerFactory' => $this->consumerFactory,
+                'appState' => $this->appState,
+                'writeFactory' => $this->writeFactoryMock,
+                'pidConsumerManager' => $this->pidConsumerManagerMock,
+            ]
+        );
+        parent::setUp();
+    }
+
+    /**
+     * Test for execute method.
+     *
+     * @param string|null $pidFilePath
+     * @param int $savePidExpects
+     * @param int $isRunExpects
+     * @param bool $isRun
+     * @param int $runProcessExpects
+     * @param int $expectedReturn
+     * @return void
+     * @dataProvider executeDataProvider
+     */
+    public function testExecute(
+        $pidFilePath,
+        $savePidExpects,
+        $isRunExpects,
+        $isRun,
+        $runProcessExpects,
+        $expectedReturn
+    ) {
+        $areaCode = 'area_code';
+        $numberOfMessages = 10;
+        $batchSize = null;
+        $consumerName = 'consumer_name';
+        $input = $this->getMockBuilder(\Symfony\Component\Console\Input\InputInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $output = $this->getMockBuilder(\Symfony\Component\Console\Output\OutputInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $input->expects($this->once())->method('getArgument')
+            ->with(\Magento\MessageQueue\Console\StartConsumerCommand::ARGUMENT_CONSUMER)
+            ->willReturn($consumerName);
+        $input->expects($this->exactly(4))->method('getOption')
+            ->withConsecutive(
+                [\Magento\MessageQueue\Console\StartConsumerCommand::OPTION_NUMBER_OF_MESSAGES],
+                [\Magento\MessageQueue\Console\StartConsumerCommand::OPTION_BATCH_SIZE],
+                [\Magento\MessageQueue\Console\StartConsumerCommand::OPTION_AREACODE],
+                [\Magento\MessageQueue\Console\StartConsumerCommand::PID_FILE_PATH]
+            )->willReturnOnConsecutiveCalls(
+                $numberOfMessages,
+                $batchSize,
+                $areaCode,
+                $pidFilePath
+            );
+        $this->appState->expects($this->exactly($runProcessExpects))->method('setAreaCode')->with($areaCode);
+        $consumer = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->consumerFactory->expects($this->exactly($runProcessExpects))
+            ->method('get')->with($consumerName, $batchSize)->willReturn($consumer);
+        $consumer->expects($this->exactly($runProcessExpects))->method('process')->with($numberOfMessages);
+
+        $this->pidConsumerManagerMock->expects($this->exactly($isRunExpects))
+            ->method('isRun')
+            ->with($pidFilePath)
+            ->willReturn($isRun);
+
+        $this->pidConsumerManagerMock->expects($this->exactly($savePidExpects))
+            ->method('savePid')
+            ->with($pidFilePath);
+
+        $this->assertEquals(
+            $expectedReturn,
+            $this->command->run($input, $output)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function executeDataProvider()
+    {
+        return [
+            [
+                'pidFilePath' => null,
+                'savePidExpects' => 0,
+                'isRunExpects' => 0,
+                'isRun' => false,
+                'runProcessExpects' => 1,
+                'expectedReturn' => \Magento\Framework\Console\Cli::RETURN_SUCCESS,
+            ],
+            [
+                'pidFilePath' => '/var/consumer.pid',
+                'savePidExpects' => 1,
+                'isRunExpects' => 1,
+                'isRun' => false,
+                'runProcessExpects' => 1,
+                'expectedReturn' => \Magento\Framework\Console\Cli::RETURN_SUCCESS,
+            ],
+            [
+                'pidFilePath' => '/var/consumer.pid',
+                'savePidExpects' => 0,
+                'isRunExpects' => 1,
+                'isRun' => true,
+                'runProcessExpects' => 0,
+                'expectedReturn' => \Magento\Framework\Console\Cli::RETURN_FAILURE,
+            ],
+        ];
+    }
+
+    /**
+     * Test configure() method implicitly via construct invocation.
+     *
+     * @return void
+     */
+    public function testConfigure()
+    {
+        $this->assertEquals(StartConsumerCommand::COMMAND_QUEUE_CONSUMERS_START, $this->command->getName());
+        $this->assertEquals('Start MessageQueue consumer', $this->command->getDescription());
+        /** Exception will be thrown if argument is not declared */
+        $this->command->getDefinition()->getArgument(StartConsumerCommand::ARGUMENT_CONSUMER);
+        $this->command->getDefinition()->getOption(StartConsumerCommand::OPTION_NUMBER_OF_MESSAGES);
+        $this->command->getDefinition()->getOption(StartConsumerCommand::OPTION_AREACODE);
+        $this->command->getDefinition()->getOption(StartConsumerCommand::PID_FILE_PATH);
+        $this->assertContains('To start consumer which will process', $this->command->getHelp());
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/ConsumerRunnerTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/ConsumerRunnerTest.php
new file mode 100644
index 00000000000..46a142bf488
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/ConsumerRunnerTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MessageQueue\Test\Unit\Model;
+
+use Magento\Framework\MessageQueue\ConsumerInterface;
+use Magento\MessageQueue\Model\ConsumerRunner;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Unit tests for consumer runner
+ */
+class ConsumerRunnerTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    private $objectManager;
+
+    /**
+     * @var ConsumerRunner
+     */
+    private $consumerRunner;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\ConsumerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $consumerFactoryMock;
+
+    /**
+     * @var \Magento\Framework\App\MaintenanceMode|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $maintenanceModeMock;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->consumerFactoryMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->maintenanceModeMock = $this->getMockBuilder(\Magento\Framework\App\MaintenanceMode::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consumerRunner = $this->objectManager->getObject(
+            \Magento\MessageQueue\Model\ConsumerRunner::class,
+            [
+                'consumerFactory' => $this->consumerFactoryMock,
+                'maintenanceMode' => $this->maintenanceModeMock
+            ]
+        );
+        parent::setUp();
+    }
+
+    /**
+     * Ensure that consumer, with name equal to invoked magic method name, is run.
+     *
+     * @return void
+     */
+    public function testMagicMethod()
+    {
+        $isMaintenanceModeOn = false;
+        /** @var ConsumerInterface|\PHPUnit_Framework_MockObject_MockObject $consumerMock */
+        $consumerMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerInterface::class)->getMock();
+        $consumerMock->expects($this->once())->method('process');
+        $consumerName = 'someConsumerName';
+        $this->consumerFactoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($consumerName)
+            ->willReturn($consumerMock);
+        $this->maintenanceModeMock->expects($this->once())->method('isOn')->willReturn($isMaintenanceModeOn);
+
+        $this->consumerRunner->$consumerName();
+    }
+
+    /**
+     * Ensure that exception will be thrown if requested magic method does not correspond to any declared consumer.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage "nonDeclaredConsumer" callback method specified in crontab.xml must
+     * @return void
+     */
+    public function testMagicMethodNoRelatedConsumer()
+    {
+        $consumerName = 'nonDeclaredConsumer';
+        $this->consumerFactoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($consumerName)
+            ->willThrowException(new LocalizedException(new Phrase("Some exception")));
+
+        $this->consumerRunner->$consumerName();
+    }
+
+    /**
+     * Ensure that process method will not be invoked if maintenance mode isOn returns true
+     *
+     * @return void
+     */
+    public function testMagicMethodMaintenanceModeIsOn()
+    {
+        $isMaintenanceModeOn = true;
+        /** @var ConsumerInterface|\PHPUnit_Framework_MockObject_MockObject $consumerMock */
+        $consumerMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerInterface::class)->getMock();
+        $consumerMock->expects($this->never())->method('process');
+        $consumerName = 'someConsumerName';
+        $this->consumerFactoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($consumerName)
+            ->willReturn($consumerMock);
+        $this->maintenanceModeMock->expects($this->once())->method('isOn')->willReturn($isMaintenanceModeOn);
+
+        $this->consumerRunner->$consumerName();
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunner/PidConsumerManagerTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunner/PidConsumerManagerTest.php
new file mode 100644
index 00000000000..3d48e0b19ef
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunner/PidConsumerManagerTest.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Test\Unit\Model\Cron\ConsumersRunner;
+
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Filesystem;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class PidConsumerManagerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Filesystem|MockObject
+     */
+    private $filesystemMock;
+
+    /**
+     * @var PidConsumerManager
+     */
+    private $pidConsumerManager;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        require_once __DIR__ . '/../../../_files/pid_consumer_functions_mocks.php';
+
+        $this->filesystemMock = $this->getMockBuilder(Filesystem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->pidConsumerManager = new PidConsumerManager($this->filesystemMock);
+    }
+
+    /**
+     * @param bool $fileExists
+     * @param int|null $pid
+     * @param bool $expectedResult
+     * @dataProvider isRunDataProvider
+     */
+    public function testIsRun($fileExists, $pid, $expectedResult)
+    {
+        $pidFilePath = 'somepath/consumerName.pid';
+
+        /** @var ReadInterface|MockObject $directoryMock */
+        $directoryMock = $this->getMockBuilder(ReadInterface::class)
+            ->getMockForAbstractClass();
+        $directoryMock->expects($this->once())
+            ->method('isExist')
+            ->willReturn($fileExists);
+        $directoryMock->expects($this->any())
+            ->method('readFile')
+            ->with($pidFilePath)
+            ->willReturn($pid);
+
+        $this->filesystemMock->expects($this->once())
+            ->method('getDirectoryRead')
+            ->with(DirectoryList::VAR_DIR)
+            ->willReturn($directoryMock);
+
+        $this->assertSame($expectedResult, $this->pidConsumerManager->isRun($pidFilePath));
+    }
+
+    /**
+     * @return array
+     */
+    public function isRunDataProvider()
+    {
+        return [
+            ['fileExists' => false, 'pid' => null, false],
+            ['fileExists' => false, 'pid' => 11111, false],
+            ['fileExists' => true, 'pid' => 11111, true],
+            ['fileExists' => true, 'pid' => 77777, false],
+        ];
+    }
+
+    public function testSavePid()
+    {
+        $pidFilePath = '/var/somePath/pidfile.pid';
+
+        /** @var WriteInterface|MockObject $writeMock */
+        $writeMock = $this->getMockBuilder(WriteInterface::class)
+            ->getMockForAbstractClass();
+        $this->filesystemMock->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->with(DirectoryList::VAR_DIR)
+            ->willReturn($writeMock);
+        $writeMock->expects($this->once())
+            ->method('writeFile')
+            ->with(
+                $pidFilePath,
+                function_exists('posix_getpid') ? posix_getpid() : getmypid(),
+                'w'
+            );
+
+        $this->pidConsumerManager->savePid($pidFilePath);
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
new file mode 100644
index 00000000000..08c8f926522
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Test\Unit\Model\Cron;
+
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Framework\ShellInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+use Symfony\Component\Process\PhpExecutableFinder;
+
+class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PidConsumerManager|MockObject
+     */
+    private $pidConsumerManagerMock;
+
+    /**
+     * @var ShellInterface|MockObject
+     */
+    private $shellBackgroundMock;
+
+    /**
+     * @var ConsumerConfigInterface|MockObject
+     */
+    private $consumerConfigMock;
+
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var PhpExecutableFinder|MockObject
+     */
+    private $phpExecutableFinderMock;
+
+    /**
+     * @var ConsumersRunner
+     */
+    private $consumersRunner;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->phpExecutableFinderMock = $this->getMockBuilder(phpExecutableFinder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->pidConsumerManagerMock = $this->getMockBuilder(PidConsumerManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->shellBackgroundMock = $this->getMockBuilder(ShellInterface::class)
+            ->getMockForAbstractClass();
+        $this->consumerConfigMock = $this->getMockBuilder(ConsumerConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->consumersRunner = new ConsumersRunner(
+            $this->phpExecutableFinderMock,
+            $this->consumerConfigMock,
+            $this->deploymentConfigMock,
+            $this->shellBackgroundMock,
+            $this->pidConsumerManagerMock
+        );
+    }
+
+    public function testRunDisabled()
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->willReturnMap([
+                ['cron_consumers_runner/cron_run', true, false],
+                ['cron_consumers_runner/max_messages', 10000, 10000],
+                ['cron_consumers_runner/consumers', [], []],
+            ]);
+
+        $this->consumerConfigMock->expects($this->never())
+            ->method('getConsumers');
+        $this->pidConsumerManagerMock->expects($this->never())
+            ->method('isRun');
+        $this->shellBackgroundMock->expects($this->never())
+            ->method('execute');
+
+        $this->consumersRunner->run();
+    }
+
+    /**
+     * @param int $maxMessages
+     * @param bool $isRun
+     * @param string $php
+     * @param string $command
+     * @param array $arguments
+     * @param array $allowedConsumers
+     * @param int $shellBackgroundExpects
+     * @param int $isRunExpects
+     * @dataProvider runDataProvider
+     */
+    public function testRun(
+        $maxMessages,
+        $isRun,
+        $php,
+        $command,
+        $arguments,
+        array $allowedConsumers,
+        $shellBackgroundExpects,
+        $isRunExpects
+    ) {
+        $consumerName = 'consumerName';
+        $pidFilePath = 'consumerName.pid';
+
+        $this->deploymentConfigMock->expects($this->exactly(3))
+            ->method('get')
+            ->willReturnMap([
+                ['cron_consumers_runner/cron_run', true, true],
+                ['cron_consumers_runner/max_messages', 10000, $maxMessages],
+                ['cron_consumers_runner/consumers', [], $allowedConsumers],
+            ]);
+
+        /** @var ConsumerConfigInterface|MockObject $firstCunsumer */
+        $consumer = $this->getMockBuilder(ConsumerConfigItemInterface::class)
+            ->getMockForAbstractClass();
+        $consumer->expects($this->any())
+            ->method('getName')
+            ->willReturn($consumerName);
+
+        $this->phpExecutableFinderMock->expects($this->once())
+            ->method('find')
+            ->willReturn($php);
+
+        $this->consumerConfigMock->expects($this->once())
+            ->method('getConsumers')
+            ->willReturn([$consumer]);
+
+        $this->pidConsumerManagerMock->expects($this->exactly($isRunExpects))
+            ->method('isRun')
+            ->with($pidFilePath)
+            ->willReturn($isRun);
+
+        $this->shellBackgroundMock->expects($this->exactly($shellBackgroundExpects))
+            ->method('execute')
+            ->with($command, $arguments);
+
+        $this->consumersRunner->run();
+    }
+
+    /**
+     * @return array
+     */
+    public function runDataProvider()
+    {
+        return [
+            [
+                'maxMessages' => 20000,
+                'isRun' => false,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName.pid', '--max-messages=20000'],
+                'allowedConsumers' => [],
+                'shellBackgroundExpects' => 1,
+                'isRunExpects' => 1,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => false,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName.pid', '--max-messages=10000'],
+                'allowedConsumers' => [],
+                'shellBackgroundExpects' => 1,
+                'isRunExpects' => 1,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => false,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName.pid', '--max-messages=10000'],
+                'allowedConsumers' => ['someConsumer'],
+                'shellBackgroundExpects' => 0,
+                'isRunExpects' => 0,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => true,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName.pid', '--max-messages=10000'],
+                'allowedConsumers' => ['someConsumer'],
+                'shellBackgroundExpects' => 0,
+                'isRunExpects' => 0,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => true,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName.pid', '--max-messages=10000'],
+                'allowedConsumers' => [],
+                'shellBackgroundExpects' => 0,
+                'isRunExpects' => 1,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => true,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName.pid', '--max-messages=10000'],
+                'allowedConsumers' => ['consumerName'],
+                'shellBackgroundExpects' => 0,
+                'isRunExpects' => 1,
+            ],
+            [
+                'maxMessages' => 10000,
+                'isRun' => false,
+                'php' => '',
+                'command' => 'php '. BP . '/bin/magento queue:consumers:start %s %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName.pid', '--max-messages=10000'],
+                'allowedConsumers' => ['consumerName'],
+                'shellBackgroundExpects' => 1,
+                'isRunExpects' => 1,
+            ],
+            [
+                'maxMessages' => 0,
+                'isRun' => false,
+                'php' => '/bin/php',
+                'command' => '/bin/php '. BP . '/bin/magento queue:consumers:start %s %s',
+                'arguments' => ['consumerName', '--pid-file-path=consumerName.pid'],
+                'allowedConsumers' => ['consumerName'],
+                'shellBackgroundExpects' => 1,
+                'isRunExpects' => 1,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/ResourceModel/LockTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/ResourceModel/LockTest.php
new file mode 100644
index 00000000000..547b54b895b
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/ResourceModel/LockTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MessageQueue\Model\LockFactory;
+use Magento\MessageQueue\Model\ResourceModel\Lock as LockResourceModel;
+
+/**
+ * Unit tests for lock resource model
+ */
+class LockTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var ObjectManager */
+    private $objectManager;
+
+    /**
+     * @var LockResourceModel
+     */
+    private $lockResourceModel;
+
+    /**
+     * @var DateTime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeMock;
+
+    /**
+     * @var LockFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $lockFactoryMock;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->dateTimeMock = $this->getMockBuilder(DateTime::class)->disableOriginalConstructor()->getMock();
+        $this->lockFactoryMock = $this->getMockBuilder(LockFactory::class)->disableOriginalConstructor()->getMock();
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->lockResourceModel = $this->objectManager->getObject(
+            LockResourceModel::class,
+            [
+                'resources' => $this->resourceConnectionMock,
+                'dateTime' => $this->dateTimeMock,
+                'lockFactory' => $this->lockFactoryMock,
+            ]
+        );
+        parent::setUp();
+    }
+
+    public function testReleaseOutdatedLocks()
+    {
+        /** @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $adapterMock */
+        $adapterMock = $this->getMockBuilder(AdapterInterface::class)->disableOriginalConstructor()->getMock();
+        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($adapterMock);
+        $tableName = 'queue_lock_mock';
+        $this->resourceConnectionMock->expects($this->once())->method('getTableName')->willReturn($tableName);
+        $this->dateTimeMock->expects($this->once())->method('gmtTimestamp')->willReturn(1000000000);
+        /** Date for timestamp 1000000000 + 86400 */
+        $date = new \DateTime('2001-09-09T18:46:40-0700');
+
+        $adapterMock->expects($this->once())->method('delete')->with($tableName, ['created_at <= ?' => $date]);
+        $this->lockResourceModel->releaseOutdatedLocks();
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Test/Unit/_files/pid_consumer_functions_mocks.php b/app/code/Magento/MessageQueue/Test/Unit/_files/pid_consumer_functions_mocks.php
new file mode 100644
index 00000000000..042c6012f80
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Unit/_files/pid_consumer_functions_mocks.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model\Cron\ConsumersRunner;
+
+function posix_getpgid($pid)
+{
+    if ($pid === 11111) {
+        return 22222;
+    }
+
+    return false;
+}
+
+function exec($command, array &$output = null, &$return_var = null)
+{
+    $output = ['PID TTY TIME CMD'];
+    $return_var = 1;
+
+    if ($command === 'ps -p 11111') {
+        $output[] = ['11111 ?? 25:49.42 /php'];
+        $return_var = 0;
+    }
+}
diff --git a/app/code/Magento/MessageQueue/composer.json b/app/code/Magento/MessageQueue/composer.json
new file mode 100644
index 00000000000..d96c82a9636
--- /dev/null
+++ b/app/code/Magento/MessageQueue/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/module-message-queue",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "100.3.*",
+        "magento/magento-composer-installer": "*",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "type": "magento2-module",
+    "version": "100.3.0-dev",
+    "license": [
+        "proprietary"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MessageQueue\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MessageQueue/etc/cron_groups.xml b/app/code/Magento/MessageQueue/etc/cron_groups.xml
new file mode 100644
index 00000000000..c3f23468728
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/cron_groups.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/cron_groups.xsd">
+    <group id="consumers">
+        <schedule_generate_every>15</schedule_generate_every>
+        <schedule_ahead_for>20</schedule_ahead_for>
+        <schedule_lifetime>15</schedule_lifetime>
+        <history_cleanup_every>10</history_cleanup_every>
+        <history_success_lifetime>60</history_success_lifetime>
+        <history_failure_lifetime>600</history_failure_lifetime>
+        <use_separate_process>1</use_separate_process>
+    </group>
+</config>
diff --git a/app/code/Magento/MessageQueue/etc/crontab.xml b/app/code/Magento/MessageQueue/etc/crontab.xml
new file mode 100644
index 00000000000..14c831a9c76
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/crontab.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright © Magento, Inc. All rights reserved.
+  ~ See COPYING.txt for license details.
+  -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
+    <group id="default">
+        <job name="messagequeue_clean_outdated_locks" instance="Magento\Framework\MessageQueue\Lock\WriterInterface" method="releaseOutdatedLocks">
+            <schedule>0 * * * *</schedule>
+        </job>
+    </group>
+    <group id="consumers">
+        <job name="consumers_runner" instance="Magento\MessageQueue\Model\Cron\ConsumersRunner" method="run">
+            <schedule>* * * * *</schedule>
+        </job>
+    </group>
+</config>
diff --git a/app/code/Magento/MessageQueue/etc/db_schema.xml b/app/code/Magento/MessageQueue/etc/db_schema.xml
new file mode 100644
index 00000000000..9cbad4d32a8
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/db_schema.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="queue_lock" resource="default" engine="innodb"
+           comment="Messages that were processed are inserted here to be locked.">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Message ID"/>
+        <column xsi:type="varchar" name="message_code" nullable="false" length="255" default="" comment="Message Code"/>
+        <column xsi:type="timestamp" name="created_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Created At"/>
+        <constraint xsi:type="primary" name="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="unique" name="QUEUE_LOCK_MESSAGE_CODE">
+            <column name="message_code"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
new file mode 100644
index 00000000000..14c30198e87
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
@@ -0,0 +1,13 @@
+{
+  "queue_lock": {
+    "column": {
+      "id": true,
+      "message_code": true,
+      "created_at": true
+    },
+    "constraint": {
+      "PRIMARY": true,
+      "QUEUE_LOCK_MESSAGE_CODE": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/code/Magento/MessageQueue/etc/di.xml b/app/code/Magento/MessageQueue/etc/di.xml
new file mode 100644
index 00000000000..de9d2b02693
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/di.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Framework\MessageQueue\ConfigInterface" type="Magento\Framework\MessageQueue\Config" />
+    <preference for="Magento\Framework\MessageQueue\LockInterface" type="Magento\Framework\MessageQueue\Lock" />
+    <preference for="Magento\Framework\MessageQueue\Lock\WriterInterface" type="Magento\MessageQueue\Model\ResourceModel\Lock" />
+    <preference for="Magento\Framework\MessageQueue\Lock\ReaderInterface" type="Magento\MessageQueue\Model\ResourceModel\Lock" />
+    <preference for="Magento\Framework\MessageQueue\EnvelopeInterface" type="Magento\Framework\MessageQueue\Envelope"/>
+    <preference for="Magento\Framework\MessageQueue\ConsumerInterface" type="Magento\Framework\MessageQueue\Consumer"/>
+    <preference for="Magento\Framework\MessageQueue\MergedMessageInterface" type="Magento\Framework\MessageQueue\MergedMessage"/>
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="startConsumerCommand" xsi:type="object">Magento\MessageQueue\Console\StartConsumerCommand</item>
+                <item name="consumerListCommand" xsi:type="object">Magento\MessageQueue\Console\ConsumerListCommand</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\MessageProcessorLoader">
+        <arguments>
+            <argument name="mergedMessageProcessor" xsi:type="object">Magento\Framework\MessageQueue\MergedMessageProcessor</argument>
+            <argument name="defaultMessageProcessor" xsi:type="object">Magento\Framework\MessageQueue\MessageProcessor</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\MaintenanceMode">
+        <plugin name="amqp_maintenance_mode" type="Magento\MessageQueue\Model\Plugin\ResourceModel\Lock"/>
+    </type>
+    <virtualType name="RefreshLock" type="Magento\MessageQueue\Model\ResourceModel\Lock">
+        <arguments>
+            <argument name="interval" xsi:type="number">0</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\MessageQueue\Model\Plugin\ResourceModel\Lock">
+        <arguments>
+            <argument name="lock" xsi:type="object">RefreshLock</argument>
+        </arguments>
+    </type>
+    <type name="Magento\MessageQueue\Model\Cron\ConsumersRunner">
+        <arguments>
+            <argument name="shellBackground" xsi:type="object">shellBackground</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/MessageQueue/etc/module.xml b/app/code/Magento/MessageQueue/etc/module.xml
new file mode 100644
index 00000000000..0bb5f9d40da
--- /dev/null
+++ b/app/code/Magento/MessageQueue/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_MessageQueue" />
+</config>
diff --git a/app/code/Magento/MessageQueue/registration.php b/app/code/Magento/MessageQueue/registration.php
new file mode 100644
index 00000000000..e27fa715174
--- /dev/null
+++ b/app/code/Magento/MessageQueue/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MessageQueue', __DIR__);
diff --git a/app/code/Magento/Msrp/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php b/app/code/Magento/Msrp/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php
index b924b605236..085c617a9dc 100644
--- a/app/code/Magento/Msrp/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php
+++ b/app/code/Magento/Msrp/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php
@@ -11,8 +11,8 @@
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class ChangePriceAttributeDefaultScope implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/Msrp/Setup/Patch/Data/InitializeMsrpAttributes.php b/app/code/Magento/Msrp/Setup/Patch/Data/InitializeMsrpAttributes.php
index f47d106da94..5dc461860cd 100644
--- a/app/code/Magento/Msrp/Setup/Patch/Data/InitializeMsrpAttributes.php
+++ b/app/code/Magento/Msrp/Setup/Patch/Data/InitializeMsrpAttributes.php
@@ -12,8 +12,8 @@
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class InitializeMsrpAttributes implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/MysqlMq/Model/ConnectionTypeResolver.php b/app/code/Magento/MysqlMq/Model/ConnectionTypeResolver.php
new file mode 100644
index 00000000000..d58c708770a
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ConnectionTypeResolver.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+use Magento\Framework\MessageQueue\ConnectionTypeResolverInterface;
+
+/**
+ * DB connection type resolver.
+ */
+class ConnectionTypeResolver implements ConnectionTypeResolverInterface
+{
+    /**
+     * DB connection names.
+     *
+     * @var string[]
+     */
+    private $dbConnectionNames;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param string[] $dbConnectionNames
+     */
+    public function __construct(array $dbConnectionNames = [])
+    {
+        $this->dbConnectionNames = $dbConnectionNames;
+        $this->dbConnectionNames[] = 'db';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnectionType($connectionName)
+    {
+        return in_array($connectionName, $this->dbConnectionNames) ? 'db' : null;
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Driver/Bulk/Exchange.php b/app/code/Magento/MysqlMq/Model/Driver/Bulk/Exchange.php
new file mode 100644
index 00000000000..247a44667be
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Driver/Bulk/Exchange.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver\Bulk;
+
+use Magento\Framework\MessageQueue\Bulk\ExchangeInterface;
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+use Magento\MysqlMq\Model\QueueManagement;
+
+/**
+ * Used to send messages in bulk in MySQL queue.
+ */
+class Exchange implements ExchangeInterface
+{
+    /**
+     * @var MessageQueueConfig
+     */
+    private $messageQueueConfig;
+
+    /**
+     * @var QueueManagement
+     */
+    private $queueManagement;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param MessageQueueConfig $messageQueueConfig
+     * @param QueueManagement $queueManagement
+     */
+    public function __construct(MessageQueueConfig $messageQueueConfig, QueueManagement $queueManagement)
+    {
+        $this->messageQueueConfig = $messageQueueConfig;
+        $this->queueManagement = $queueManagement;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enqueue($topic, array $envelopes)
+    {
+        $queueNames = $this->messageQueueConfig->getQueuesByTopic($topic);
+        $messages = array_map(
+            function ($envelope) {
+                return $envelope->getBody();
+            },
+            $envelopes
+        );
+        $this->queueManagement->addMessagesToQueues($topic, $messages, $queueNames);
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Driver/Exchange.php b/app/code/Magento/MysqlMq/Model/Driver/Exchange.php
new file mode 100644
index 00000000000..b6050c6b3d0
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Driver/Exchange.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver;
+
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+use Magento\Framework\MessageQueue\ExchangeInterface;
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+use Magento\MysqlMq\Model\QueueManagement;
+
+class Exchange implements ExchangeInterface
+{
+    /**
+     * @var MessageQueueConfig
+     */
+    private $messageQueueConfig;
+
+    /**
+     * @var QueueManagement
+     */
+    private $queueManagement;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param MessageQueueConfig $messageQueueConfig
+     * @param QueueManagement $queueManagement
+     */
+    public function __construct(MessageQueueConfig $messageQueueConfig, QueueManagement $queueManagement)
+    {
+        $this->messageQueueConfig = $messageQueueConfig;
+        $this->queueManagement = $queueManagement;
+    }
+
+    /**
+     * Send message
+     *
+     * @param string $topic
+     * @param EnvelopeInterface $envelope
+     * @return mixed
+     */
+    public function enqueue($topic, EnvelopeInterface $envelope)
+    {
+        $queueNames = $this->messageQueueConfig->getQueuesByTopic($topic);
+        $this->queueManagement->addMessageToQueues($topic, $envelope->getBody(), $queueNames);
+        return null;
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Driver/ExchangeFactory.php b/app/code/Magento/MysqlMq/Model/Driver/ExchangeFactory.php
new file mode 100644
index 00000000000..8b9d08a2ed4
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Driver/ExchangeFactory.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver;
+
+/**
+ * Factory class for @see \Magento\MysqlMq\Model\Driver\Exchange
+ */
+class ExchangeFactory implements \Magento\Framework\MessageQueue\ExchangeFactoryInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = \Magento\MysqlMq\Model\Driver\Exchange::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function create($connectionName, array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Driver/Queue.php b/app/code/Magento/MysqlMq/Model/Driver/Queue.php
new file mode 100644
index 00000000000..b8dab6fac7b
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Driver/Queue.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver;
+
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+use Magento\Framework\MessageQueue\QueueInterface;
+use Magento\MysqlMq\Model\QueueManagement;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Queue based on MessageQueue protocol
+ */
+class Queue implements QueueInterface
+{
+    /**
+     * @var QueueManagement
+     */
+    private $queueManagement;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var string
+     */
+    private $queueName;
+
+    /**
+     * @var int
+     */
+    private $interval;
+
+    /**
+     * @var int
+     */
+    private $maxNumberOfTrials;
+
+    /**
+     * @var LoggerInterface $logger
+     */
+    private $logger;
+
+    /**
+     * Queue constructor.
+     *
+     * @param QueueManagement $queueManagement
+     * @param EnvelopeFactory $envelopeFactory
+     * @param LoggerInterface $logger
+     * @param string $queueName
+     * @param int $interval
+     * @param int $maxNumberOfTrials
+     */
+    public function __construct(
+        QueueManagement $queueManagement,
+        EnvelopeFactory $envelopeFactory,
+        LoggerInterface $logger,
+        $queueName,
+        $interval = 5,
+        $maxNumberOfTrials = 3
+    ) {
+        $this->queueManagement = $queueManagement;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->queueName = $queueName;
+        $this->interval = $interval;
+        $this->maxNumberOfTrials = $maxNumberOfTrials;
+        $this->logger = $logger;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dequeue()
+    {
+        $envelope = null;
+        $messages = $this->queueManagement->readMessages($this->queueName, 1);
+        if (isset($messages[0])) {
+            $properties = $messages[0];
+
+            $body = $properties[QueueManagement::MESSAGE_BODY];
+            unset($properties[QueueManagement::MESSAGE_BODY]);
+
+            $envelope = $this->envelopeFactory->create(['body' => $body, 'properties' => $properties]);
+        }
+
+        return $envelope;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function acknowledge(EnvelopeInterface $envelope)
+    {
+        $properties = $envelope->getProperties();
+        $relationId = $properties[QueueManagement::MESSAGE_QUEUE_RELATION_ID];
+
+        $this->queueManagement->changeStatus($relationId, QueueManagement::MESSAGE_STATUS_COMPLETE);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function subscribe($callback)
+    {
+        while (true) {
+            while ($envelope = $this->dequeue()) {
+                try {
+                    call_user_func($callback, $envelope);
+                    $this->acknowledge($envelope);
+                } catch (\Exception $e) {
+                    $this->reject($envelope);
+                }
+            }
+            sleep($this->interval);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null)
+    {
+        $properties = $envelope->getProperties();
+        $relationId = $properties[QueueManagement::MESSAGE_QUEUE_RELATION_ID];
+
+        if ($properties[QueueManagement::MESSAGE_NUMBER_OF_TRIALS] < $this->maxNumberOfTrials && $requeue) {
+            $this->queueManagement->pushToQueueForRetry($relationId);
+        } else {
+            $this->queueManagement->changeStatus([$relationId], QueueManagement::MESSAGE_STATUS_ERROR);
+            if ($rejectionMessage !== null) {
+                $this->logger->critical(__('Message has been rejected: %1', $rejectionMessage));
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function push(EnvelopeInterface $envelope)
+    {
+        $properties = $envelope->getProperties();
+        $this->queueManagement->addMessageToQueues(
+            $properties[QueueManagement::MESSAGE_TOPIC],
+            $envelope->getBody(),
+            [$this->queueName]
+        );
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Driver/QueueFactory.php b/app/code/Magento/MysqlMq/Model/Driver/QueueFactory.php
new file mode 100644
index 00000000000..72188a6873f
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Driver/QueueFactory.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver;
+
+/**
+ * Factory class for @see \Magento\MysqlMq\Model\Driver\Queue
+ */
+class QueueFactory implements \Magento\Framework\MessageQueue\QueueFactoryInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = \Magento\MysqlMq\Model\Driver\Queue::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create($queueName, $connectionName)
+    {
+        return $this->objectManager->create(
+            $this->instanceName,
+            [
+                'queueName' => $queueName,
+                'connectionName' => $connectionName
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Message.php b/app/code/Magento/MysqlMq/Model/Message.php
new file mode 100644
index 00000000000..27668f99a90
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Message.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Message model
+ *
+ * @api
+ * @since 100.0.2
+ */
+class Message extends \Magento\Framework\Model\AbstractModel
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\MysqlMq\Model\ResourceModel\Message::class);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/MessageStatus.php b/app/code/Magento/MysqlMq/Model/MessageStatus.php
new file mode 100644
index 00000000000..17ce2ab974d
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/MessageStatus.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Message model for message status
+ *
+ * @api
+ * @since 100.0.2
+ */
+class MessageStatus extends \Magento\Framework\Model\AbstractModel
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\MysqlMq\Model\ResourceModel\MessageStatus::class);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Observer.php b/app/code/Magento/MysqlMq/Model/Observer.php
new file mode 100644
index 00000000000..523b2b95b87
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Observer.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Observer class to monitor outdated messages.
+ */
+class Observer
+{
+    /**
+     * @var \Magento\MysqlMq\Model\QueueManagement
+     */
+    protected $queueManagement;
+
+    /**
+     * Create Observer
+     * @param QueueManagement $queueManagement
+     */
+    public function __construct(
+        \Magento\MysqlMq\Model\QueueManagement $queueManagement
+    ) {
+        $this->queueManagement = $queueManagement;
+    }
+
+    /**
+     * Clean up old messages from database
+     * @return void
+     */
+    public function cleanupMessages()
+    {
+        $this->queueManagement->markMessagesForDelete();
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/Queue.php b/app/code/Magento/MysqlMq/Model/Queue.php
new file mode 100644
index 00000000000..0ab2c33e573
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/Queue.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Message model for queue based on MySQL.
+ *
+ * @api
+ * @since 100.0.2
+ */
+class Queue extends \Magento\Framework\Model\AbstractModel
+{
+    const KEY_NAME = 'name';
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\MysqlMq\Model\ResourceModel\Queue::class);
+    }
+
+    /**
+     * Set queue name.
+     *
+     * @param string $name
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->setData(self::KEY_NAME, $name);
+        return $this;
+    }
+
+    /**
+     * Get queue name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->getData(self::KEY_NAME);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/QueueManagement.php b/app/code/Magento/MysqlMq/Model/QueueManagement.php
new file mode 100644
index 00000000000..0840add2a5c
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/QueueManagement.php
@@ -0,0 +1,318 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Main class for managing MySQL implementation of message queue.
+ *
+ * @api
+ * @since 100.0.2
+ */
+class QueueManagement
+{
+    const MESSAGE_TOPIC = 'topic_name';
+    const MESSAGE_BODY = 'body';
+    const MESSAGE_ID = 'message_id';
+    const MESSAGE_STATUS = 'status';
+    const MESSAGE_UPDATED_AT = 'updated_at';
+    const MESSAGE_QUEUE_ID = 'queue_id';
+    const MESSAGE_QUEUE_NAME = 'queue_name';
+    const MESSAGE_QUEUE_RELATION_ID = 'relation_id';
+    const MESSAGE_NUMBER_OF_TRIALS = 'retries';
+
+    const MESSAGE_STATUS_NEW = 2;
+    const MESSAGE_STATUS_IN_PROGRESS = 3;
+    const MESSAGE_STATUS_COMPLETE= 4;
+    const MESSAGE_STATUS_RETRY_REQUIRED = 5;
+    const MESSAGE_STATUS_ERROR = 6;
+    const MESSAGE_STATUS_TO_BE_DELETED = 7;
+
+    /**#@+
+     * Cleanup configuration XML nodes
+     */
+    const XML_PATH_SUCCESSFUL_MESSAGES_LIFETIME = 'system/mysqlmq/successful_messages_lifetime';
+    const XML_PATH_FAILED_MESSAGES_LIFETIME = 'system/mysqlmq/failed_messages_lifetime';
+    const XML_PATH_RETRY_IN_PROGRESS_AFTER = 'system/mysqlmq/retry_inprogress_after';
+    const XML_PATH_NEW_MESSAGES_LIFETIME = 'system/mysqlmq/new_messages_lifetime';
+    /**#@-*/
+
+    /**#@-*/
+    private $messageResource;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @var \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory
+     */
+    private $messageStatusCollectionFactory;
+
+    /**
+     * @param \Magento\MysqlMq\Model\ResourceModel\Queue $messageResource
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory $messageStatusCollectionFactory
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     */
+    public function __construct(
+        \Magento\MysqlMq\Model\ResourceModel\Queue $messageResource,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory $messageStatusCollectionFactory,
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+    ) {
+        $this->messageResource = $messageResource;
+        $this->scopeConfig = $scopeConfig;
+        $this->dateTime = $dateTime;
+        $this->messageStatusCollectionFactory = $messageStatusCollectionFactory;
+    }
+
+    /**
+     * Add message to all specified queues.
+     *
+     * @param string $topic
+     * @param string $message
+     * @param string[] $queueNames
+     * @return $this
+     */
+    public function addMessageToQueues($topic, $message, $queueNames)
+    {
+        $messageId = $this->messageResource->saveMessage($topic, $message);
+        $this->messageResource->linkQueues($messageId, $queueNames);
+        return $this;
+    }
+
+    /**
+     * Add messages to all specified queues.
+     *
+     * @param string $topic
+     * @param array $messages
+     * @param string[] $queueNames
+     * @return $this
+     * @since 100.2.0
+     */
+    public function addMessagesToQueues($topic, $messages, $queueNames)
+    {
+        $messageIds = $this->messageResource->saveMessages($topic, $messages);
+        $this->messageResource->linkMessagesWithQueues($messageIds, $queueNames);
+        return $this;
+    }
+
+    /**
+     * Mark messages to be deleted if sufficient amount of time passed since last update
+     * Delete marked messages
+     *
+     * @return void
+     */
+    public function markMessagesForDelete()
+    {
+        $collection = $this->messageStatusCollectionFactory->create()
+            ->addFieldToFilter(
+                'status',
+                ['in' => $this->getStatusesToClear()]
+            );
+
+        /**
+         * Update messages if lifetime is expired
+         */
+        foreach ($collection as $messageStatus) {
+            $this->processMessagePerStatus($messageStatus);
+        }
+
+        /**
+         * Delete all messages which has To BE DELETED status in all the queues
+         */
+        $this->messageResource->deleteMarkedMessages();
+    }
+
+    /**
+     * Based on message status, updated date and timeout for the status, move it to next state
+     *
+     * @param MessageStatus $messageStatus
+     * @return void
+     */
+    private function processMessagePerStatus($messageStatus)
+    {
+        $now = $this->dateTime->gmtTimestamp();
+
+        if ($messageStatus->getStatus() == self::MESSAGE_STATUS_COMPLETE
+            && strtotime($messageStatus->getUpdatedAt()) < ($now - $this->getCompletedMessageLifetime())) {
+            $messageStatus->setStatus(self::MESSAGE_STATUS_TO_BE_DELETED)
+                ->save();
+        } elseif ($messageStatus->getStatus() == self::MESSAGE_STATUS_ERROR
+            && strtotime($messageStatus->getUpdatedAt()) < ($now - $this->getErrorMessageLifetime())) {
+            $messageStatus->setStatus(self::MESSAGE_STATUS_TO_BE_DELETED)
+                ->save();
+        } elseif ($messageStatus->getStatus() == self::MESSAGE_STATUS_IN_PROGRESS
+            && strtotime($messageStatus->getUpdatedAt()) < ($now - $this->getInProgressRetryAfter())
+        ) {
+            $this->pushToQueueForRetry($messageStatus->getId());
+        } elseif ($messageStatus->getStatus() == self::MESSAGE_STATUS_NEW
+            && strtotime($messageStatus->getUpdatedAt()) < ($now - $this->getNewMessageLifetime())
+        ) {
+            $messageStatus->setStatus(self::MESSAGE_STATUS_TO_BE_DELETED)
+                ->save();
+        }
+    }
+
+    /**
+     * Compose a set of statuses to track for deletion based on configuration.
+     *
+     * @return array
+     */
+    private function getStatusesToClear()
+    {
+        /**
+         * Do not mark messages for deletion if configuration has 0 lifetime configured.
+         */
+        $statusesToDelete = [];
+        if ($this->getCompletedMessageLifetime() > 0) {
+            $statusesToDelete[] = self::MESSAGE_STATUS_COMPLETE;
+        }
+
+        if ($this->getErrorMessageLifetime() > 0) {
+            $statusesToDelete[] = self::MESSAGE_STATUS_ERROR;
+        }
+
+        if ($this->getNewMessageLifetime() > 0) {
+            $statusesToDelete[] = self::MESSAGE_STATUS_NEW;
+        }
+
+        if ($this->getInProgressRetryAfter() > 0) {
+            $statusesToDelete[] = self::MESSAGE_STATUS_IN_PROGRESS;
+        }
+        return $statusesToDelete;
+    }
+
+    /**
+     * Completed message lifetime
+     *
+     * Indicates how long message in COMPLETE state will stay in table with statuses
+     *
+     * @return int
+     */
+    private function getCompletedMessageLifetime()
+    {
+        return 60 * (int)$this->scopeConfig->getValue(
+            self::XML_PATH_SUCCESSFUL_MESSAGES_LIFETIME,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Failure message life time
+     *
+     * Indicates how long message in ERROR state will stay in table with statuses
+     *
+     * @return int
+     */
+    private function getErrorMessageLifetime()
+    {
+        return  60 * (int)$this->scopeConfig->getValue(
+            self::XML_PATH_FAILED_MESSAGES_LIFETIME,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * In progress message delay befor retry
+     *
+     * Indicates how long message will stay in IN PROGRESS status before attempted to retry
+     *
+     * @return int
+     */
+    private function getInProgressRetryAfter()
+    {
+        return 60 * (int)$this->scopeConfig->getValue(
+            self::XML_PATH_RETRY_IN_PROGRESS_AFTER,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * New message life time
+     *
+     * Indicates how long message in NEW state will stay in table with statuses
+     *
+     * @return int
+     */
+    private function getNewMessageLifetime()
+    {
+        return  60 * (int)$this->scopeConfig->getValue(
+            self::XML_PATH_NEW_MESSAGES_LIFETIME,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Read the specified number of messages from the specified queue.
+     *
+     * If queue does not contain enough messages, method is not waiting for more messages.
+     *
+     * @param string $queue
+     * @param int|null $maxMessagesNumber
+     * @return array <pre>
+     * [
+     *     [
+     *          self::MESSAGE_ID => $messageId,
+     *          self::MESSAGE_QUEUE_ID => $queuId,
+     *          self::MESSAGE_TOPIC => $topic,
+     *          self::MESSAGE_BODY => $body,
+     *          self::MESSAGE_STATUS => $status,
+     *          self::MESSAGE_UPDATED_AT => $updatedAt,
+     *          self::MESSAGE_QUEUE_NAME => $queueName
+     *          self::MESSAGE_QUEUE_RELATION_ID => $relationId
+     *     ],
+     *     ...
+     * ]</pre>
+     */
+    public function readMessages($queue, $maxMessagesNumber = null)
+    {
+        $selectedMessages = $this->messageResource->getMessages($queue, $maxMessagesNumber);
+        /* The logic below allows to prevent the same message being processed by several consumers in parallel */
+        $selectedMessagesRelatedIds = [];
+        foreach ($selectedMessages as &$message) {
+            /* Set message status here to avoid extra reading from DB after it is updated */
+            $message[self::MESSAGE_STATUS] = self::MESSAGE_STATUS_IN_PROGRESS;
+            $selectedMessagesRelatedIds[] = $message[self::MESSAGE_QUEUE_RELATION_ID];
+        }
+        $takenMessagesRelationIds = $this->messageResource->takeMessagesInProgress($selectedMessagesRelatedIds);
+        if (count($selectedMessages) == count($takenMessagesRelationIds)) {
+            return $selectedMessages;
+        } else {
+            $selectedMessages = array_combine($selectedMessagesRelatedIds, array_values($selectedMessages));
+            return array_intersect_key($selectedMessages, array_flip($takenMessagesRelationIds));
+        }
+    }
+
+    /**
+     * Push message back to queue for one more processing trial. Affects message in particular queue only.
+     *
+     * @param int $messageRelationId
+     * @return void
+     */
+    public function pushToQueueForRetry($messageRelationId)
+    {
+        $this->messageResource->pushBackForRetry($messageRelationId);
+    }
+
+    /**
+     * Change status of messages.
+     *
+     * @param int[] $messageRelationIds
+     * @param int $status
+     * @return void
+     */
+    public function changeStatus($messageRelationIds, $status)
+    {
+        $this->messageResource->changeStatus($messageRelationIds, $status);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/Message.php b/app/code/Magento/MysqlMq/Model/ResourceModel/Message.php
new file mode 100644
index 00000000000..516a6d36194
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/Message.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\ResourceModel;
+
+/**
+ * Resource model for queue messages.
+ */
+class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Model initialization
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('queue_message', 'id');
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/MessageCollection.php b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageCollection.php
new file mode 100644
index 00000000000..cf77102319a
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageCollection.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\ResourceModel;
+
+/**
+ * Message collection.
+ */
+class MessageCollection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+{
+    /**
+     * Resource collection initialization.
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(\Magento\MysqlMq\Model\Message::class, \Magento\MysqlMq\Model\ResourceModel\Message::class);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatus.php b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatus.php
new file mode 100644
index 00000000000..c736277c279
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatus.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\ResourceModel;
+
+/**
+ * Resource model for message status.
+ */
+class MessageStatus extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Model initialization
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('queue_message_status', 'id');
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatusCollection.php b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatusCollection.php
new file mode 100644
index 00000000000..bdbfc68ec48
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/MessageStatusCollection.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\ResourceModel;
+
+/**
+ * Message Status collection.
+ *
+ * @api
+ * @since 100.0.2
+ */
+class MessageStatusCollection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+{
+    /**
+     * Resource collection initialization.
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Magento\MysqlMq\Model\MessageStatus::class,
+            \Magento\MysqlMq\Model\ResourceModel\MessageStatus::class
+        );
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php b/app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php
new file mode 100644
index 00000000000..c1cdd23be62
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\ResourceModel;
+
+use Magento\MysqlMq\Model\QueueManagement;
+
+/**
+ * Resource model for queue.
+ */
+class Queue extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Model initialization
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('queue', 'id');
+    }
+
+    /**
+     * Save message to 'queue_message' table.
+     *
+     * @param string $messageTopic
+     * @param string $messageBody
+     * @return int ID of the inserted record
+     */
+    public function saveMessage($messageTopic, $messageBody)
+    {
+        $this->getConnection()->insert(
+            $this->getMessageTable(),
+            ['topic_name' => $messageTopic, 'body' => $messageBody]
+        );
+        return $this->getConnection()->lastInsertId($this->getMessageTable());
+    }
+
+    /**
+     * Save messages in bulk to 'queue_message' table.
+     *
+     * @param string $messageTopic
+     * @param array $messages
+     * @return array List of IDs of inserted records
+     */
+    public function saveMessages($messageTopic, array $messages)
+    {
+        $data = [];
+        foreach ($messages as $message) {
+            $data[] = ['topic_name' => $messageTopic, 'body' => $message];
+        }
+        $rowCount = $this->getConnection()->insertMultiple($this->getMessageTable(), $data);
+        $firstId = $this->getConnection()->lastInsertId($this->getMessageTable());
+        $select = $this->getConnection()->select()
+            ->from(['qm' => $this->getMessageTable()], ['id'])
+            ->where('qm.id >= ?', $firstId)
+            ->limit($rowCount);
+        return $this->getConnection()->fetchCol($select);
+    }
+
+    /**
+     * Add associations between the specified message and queues.
+     *
+     * @param int $messageId
+     * @param string[] $queueNames
+     * @return $this
+     */
+    public function linkQueues($messageId, $queueNames)
+    {
+        return $this->linkMessagesWithQueues([$messageId], $queueNames);
+    }
+
+    /**
+     * Add associations between the specified messages and queues.
+     *
+     * @param array $messageIds
+     * @param string[] $queueNames
+     * @return $this
+     */
+    public function linkMessagesWithQueues(array $messageIds, array $queueNames)
+    {
+        $connection = $this->getConnection();
+        $queueIds = $this->getQueueIdsByNames($queueNames);
+        $data = [];
+        foreach ($messageIds as $messageId) {
+            foreach ($queueIds as $queueId) {
+                $data[] = [
+                    $queueId,
+                    $messageId,
+                    QueueManagement::MESSAGE_STATUS_NEW
+                ];
+            }
+        }
+        if (!empty($data)) {
+            $connection->insertArray(
+                $this->getMessageStatusTable(),
+                ['queue_id', 'message_id', 'status'],
+                $data
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * Retrieve array of queue IDs corresponding to the specified array of queue names.
+     *
+     * @param string[] $queueNames
+     * @return int[]
+     */
+    protected function getQueueIdsByNames($queueNames)
+    {
+        $selectObject = $this->getConnection()->select();
+        $selectObject->from(['queue' => $this->getQueueTable()])
+            ->columns(['id'])
+            ->where('queue.name IN (?)', $queueNames);
+        return $this->getConnection()->fetchCol($selectObject);
+    }
+
+    /**
+     * Retrieve messages from the specified queue.
+     *
+     * @param string $queueName
+     * @param int|null $limit
+     * @return array
+     */
+    public function getMessages($queueName, $limit = null)
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()
+            ->from(
+                ['queue_message' => $this->getMessageTable()],
+                [QueueManagement::MESSAGE_TOPIC => 'topic_name', QueueManagement::MESSAGE_BODY => 'body']
+            )->join(
+                ['queue_message_status' => $this->getMessageStatusTable()],
+                'queue_message.id = queue_message_status.message_id',
+                [
+                    QueueManagement::MESSAGE_QUEUE_RELATION_ID => 'id',
+                    QueueManagement::MESSAGE_QUEUE_ID => 'queue_id',
+                    QueueManagement::MESSAGE_ID => 'message_id',
+                    QueueManagement::MESSAGE_STATUS => 'status',
+                    QueueManagement::MESSAGE_UPDATED_AT => 'updated_at',
+                    QueueManagement::MESSAGE_NUMBER_OF_TRIALS => 'number_of_trials'
+                ]
+            )->join(
+                ['queue' => $this->getQueueTable()],
+                'queue.id = queue_message_status.queue_id',
+                [QueueManagement::MESSAGE_QUEUE_NAME => 'name']
+            )->where(
+                'queue_message_status.status IN (?)',
+                [QueueManagement::MESSAGE_STATUS_NEW, QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED]
+            )->where('queue.name = ?', $queueName)
+            ->order('queue_message_status.updated_at DESC');
+
+        if ($limit) {
+            $select->limit($limit);
+        }
+
+        return $connection->fetchAll($select);
+    }
+
+    /**
+     * Delete messages if there is no queue whrere the message is not in status TO BE DELETED
+     *
+     * @return void
+     */
+    public function deleteMarkedMessages()
+    {
+        $connection = $this->getConnection();
+
+        $select = $connection->select()
+            ->from(['queue_message_status' => $this->getMessageStatusTable()], ['message_id'])
+            ->where('status <> ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+            ->distinct();
+        $messageIds = $connection->fetchCol($select);
+
+        $condition = count($messageIds) > 0 ? ['id NOT IN (?)' => $messageIds] : null;
+        $connection->delete($this->getMessageTable(), $condition);
+    }
+
+    /**
+     * Mark specified messages with 'in progress' status.
+     *
+     * @param int[] $relationIds
+     * @return int[] IDs of messages which should be taken in progress by current process.
+     */
+    public function takeMessagesInProgress($relationIds)
+    {
+        $takenMessagesRelationIds = [];
+        foreach ($relationIds as $relationId) {
+            $affectedRows = $this->getConnection()->update(
+                $this->getMessageStatusTable(),
+                ['status' => QueueManagement::MESSAGE_STATUS_IN_PROGRESS],
+                ['id = ?' => $relationId]
+            );
+            if ($affectedRows) {
+                /**
+                 * If status was set to 'in progress' by some other process (due to race conditions),
+                 * current process should not process the same message.
+                 * So message will be processed only if current process was able to change its status.
+                 */
+                $takenMessagesRelationIds[] = $relationId;
+            }
+        }
+        return $takenMessagesRelationIds;
+    }
+
+    /**
+     * Set status of message to 'retry required' and increment number of processing trials.
+     *
+     * @param int $relationId
+     * @return void
+     */
+    public function pushBackForRetry($relationId)
+    {
+        $this->getConnection()->update(
+            $this->getMessageStatusTable(),
+            [
+                'status' => QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED,
+                'number_of_trials' => new \Zend_Db_Expr('number_of_trials+1')
+            ],
+            ['id = ?' => $relationId]
+        );
+    }
+
+    /**
+     * Change message status.
+     *
+     * @param int[] $relationIds
+     * @param int $status
+     * @return void
+     */
+    public function changeStatus($relationIds, $status)
+    {
+        $this->getConnection()->update(
+            $this->getMessageStatusTable(),
+            ['status' => $status],
+            ['id IN (?)' => $relationIds]
+        );
+    }
+
+    /**
+     * Get name of table storing message statuses and associations to queues.
+     *
+     * @return string
+     */
+    protected function getMessageStatusTable()
+    {
+        return $this->getTable('queue_message_status');
+    }
+
+    /**
+     * Get name of table storing declared queues.
+     *
+     * @return string
+     */
+    protected function getQueueTable()
+    {
+        return $this->getTable('queue');
+    }
+
+    /**
+     * Get name of table storing message body and topic.
+     *
+     * @return string
+     */
+    protected function getMessageTable()
+    {
+        return $this->getTable('queue_message');
+    }
+}
diff --git a/app/code/Magento/MysqlMq/README.md b/app/code/Magento/MysqlMq/README.md
new file mode 100644
index 00000000000..3ebc6a10d10
--- /dev/null
+++ b/app/code/Magento/MysqlMq/README.md
@@ -0,0 +1,3 @@
+# MysqlMq
+
+**MysqlMq** provides message queue implementation based on MySQL.
diff --git a/app/code/Magento/MysqlMq/Setup/Recurring.php b/app/code/Magento/MysqlMq/Setup/Recurring.php
new file mode 100644
index 00000000000..db3a39bf5fb
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Setup/Recurring.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+
+/**
+ * Class Recurring
+ */
+class Recurring implements InstallSchemaInterface
+{
+    /**
+     * @var MessageQueueConfig
+     */
+    private $messageQueueConfig;
+
+    /**
+     * @param MessageQueueConfig $messageQueueConfig
+     */
+    public function __construct(MessageQueueConfig $messageQueueConfig)
+    {
+        $this->messageQueueConfig = $messageQueueConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $setup->startSetup();
+
+        $binds = $this->messageQueueConfig->getBinds();
+        $queues = [];
+        foreach ($binds as $bind) {
+            $queues[] = $bind[MessageQueueConfig::BIND_QUEUE];
+        }
+        $connection = $setup->getConnection();
+        $existingQueues = $connection->fetchCol($connection->select()->from($setup->getTable('queue'), 'name'));
+        $queues = array_unique(array_diff($queues, $existingQueues));
+        /** Populate 'queue' table */
+        if (!empty($queues)) {
+            $connection->insertArray($setup->getTable('queue'), ['name'], $queues);
+        }
+
+        $setup->endSetup();
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Model/ConnectionTypeResolverTest.php b/app/code/Magento/MysqlMq/Test/Unit/Model/ConnectionTypeResolverTest.php
new file mode 100644
index 00000000000..68dbea2f7a9
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Unit/Model/ConnectionTypeResolverTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Test\Unit\Model;
+
+use Magento\MysqlMq\Model\ConnectionTypeResolver;
+
+/**
+ * Unit tests for Mysql connection type resolver
+ */
+class ConnectionTypeResolverTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetConnectionTypeWithDefaultValues()
+    {
+        $model = new ConnectionTypeResolver();
+        $this->assertEquals('db', $model->getConnectionType('db'));
+        $this->assertEquals(null, $model->getConnectionType('non-db'));
+    }
+
+    public function testGetConnectionTypeWithCustomValues()
+    {
+        $model = new ConnectionTypeResolver(['test-connection']);
+        $this->assertEquals('db', $model->getConnectionType('db'));
+        $this->assertEquals('db', $model->getConnectionType('test-connection'));
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Model/Driver/Bulk/ExchangeTest.php b/app/code/Magento/MysqlMq/Test/Unit/Model/Driver/Bulk/ExchangeTest.php
new file mode 100644
index 00000000000..452825058c9
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Unit/Model/Driver/Bulk/ExchangeTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MysqlMq\Test\Unit\Model\Driver\Bulk;
+
+/**
+ * Unit test for bulk Exchange model.
+ */
+class ExchangeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageQueueConfig;
+
+    /**
+     * @var \Magento\MysqlMq\Model\QueueManagement|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queueManagement;
+
+    /**
+     * @var \Magento\MysqlMq\Model\Driver\Bulk\Exchange
+     */
+    private $exchange;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->messageQueueConfig = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queueManagement = $this->getMockBuilder(\Magento\MysqlMq\Model\QueueManagement::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->exchange = $objectManager->getObject(
+            \Magento\MysqlMq\Model\Driver\Bulk\Exchange::class,
+            [
+                'messageQueueConfig' => $this->messageQueueConfig,
+                'queueManagement' => $this->queueManagement,
+            ]
+        );
+    }
+
+    /**
+     * Test for enqueue model.
+     *
+     * @return void
+     */
+    public function testEnqueue()
+    {
+        $topicName = 'topic.name';
+        $queueNames = ['queue0', 'queue1'];
+        $envelopeBody = 'serializedMessage';
+        $this->messageQueueConfig->expects($this->once())
+            ->method('getQueuesByTopic')->with($topicName)->willReturn($queueNames);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $envelope->expects($this->once())->method('getBody')->willReturn($envelopeBody);
+        $this->queueManagement->expects($this->once())
+            ->method('addMessagesToQueues')->with($topicName, [$envelopeBody], $queueNames);
+        $this->assertNull($this->exchange->enqueue($topicName, [$envelope]));
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Model/QueueManagementTest.php b/app/code/Magento/MysqlMq/Test/Unit/Model/QueueManagementTest.php
new file mode 100644
index 00000000000..906feb2b46c
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Unit/Model/QueueManagementTest.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MysqlMq\Test\Unit\Model;
+
+/**
+ * Unit test for QueueManagement model.
+ */
+class QueueManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\MysqlMq\Model\ResourceModel\Queue|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageResource;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTime;
+
+    /**
+     * @var \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory
+     *      |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageStatusCollectionFactory;
+
+    /**
+     * @var \Magento\MysqlMq\Model\QueueManagement
+     */
+    private $queueManagement;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->messageResource = $this->getMockBuilder(\Magento\MysqlMq\Model\ResourceModel\Queue::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->dateTime = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\DateTime::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageStatusCollectionFactory = $this
+            ->getMockBuilder(\Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->queueManagement = $objectManager->getObject(
+            \Magento\MysqlMq\Model\QueueManagement::class,
+            [
+                'messageResource' => $this->messageResource,
+                'scopeConfig' => $this->scopeConfig,
+                'dateTime' => $this->dateTime,
+                'messageStatusCollectionFactory' => $this->messageStatusCollectionFactory,
+            ]
+        );
+    }
+
+    /**
+     * Test for addMessageToQueues method.
+     *
+     * @return void
+     */
+    public function testAddMessageToQueues()
+    {
+        $topicName = 'topic.name';
+        $queueNames = ['queue0', 'queue1'];
+        $message = 'test_message';
+        $messageId = 1;
+        $this->messageResource->expects($this->once())
+            ->method('saveMessage')->with($topicName, $message)->willReturn($messageId);
+        $this->messageResource->expects($this->once())
+            ->method('linkQueues')->with($messageId, $queueNames)->willReturnSelf();
+        $this->assertEquals(
+            $this->queueManagement,
+            $this->queueManagement->addMessageToQueues($topicName, $message, $queueNames)
+        );
+    }
+
+    /**
+     * Test for addMessagesToQueues method.
+     *
+     * @return void
+     */
+    public function testAddMessagesToQueues()
+    {
+        $topicName = 'topic.name';
+        $queueNames = ['queue0', 'queue1'];
+        $messages = ['test_message0', 'test_message1'];
+        $messageIds = [1, 2];
+        $this->messageResource->expects($this->once())
+            ->method('saveMessages')->with($topicName, $messages)->willReturn($messageIds);
+        $this->messageResource->expects($this->once())
+            ->method('linkMessagesWithQueues')->with($messageIds, $queueNames)->willReturnSelf();
+        $this->assertEquals(
+            $this->queueManagement,
+            $this->queueManagement->addMessagesToQueues($topicName, $messages, $queueNames)
+        );
+    }
+
+    /**
+     * Test for markMessagesForDelete method.
+     *
+     * @return void
+     */
+    public function testMarkMessagesForDelete()
+    {
+        $messageId = 99;
+        $collection = $this->getMockBuilder(\Magento\MysqlMq\Model\ResourceModel\MessageStatusCollection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageStatusCollectionFactory->expects($this->once())->method('create')->willReturn($collection);
+        $this->scopeConfig->expects($this->exactly(8))->method('getValue')
+            ->withConsecutive(
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_SUCCESSFUL_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_FAILED_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_NEW_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_RETRY_IN_PROGRESS_AFTER,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_SUCCESSFUL_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_FAILED_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_NEW_MESSAGES_LIFETIME,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ],
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::XML_PATH_RETRY_IN_PROGRESS_AFTER,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ]
+            )->willReturn(1);
+        $collection->expects($this->once())->method('addFieldToFilter')
+            ->with(
+                'status',
+                [
+                    'in' => [
+                        \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE,
+                        \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_ERROR,
+                        \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_NEW,
+                        \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
+                    ]
+                ]
+            )->willReturnSelf();
+        $messageStatuses =
+            [
+                $this->getMessageStatusMock(),
+                $this->getMessageStatusMock(),
+                $this->getMessageStatusMock(),
+                $this->getMessageStatusMock(),
+            ];
+        $this->dateTime->expects($this->exactly(4))->method('gmtTimestamp')->willReturn(1486741063);
+        $messageStatuses[0]->expects($this->atLeastOnce())->method('getStatus')->willReturn(
+            \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE
+        );
+        $messageStatuses[1]->expects($this->atLeastOnce())->method('getStatus')->willReturn(
+            \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_ERROR
+        );
+        $messageStatuses[2]->expects($this->atLeastOnce())->method('getStatus')->willReturn(
+            \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_NEW
+        );
+        $messageStatuses[3]->expects($this->atLeastOnce())->method('getStatus')->willReturn(
+            \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS
+        );
+        $messageStatuses[0]->expects($this->once())->method('setStatus')
+            ->with(\Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)->willReturnSelf();
+        $messageStatuses[1]->expects($this->once())->method('setStatus')
+            ->with(\Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)->willReturnSelf();
+        $messageStatuses[2]->expects($this->once())->method('setStatus')
+            ->with(\Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)->willReturnSelf();
+        $messageStatuses[0]->expects($this->once())->method('save')->willReturnSelf();
+        $messageStatuses[1]->expects($this->once())->method('save')->willReturnSelf();
+        $messageStatuses[2]->expects($this->once())->method('save')->willReturnSelf();
+        $messageStatuses[3]->expects($this->once())->method('getId')->willReturn($messageId);
+        $collection->expects($this->once())->method('getIterator')->willReturn(new \ArrayIterator($messageStatuses));
+        $this->messageResource->expects($this->once())->method('pushBackForRetry')->with($messageId);
+        $this->messageResource->expects($this->once())->method('deleteMarkedMessages');
+        $this->queueManagement->markMessagesForDelete();
+    }
+
+    /**
+     * Create mock of MessageStatus method.
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getMessageStatusMock()
+    {
+        $messageStatus = $this->getMockBuilder(\Magento\MysqlMq\Model\MessageStatus::class)
+            ->setMethods(['getStatus', 'setStatus', 'save', 'getId', 'getUpdatedAt'])
+            ->disableOriginalConstructor()->getMock();
+        $messageStatus->expects($this->once())->method('getUpdatedAt')->willReturn('2010-01-01 00:00:00');
+        return $messageStatus;
+    }
+
+    /**
+     * Test for changeStatus method.
+     */
+    public function testChangeStatus()
+    {
+        $messageIds = [1, 2];
+        $status = \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED;
+        $this->messageResource->expects($this->once())->method('changeStatus')->with($messageIds, $status);
+        $this->queueManagement->changeStatus($messageIds, $status);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php b/app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php
new file mode 100644
index 00000000000..7f364054ec9
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MysqlMq\Test\Unit\Model\ResourceModel;
+
+/**
+ * Unit test for Queue resource model.
+ */
+class QueueTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resources;
+
+    /**
+     * @var \Magento\MysqlMq\Model\ResourceModel\Queue
+     */
+    private $queue;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->resources = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->queue = $objectManager->getObject(
+            \Magento\MysqlMq\Model\ResourceModel\Queue::class,
+            [
+                '_resources' => $this->resources,
+            ]
+        );
+    }
+
+    /**
+     * Test for saveMessage method.
+     *
+     * @return void
+     */
+    public function testSaveMessage()
+    {
+        $messageTopic = 'topic.name';
+        $message = 'messageBody';
+        $tableName = 'queue_message';
+        $messageId = 2;
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->setMethods(['insert', 'lastInsertId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->resources->expects($this->exactly(2))->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->once())
+            ->method('getTableName')->with($tableName, 'default')->willReturn($tableName);
+        $connection->expects($this->once())->method('insert')
+            ->with($tableName, ['topic_name' => $messageTopic, 'body' => $message])->willReturn(1);
+        $connection->expects($this->once())->method('lastInsertId')->with($tableName)->willReturn($messageId);
+        $this->assertEquals($messageId, $this->queue->saveMessage($messageTopic, $message));
+    }
+
+    /**
+     * Test for saveMessages method.
+     *
+     * @return void
+     */
+    public function testSaveMessages()
+    {
+        $messageTopic = 'topic.name';
+        $messages = ['messageBody0', 'messageBody1'];
+        $tableName = 'queue_message';
+        $messageIds = [3, 4];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->setMethods(['insertMultiple', 'lastInsertId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->once())
+            ->method('getTableName')->with($tableName, 'default')->willReturn($tableName);
+        $connection->expects($this->once())->method('insertMultiple')
+            ->with(
+                $tableName,
+                [
+                    ['topic_name' => $messageTopic, 'body' => $messages[0]],
+                    ['topic_name' => $messageTopic, 'body' => $messages[1]],
+                ]
+            )->willReturn(2);
+        $connection->expects($this->once())->method('lastInsertId')->with($tableName)->willReturn($messageIds[0]);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()->getMock();
+        $connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())->method('from')->with(['qm' => $tableName], ['id'])->willReturnSelf();
+        $select->expects($this->once())->method('where')->with('qm.id >= ?', $messageIds[0])->willReturnSelf();
+        $select->expects($this->once())->method('limit')->with(2)->willReturnSelf();
+        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn($messageIds);
+        $this->assertEquals($messageIds, $this->queue->saveMessages($messageTopic, $messages));
+    }
+
+    /**
+     * Test for linkQueues method.
+     *
+     * @return void
+     */
+    public function testLinkQueues()
+    {
+        $messageId = 3;
+        $queueNames = ['queueName0', 'queueName1'];
+        $queueIds = [5, 6];
+        $tableNames = ['queue', 'queue_message_status'];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->exactly(2))->method('getTableName')
+            ->withConsecutive([$tableNames[0], 'default'], [$tableNames[1], 'default'])
+            ->willReturnOnConsecutiveCalls($tableNames[0], $tableNames[1]);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()->getMock();
+        $connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())->method('from')->with(['queue' => $tableNames[0]])->willReturnSelf();
+        $select->expects($this->once())->method('columns')->with(['id'])->willReturnSelf();
+        $select->expects($this->once())->method('where')->with('queue.name IN (?)', $queueNames)->willReturnSelf();
+        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn($queueIds);
+        $connection->expects($this->once())->method('insertArray')->with(
+            $tableNames[1],
+            ['queue_id', 'message_id', 'status'],
+            [
+                [
+                    $queueIds[0],
+                    $messageId,
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_NEW
+                ],
+                [
+                    $queueIds[1],
+                    $messageId,
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_NEW
+                ],
+            ]
+        )->willReturn(4);
+        $this->assertEquals($this->queue, $this->queue->linkQueues($messageId, $queueNames));
+    }
+
+    /**
+     * Test for getMessages method.
+     *
+     * @return void
+     */
+    public function testGetMessages()
+    {
+        $limit = 100;
+        $queueName = 'queueName0';
+        $tableNames = ['queue_message', 'queue_message_status', 'queue'];
+        $messages = [['message0_data'], ['message1_data']];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->exactly(3))->method('getTableName')
+            ->withConsecutive([$tableNames[0], 'default'], [$tableNames[1], 'default'], [$tableNames[2], 'default'])
+            ->willReturnOnConsecutiveCalls($tableNames[0], $tableNames[1], $tableNames[2]);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()->getMock();
+        $connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())->method('from')->with(
+            ['queue_message' => $tableNames[0]],
+            [
+                \Magento\MysqlMq\Model\QueueManagement::MESSAGE_TOPIC => 'topic_name',
+                \Magento\MysqlMq\Model\QueueManagement::MESSAGE_BODY => 'body'
+            ]
+        )->willReturnSelf();
+        $select->expects($this->exactly(2))->method('join')->withConsecutive(
+            [
+                ['queue_message_status' => $tableNames[1]],
+                'queue_message.id = queue_message_status.message_id',
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_QUEUE_RELATION_ID => 'id',
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_QUEUE_ID => 'queue_id',
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_ID => 'message_id',
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS => 'status',
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_UPDATED_AT => 'updated_at',
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_NUMBER_OF_TRIALS => 'number_of_trials'
+                ]
+            ],
+            [
+                ['queue' => $tableNames[2]],
+                'queue.id = queue_message_status.queue_id',
+                [\Magento\MysqlMq\Model\QueueManagement::MESSAGE_QUEUE_NAME => 'name']
+            ]
+        )->willReturnSelf();
+        $select->expects($this->exactly(2))->method('where')->withConsecutive(
+            [
+                'queue_message_status.status IN (?)',
+                [
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_NEW,
+                    \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED
+                ]
+            ],
+            [
+                'queue.name = ?', $queueName
+            ]
+        )->willReturnSelf();
+        $select->expects($this->once())
+            ->method('order')->with('queue_message_status.updated_at DESC')->willReturnSelf();
+        $select->expects($this->once())->method('limit')->with($limit)->willReturnSelf();
+        $connection->expects($this->once())->method('fetchAll')->with($select)->willReturn($messages);
+        $this->assertEquals($messages, $this->queue->getMessages($queueName, $limit));
+    }
+
+    /**
+     * Test for deleteMarkedMessages method.
+     *
+     * @return void
+     */
+    public function testDeleteMarkedMessages()
+    {
+        $messageIds = [1, 2];
+        $tableNames = ['queue_message_status', 'queue_message'];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->exactly(2))->method('getTableName')
+            ->withConsecutive([$tableNames[0], 'default'], [$tableNames[1], 'default'])
+            ->willReturnOnConsecutiveCalls($tableNames[0], $tableNames[1]);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()->getMock();
+        $connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())
+            ->method('from')->with(['queue_message_status' => $tableNames[0]], ['message_id'])->willReturnSelf();
+        $select->expects($this->once())->method('where')
+            ->with('status <> ?', \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+            ->willReturnSelf();
+        $select->expects($this->once())->method('distinct')->willReturnSelf();
+        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn($messageIds);
+        $connection->expects($this->once())->method('delete')
+            ->with($tableNames[1], ['id NOT IN (?)' => $messageIds])->willReturn(2);
+        $this->queue->deleteMarkedMessages();
+    }
+
+    /**
+     * Test for takeMessagesInProgress method.
+     *
+     * @return void
+     */
+    public function testTakeMessagesInProgress()
+    {
+        $relationIds = [1, 2];
+        $tableName = 'queue_message_status';
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->once())->method('getTableName')->with($tableName)->willReturn($tableName);
+        $connection->expects($this->exactly(2))->method('update')->withConsecutive(
+            [
+                $tableName,
+                ['status' => \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS],
+                ['id = ?' => $relationIds[0]]
+            ],
+            [
+                $tableName,
+                ['status' => \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS],
+                ['id = ?' => $relationIds[1]]
+            ]
+        )->willReturnOnConsecutiveCalls(1, 0);
+        $this->assertEquals([$relationIds[0]], $this->queue->takeMessagesInProgress($relationIds));
+    }
+
+    /**
+     * Test for pushBackForRetry method.
+     *
+     * @return void
+     */
+    public function testPushBackForRetry()
+    {
+        $relationId = 1;
+        $tableName = 'queue_message_status';
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->once())->method('getTableName')->with($tableName)->willReturn($tableName);
+        $connection->expects($this->once())->method('update')->with(
+            $tableName,
+            [
+                'status' => \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED,
+                'number_of_trials' => new \Zend_Db_Expr('number_of_trials+1')
+            ],
+            ['id = ?' => $relationId]
+        )->willReturn(1);
+        $this->queue->pushBackForRetry($relationId);
+    }
+
+    /**
+     * Test for changeStatus method.
+     *
+     * @return void
+     */
+    public function testChangeStatus()
+    {
+        $relationIds = [1, 2];
+        $status = \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED;
+        $tableName = 'queue_message_status';
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resources->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')->willReturn($connection);
+        $this->resources->expects($this->once())->method('getTableName')->with($tableName)->willReturn($tableName);
+        $connection->expects($this->once())
+            ->method('update')->with($tableName, ['status' => $status], ['id IN (?)' => $relationIds])->willReturn(1);
+        $this->queue->changeStatus($relationIds, $status);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Setup/RecurringTest.php b/app/code/Magento/MysqlMq/Test/Unit/Setup/RecurringTest.php
new file mode 100644
index 00000000000..e2e7ad3c4c9
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Unit/Setup/RecurringTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MysqlMq\Test\Unit\Setup;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Class RecurringTest
+ */
+class RecurringTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\MysqlMq\Setup\Recurring
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageQueueConfig;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->messageQueueConfig = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->model = $this->objectManager->getObject(
+            \Magento\MysqlMq\Setup\Recurring::class,
+            [
+                'messageQueueConfig' => $this->messageQueueConfig,
+            ]
+        );
+    }
+
+    /**
+     * Test for install method
+     */
+    public function testInstall()
+    {
+        $binds = [
+            'first_bind' => [
+                'queue' => 'queue_name_1',
+                'exchange' => 'magento-db',
+                'topic' => 'queue.topic.1'
+            ],
+            'second_bind' => [
+                'queue' => 'queue_name_2',
+                'exchange' => 'magento-db',
+                'topic' => 'queue.topic.2'
+            ],
+            'third_bind' => [
+                'queue' => 'queue_name_3',
+                'exchange' => 'magento-db',
+                'topic' => 'queue.topic.3'
+            ]
+        ];
+        $dbQueues = [
+            'queue_name_1',
+            'queue_name_2',
+        ];
+        $queuesToInsert = [
+            2 => 'queue_name_3'
+        ];
+        $queueTableName = 'queue_table';
+
+        $setup = $this->getMockBuilder(\Magento\Framework\Setup\SchemaSetupInterface::class)
+            ->getMockForAbstractClass();
+        $context = $this->getMockBuilder(\Magento\Framework\Setup\ModuleContextInterface::class)
+            ->getMockForAbstractClass();
+
+        $setup->expects($this->once())->method('startSetup')->willReturnSelf();
+        $this->messageQueueConfig->expects($this->once())->method('getBinds')->willReturn($binds);
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->getMockForAbstractClass();
+        $setup->expects($this->once())->method('getConnection')->willReturn($connection);
+        $setup->expects($this->any())->method('getTable')->with('queue')->willReturn($queueTableName);
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $connection->expects($this->once())->method('select')->willReturn($select);
+        $select->expects($this->once())->method('from')->with($queueTableName, 'name')->willReturnSelf();
+        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn($dbQueues);
+        $connection->expects($this->once())->method('insertArray')->with($queueTableName, ['name'], $queuesToInsert);
+        $setup->expects($this->once())->method('endSetup')->willReturnSelf();
+
+        $this->model->install($setup, $context);
+    }
+}
diff --git a/app/code/Magento/MysqlMq/composer.json b/app/code/Magento/MysqlMq/composer.json
new file mode 100644
index 00000000000..8945fa2a614
--- /dev/null
+++ b/app/code/Magento/MysqlMq/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-mysql-mq",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/framework": "100.3.*",
+        "magento/magento-composer-installer": "*",
+        "magento/module-store": "100.3.*",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "type": "magento2-module",
+    "version": "100.3.0-dev",
+    "license": [
+        "proprietary"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MysqlMq\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MysqlMq/etc/adminhtml/system.xml b/app/code/Magento/MysqlMq/etc/adminhtml/system.xml
new file mode 100644
index 00000000000..2684f2e0c98
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/adminhtml/system.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="system">
+            <group id="mysqlmq" translate="label comment" type="text" sortOrder="15" showInDefault="1" showInWebsite="0" showInStore="0">
+                <label>MySQL Message Queue Cleanup</label>
+                <comment>All the times are in minutes. Use "0" if you want to skip automatic clearance.</comment>
+                <field id="retry_inprogress_after" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Retry Messages In Progress After</label>
+                </field>
+                <field id="successful_messages_lifetime" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Successful Messages Lifetime</label>
+                </field>
+                <field id="failed_messages_lifetime" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Failed Messages Lifetime</label>
+                </field>
+                <field id="new_messages_lifetime" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>New Messages Lifetime</label>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/MysqlMq/etc/config.xml b/app/code/Magento/MysqlMq/etc/config.xml
new file mode 100644
index 00000000000..f1a59c5375a
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <system>
+            <mysqlmq>
+                <retry_inprogress_after>1440</retry_inprogress_after>
+                <new_messages_lifetime>10080</new_messages_lifetime>
+                <successful_messages_lifetime>10080</successful_messages_lifetime>
+                <failed_messages_lifetime>10080</failed_messages_lifetime>
+            </mysqlmq>
+        </system>
+    </default>
+</config>
diff --git a/app/code/Magento/MysqlMq/etc/crontab.xml b/app/code/Magento/MysqlMq/etc/crontab.xml
new file mode 100644
index 00000000000..9f4546206ea
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/crontab.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
+    <group id="default">
+        <job name="mysqlmq_clean_messages" instance="Magento\MysqlMq\Model\Observer" method="cleanupMessages">
+            <schedule>30 6,15 * * *</schedule>
+        </job>
+    </group>
+</config>
diff --git a/app/code/Magento/MysqlMq/etc/db_schema.xml b/app/code/Magento/MysqlMq/etc/db_schema.xml
new file mode 100644
index 00000000000..9ef1fc15f1f
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/db_schema.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="queue" resource="default" engine="innodb" comment="Table storing unique queues">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Queue ID"/>
+        <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Queue name"/>
+        <constraint xsi:type="primary" name="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="unique" name="QUEUE_NAME">
+            <column name="name"/>
+        </constraint>
+    </table>
+    <table name="queue_message" resource="default" engine="innodb" comment="Queue messages">
+        <column xsi:type="bigint" name="id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Message ID"/>
+        <column xsi:type="varchar" name="topic_name" nullable="true" length="255" comment="Message topic"/>
+        <column xsi:type="longtext" name="body" nullable="true" comment="Message body"/>
+        <constraint xsi:type="primary" name="PRIMARY">
+            <column name="id"/>
+        </constraint>
+    </table>
+    <table name="queue_message_status" resource="default" engine="innodb"
+           comment="Relation table to keep associations between queues and messages">
+        <column xsi:type="bigint" name="id" padding="20" unsigned="true" nullable="false" identity="true"
+                comment="Relation ID"/>
+        <column xsi:type="int" name="queue_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Queue ID"/>
+        <column xsi:type="bigint" name="message_id" padding="20" unsigned="true" nullable="false" identity="false"
+                comment="Message ID"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="smallint" name="status" padding="5" unsigned="true" nullable="false" identity="false"
+                comment="Message status in particular queue"/>
+        <column xsi:type="smallint" name="number_of_trials" padding="5" unsigned="true" nullable="false"
+                identity="false" default="0" comment="Number of trials to processed failed message processing"/>
+        <constraint xsi:type="primary" name="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="foreign" name="QUEUE_MESSAGE_ID_QUEUE_MESSAGE_STATUS_MESSAGE_ID"
+                    table="queue_message_status" column="message_id" referenceTable="queue_message" referenceColumn="id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" name="QUEUE_ID_QUEUE_MESSAGE_STATUS_QUEUE_ID" table="queue_message_status"
+                    column="queue_id" referenceTable="queue" referenceColumn="id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" name="QUEUE_MESSAGE_STATUS_QUEUE_ID_MESSAGE_ID">
+            <column name="queue_id"/>
+            <column name="message_id"/>
+        </constraint>
+        <index name="QUEUE_MESSAGE_STATUS_STATUS_UPDATED_AT" indexType="btree">
+            <column name="status"/>
+            <column name="updated_at"/>
+        </index>
+    </table>
+</schema>
diff --git a/app/code/Magento/MysqlMq/etc/db_schema_whitelist.json b/app/code/Magento/MysqlMq/etc/db_schema_whitelist.json
new file mode 100644
index 00000000000..9d224cd8cb7
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/db_schema_whitelist.json
@@ -0,0 +1,41 @@
+{
+  "queue": {
+    "column": {
+      "id": true,
+      "name": true
+    },
+    "constraint": {
+      "PRIMARY": true,
+      "QUEUE_NAME": true
+    }
+  },
+  "queue_message": {
+    "column": {
+      "id": true,
+      "topic_name": true,
+      "body": true
+    },
+    "constraint": {
+      "PRIMARY": true
+    }
+  },
+  "queue_message_status": {
+    "column": {
+      "id": true,
+      "queue_id": true,
+      "message_id": true,
+      "updated_at": true,
+      "status": true,
+      "number_of_trials": true
+    },
+    "index": {
+      "QUEUE_MESSAGE_STATUS_STATUS_UPDATED_AT": true
+    },
+    "constraint": {
+      "PRIMARY": true,
+      "QUEUE_MESSAGE_ID_QUEUE_MESSAGE_STATUS_MESSAGE_ID": true,
+      "QUEUE_ID_QUEUE_MESSAGE_STATUS_QUEUE_ID": true,
+      "QUEUE_MESSAGE_STATUS_QUEUE_ID_MESSAGE_ID": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/code/Magento/MysqlMq/etc/di.xml b/app/code/Magento/MysqlMq/etc/di.xml
new file mode 100644
index 00000000000..958ffb52816
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/di.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\MessageQueue\PublisherPool">
+        <arguments>
+            <argument name="publishers" xsi:type="array">
+                <item name="async" xsi:type="array">
+                    <item name="db" xsi:type="object">Magento\Framework\MessageQueue\Publisher</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Bulk\PublisherPool">
+        <arguments>
+            <argument name="publishers" xsi:type="array">
+                <item name="async" xsi:type="array">
+                    <item name="db" xsi:type="object">Magento\Framework\MessageQueue\Bulk\Publisher</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\ConnectionTypeResolver">
+        <arguments>
+            <argument name="resolvers" xsi:type="array">
+                <item name="db" xsi:type="object">Magento\MysqlMq\Model\ConnectionTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\ExchangeFactory">
+        <arguments>
+            <argument name="exchangeFactories" xsi:type="array">
+                <item name="db" xsi:type="object">\Magento\MysqlMq\Model\Driver\ExchangeFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Bulk\ExchangeFactory">
+        <arguments>
+            <argument name="exchangeFactories" xsi:type="array">
+                <item name="db" xsi:type="object">\Magento\MysqlMq\Model\Driver\Bulk\ExchangeFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\QueueFactory">
+        <arguments>
+            <argument name="queueFactories" xsi:type="array">
+                <item name="db" xsi:type="object">Magento\MysqlMq\Model\Driver\QueueFactory</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\MysqlMq\Model\Driver\Bulk\ExchangeFactory" type="Magento\MysqlMq\Model\Driver\ExchangeFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">\Magento\MysqlMq\Model\Driver\Bulk\Exchange</argument>
+        </arguments>
+    </virtualType>
+</config>
diff --git a/app/code/Magento/MysqlMq/etc/module.xml b/app/code/Magento/MysqlMq/etc/module.xml
new file mode 100644
index 00000000000..deac621ad1c
--- /dev/null
+++ b/app/code/Magento/MysqlMq/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_MysqlMq" />
+</config>
diff --git a/app/code/Magento/MysqlMq/i18n/en_US.csv b/app/code/Magento/MysqlMq/i18n/en_US.csv
new file mode 100644
index 00000000000..8a124eb6c7c
--- /dev/null
+++ b/app/code/Magento/MysqlMq/i18n/en_US.csv
@@ -0,0 +1,7 @@
+"Message has been rejected: %1","Message has been rejected: %1"
+"MySQL Message Queue Cleanup","MySQL Message Queue Cleanup"
+"All the times are in minutes. Use ""0"" if you want to skip automatic clearance.","All the times are in minutes. Use ""0"" if you want to skip automatic clearance."
+"Retry Messages In Progress After","Retry Messages In Progress After"
+"Successful Messages Lifetime","Successful Messages Lifetime"
+"Failed Messages Lifetime","Failed Messages Lifetime"
+"New Messages Lifetime","New Messages Lifetime"
diff --git a/app/code/Magento/MysqlMq/registration.php b/app/code/Magento/MysqlMq/registration.php
new file mode 100644
index 00000000000..e13a38b4680
--- /dev/null
+++ b/app/code/Magento/MysqlMq/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MysqlMq', __DIR__);
diff --git a/app/code/Magento/NewRelicReporting/etc/db_schema.xml b/app/code/Magento/NewRelicReporting/etc/db_schema.xml
index af4c014beb9..6f9ce29436f 100644
--- a/app/code/Magento/NewRelicReporting/etc/db_schema.xml
+++ b/app/code/Magento/NewRelicReporting/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="reporting_counts" resource="default" engine="innodb"
            comment="Reporting for all count related events generated via the cron job">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
diff --git a/app/code/Magento/Newsletter/etc/db_schema.xml b/app/code/Magento/Newsletter/etc/db_schema.xml
index 35ee306a27d..5084b8b6d01 100644
--- a/app/code/Magento/Newsletter/etc/db_schema.xml
+++ b/app/code/Magento/Newsletter/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="newsletter_subscriber" resource="default" engine="innodb" comment="Newsletter Subscriber">
         <column xsi:type="int" name="subscriber_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Subscriber Id"/>
diff --git a/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateQuoteShippingAddresses.php b/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateQuoteShippingAddresses.php
index e88da3b8a77..b89942230c5 100644
--- a/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateQuoteShippingAddresses.php
+++ b/app/code/Magento/OfflineShipping/Setup/Patch/Data/UpdateQuoteShippingAddresses.php
@@ -10,8 +10,8 @@
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class UpdateQuoteShippingAddresses implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/OfflineShipping/etc/db_schema.xml b/app/code/Magento/OfflineShipping/etc/db_schema.xml
index 4e277cb80bd..1a4ecd89582 100644
--- a/app/code/Magento/OfflineShipping/etc/db_schema.xml
+++ b/app/code/Magento/OfflineShipping/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="shipping_tablerate" resource="default" engine="innodb" comment="Shipping Tablerate">
         <column xsi:type="int" name="pk" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Primary key"/>
diff --git a/app/code/Magento/Paypal/Setup/Patch/Data/AddPaypalOrderStatuses.php b/app/code/Magento/Paypal/Setup/Patch/Data/AddPaypalOrderStatuses.php
index 2689d6ab26b..495b7618cce 100644
--- a/app/code/Magento/Paypal/Setup/Patch/Data/AddPaypalOrderStatuses.php
+++ b/app/code/Magento/Paypal/Setup/Patch/Data/AddPaypalOrderStatuses.php
@@ -9,8 +9,8 @@
 use Magento\Quote\Setup\QuoteSetupFactory;
 use Magento\Sales\Setup\SalesSetupFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class AddPaypalOrderStates
diff --git a/app/code/Magento/Paypal/etc/db_schema.xml b/app/code/Magento/Paypal/etc/db_schema.xml
index 5d9a1faa267..f6f5448dbc2 100644
--- a/app/code/Magento/Paypal/etc/db_schema.xml
+++ b/app/code/Magento/Paypal/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="paypal_billing_agreement" resource="default" engine="innodb" comment="Sales Billing Agreement">
         <column xsi:type="int" name="agreement_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Agreement Id"/>
diff --git a/app/code/Magento/Persistent/etc/db_schema.xml b/app/code/Magento/Persistent/etc/db_schema.xml
index 5035f3332ea..31adf5be6f0 100644
--- a/app/code/Magento/Persistent/etc/db_schema.xml
+++ b/app/code/Magento/Persistent/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="persistent_session" resource="default" engine="innodb" comment="Persistent Session">
         <column xsi:type="int" name="persistent_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Session id"/>
diff --git a/app/code/Magento/ProductAlert/etc/db_schema.xml b/app/code/Magento/ProductAlert/etc/db_schema.xml
index 8aa149277c6..ddf8be8a37e 100644
--- a/app/code/Magento/ProductAlert/etc/db_schema.xml
+++ b/app/code/Magento/ProductAlert/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="product_alert_price" resource="default" engine="innodb" comment="Product Alert Price">
         <column xsi:type="int" name="alert_price_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Product alert price id"/>
diff --git a/app/code/Magento/ProductVideo/etc/db_schema.xml b/app/code/Magento/ProductVideo/etc/db_schema.xml
index b17252ecf12..ceaf4d7fbd8 100644
--- a/app/code/Magento/ProductVideo/etc/db_schema.xml
+++ b/app/code/Magento/ProductVideo/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalog_product_entity_media_gallery_value_video" resource="default" engine="innodb"
            comment="Catalog Product Video Table">
         <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="false"
diff --git a/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
index eb190f00140..f5372802722 100644
--- a/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/Quote/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -9,8 +9,8 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Quote\Setup\ConvertSerializedDataToJsonFactory;
 use Magento\Quote\Setup\QuoteSetupFactory;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ConvertSerializedDataToJson
diff --git a/app/code/Magento/Quote/Setup/Patch/Data/InstallEntityTypes.php b/app/code/Magento/Quote/Setup/Patch/Data/InstallEntityTypes.php
index 59c821a0afe..24ff3ecad58 100644
--- a/app/code/Magento/Quote/Setup/Patch/Data/InstallEntityTypes.php
+++ b/app/code/Magento/Quote/Setup/Patch/Data/InstallEntityTypes.php
@@ -9,8 +9,8 @@
 use Magento\Framework\DB\Ddl\Table;
 use Magento\Quote\Setup\QuoteSetup;
 use Magento\Quote\Setup\QuoteSetupFactory;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /***
  * Class InstallEntityTypes
diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
index 3d76bee3da7..ff127b9c06f 100644
--- a/app/code/Magento/Quote/etc/db_schema.xml
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="quote" resource="quote" engine="innodb" comment="Sales Flat Quote">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Entity Id"/>
diff --git a/app/code/Magento/ReleaseNotification/etc/db_schema.xml b/app/code/Magento/ReleaseNotification/etc/db_schema.xml
index 5574f1722b4..367957fc177 100644
--- a/app/code/Magento/ReleaseNotification/etc/db_schema.xml
+++ b/app/code/Magento/ReleaseNotification/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="release_notification_viewer_log" resource="default" engine="innodb"
            comment="Release Notification Viewer Log Table">
         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
diff --git a/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php b/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php
index e66d1f72737..77824689b85 100644
--- a/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php
+++ b/app/code/Magento/Reports/Setup/Patch/Data/InitializeReportEntityTypesAndPages.php
@@ -8,8 +8,8 @@
 
 use Magento\Cms\Model\PageFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InitializeReportEntityTypesAndPages
diff --git a/app/code/Magento/Reports/etc/db_schema.xml b/app/code/Magento/Reports/etc/db_schema.xml
index 7b19d0bc726..f6c8074411b 100644
--- a/app/code/Magento/Reports/etc/db_schema.xml
+++ b/app/code/Magento/Reports/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="report_compared_product_index" resource="default" engine="innodb"
            comment="Reports Compared Product Index Table">
         <column xsi:type="bigint" name="index_id" padding="20" unsigned="true" nullable="false" identity="true"
diff --git a/app/code/Magento/RequireJs/Model/FileManager.php b/app/code/Magento/RequireJs/Model/FileManager.php
index 019c2cbedb7..ec41c423896 100644
--- a/app/code/Magento/RequireJs/Model/FileManager.php
+++ b/app/code/Magento/RequireJs/Model/FileManager.php
@@ -183,6 +183,9 @@ public function createBundleJsPool()
             }
 
             foreach ($libDir->read($bundleDir) as $bundleFile) {
+                if (pathinfo($bundleFile, PATHINFO_EXTENSION) !== 'js') {
+                    continue;
+                }
                 $relPath = $libDir->getRelativePath($bundleFile);
                 $bundles[] = $this->assetRepo->createArbitrary($relPath, '');
             }
diff --git a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
index 6b6d709cbb6..834ee5b6848 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
@@ -153,7 +153,7 @@ public function testCreateBundleJsPool()
             ->expects($this->once())
             ->method('read')
             ->with('path/to/bundle/dir/js/bundle')
-            ->willReturn(['bundle1.js', 'bundle2.js']);
+            ->willReturn(['bundle1.js', 'bundle2.js', 'some_file.not_js']);
         $dirRead
             ->expects($this->exactly(2))
             ->method('getRelativePath')
diff --git a/app/code/Magento/Review/Setup/Patch/Data/InitReviewStatusesAndData.php b/app/code/Magento/Review/Setup/Patch/Data/InitReviewStatusesAndData.php
index 0878169eeb3..0ad7042668c 100644
--- a/app/code/Magento/Review/Setup/Patch/Data/InitReviewStatusesAndData.php
+++ b/app/code/Magento/Review/Setup/Patch/Data/InitReviewStatusesAndData.php
@@ -7,8 +7,8 @@
 namespace Magento\Review\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class InitReviewStatusesAndData implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/Review/etc/db_schema.xml b/app/code/Magento/Review/etc/db_schema.xml
index 0db686d16ed..1a2ff588180 100644
--- a/app/code/Magento/Review/etc/db_schema.xml
+++ b/app/code/Magento/Review/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="review_entity" resource="default" engine="innodb" comment="Review entities">
         <column xsi:type="smallint" name="entity_id" padding="5" unsigned="true" nullable="false" identity="true"
                 comment="Review entity id"/>
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/Sales/Setup/Patch/Data/ConvertSerializedDataToJson.php
index d29a2e019b0..542476c7dd9 100644
--- a/app/code/Magento/Sales/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/Sales/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -22,8 +22,8 @@
 use Magento\Sales\Setup\SalesSetup;
 use Magento\Sales\Setup\SalesSetupFactory;
 use Magento\Sales\Setup\SerializedDataConverter;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ConvertSerializedDataToJson
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
index 601aa58c842..0ad2245a628 100644
--- a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
+++ b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
@@ -13,8 +13,8 @@
 use Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory as AddressCollectionFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Sales\Setup\SalesSetupFactory;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/InstallOrderStatusesAndInitialSalesConfig.php b/app/code/Magento/Sales/Setup/Patch/Data/InstallOrderStatusesAndInitialSalesConfig.php
index 4f4ec5f12f6..ba0535875d9 100644
--- a/app/code/Magento/Sales/Setup/Patch/Data/InstallOrderStatusesAndInitialSalesConfig.php
+++ b/app/code/Magento/Sales/Setup/Patch/Data/InstallOrderStatusesAndInitialSalesConfig.php
@@ -8,8 +8,8 @@
 
 use Magento\Sales\Setup\SalesSetupFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallOrderStatusesAndInitialSalesConfig
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypeModelForInvoice.php b/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypeModelForInvoice.php
index 4d918924240..99e15df8420 100644
--- a/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypeModelForInvoice.php
+++ b/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypeModelForInvoice.php
@@ -9,8 +9,8 @@
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Sales\Setup\SalesSetupFactory;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class UpdateEntityTypeModelForInvoice implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypes.php b/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypes.php
index af31152acde..9e399762036 100644
--- a/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypes.php
+++ b/app/code/Magento/Sales/Setup/Patch/Data/UpdateEntityTypes.php
@@ -9,8 +9,8 @@
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Sales\Setup\SalesSetupFactory;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 class UpdateEntityTypes implements DataPatchInterface, PatchVersionInterface
 {
diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml
index c084a5b87b1..8c91a8b5fbc 100644
--- a/app/code/Magento/Sales/etc/db_schema.xml
+++ b/app/code/Magento/Sales/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="sales_order" resource="sales" engine="innodb" comment="Sales Flat Order">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Entity Id"/>
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
index 807ca7ea4a7..8a8c51e9d34 100644
--- a/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -7,8 +7,8 @@
 namespace Magento\SalesRule\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ConvertSerializedDataToJson
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php b/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
index d3605431543..625d5769fdd 100644
--- a/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\State;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class FillSalesRuleProductAttributeTable
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php b/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
index 4a68a2d42c8..2387f5f1ed7 100644
--- a/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class PrepareRuleModelSerializedData
diff --git a/app/code/Magento/SalesRule/etc/db_schema.xml b/app/code/Magento/SalesRule/etc/db_schema.xml
index ed205d88d9a..3d882ee2eae 100644
--- a/app/code/Magento/SalesRule/etc/db_schema.xml
+++ b/app/code/Magento/SalesRule/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="salesrule" resource="default" engine="innodb" comment="Salesrule">
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Entity Id"/>
diff --git a/app/code/Magento/SalesSequence/Setup/Patch/Schema/CreateSequence.php b/app/code/Magento/SalesSequence/Setup/Patch/Schema/CreateSequence.php
index 7295408f98f..875817a973a 100644
--- a/app/code/Magento/SalesSequence/Setup/Patch/Schema/CreateSequence.php
+++ b/app/code/Magento/SalesSequence/Setup/Patch/Schema/CreateSequence.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\App\State;
 use Magento\SalesSequence\Setup\SequenceCreator;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
-use Magento\Setup\Model\Patch\SchemaPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
 
 /**
  * Class CreateSequence
diff --git a/app/code/Magento/SalesSequence/etc/db_schema.xml b/app/code/Magento/SalesSequence/etc/db_schema.xml
index 1f63c1c93a1..0a2d1cb9e0c 100644
--- a/app/code/Magento/SalesSequence/etc/db_schema.xml
+++ b/app/code/Magento/SalesSequence/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="sales_sequence_profile" resource="sales" engine="innodb" comment="sales_sequence_profile">
         <column xsi:type="int" name="profile_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Id"/>
diff --git a/app/code/Magento/SampleData/Setup/Patch/Data/ClearSampleDataState.php b/app/code/Magento/SampleData/Setup/Patch/Data/ClearSampleDataState.php
index f0f154b477a..2725573b1ab 100644
--- a/app/code/Magento/SampleData/Setup/Patch/Data/ClearSampleDataState.php
+++ b/app/code/Magento/SampleData/Setup/Patch/Data/ClearSampleDataState.php
@@ -7,8 +7,8 @@
 namespace Magento\SampleData\Setup\Patch\Data;
 
 use Magento\Framework\Setup;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ClearSampleDataState
diff --git a/app/code/Magento/Search/etc/db_schema.xml b/app/code/Magento/Search/etc/db_schema.xml
index 54fac0778d4..9b2dfb493db 100644
--- a/app/code/Magento/Search/etc/db_schema.xml
+++ b/app/code/Magento/Search/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="search_query" resource="default" engine="innodb" comment="Search query table">
         <column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Query ID"/>
diff --git a/app/code/Magento/Security/etc/db_schema.xml b/app/code/Magento/Security/etc/db_schema.xml
index 017cdd551dc..f14e6de79e8 100644
--- a/app/code/Magento/Security/etc/db_schema.xml
+++ b/app/code/Magento/Security/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="admin_user_session" resource="default" engine="innodb" comment="Admin User sessions table">
         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Entity ID"/>
diff --git a/app/code/Magento/SendFriend/etc/db_schema.xml b/app/code/Magento/SendFriend/etc/db_schema.xml
index f3c0fb8d06e..7537f67cf55 100644
--- a/app/code/Magento/SendFriend/etc/db_schema.xml
+++ b/app/code/Magento/SendFriend/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="sendfriend_log" resource="default" engine="innodb" comment="Send to friend function log storage table">
         <column xsi:type="int" name="log_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Log ID"/>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
index 344ad2a87e4..9253b47f82f 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
@@ -21,7 +21,7 @@ $fields = [
 ];
 $number = is_object($track) ? $track->getTracking() : $track['number'];
 ?>
-<table class="data table order tracking" id="tracking-table-popup-<?= /* @noEscape */ $number ?>">
+<table class="data table order tracking" id="tracking-table-popup-<?= $block->escapeHtml($number) ?>">
     <caption class="table-caption"><?= $block->escapeHtml(__('Order tracking')) ?></caption>
     <tbody>
     <?php if (is_object($track)): ?>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
index 8a9d5fc0fe3..84126d8eeb6 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
@@ -11,7 +11,7 @@ $parentBlock = $block->getParentBlock();
 $track = $block->getData('track');
 ?>
 <div class="table-wrapper">
-    <table class="data table order tracking" id="track-history-table-<?= /* @noEscape */ $track->getTracking() ?>">
+    <table class="data table order tracking" id="track-history-table-<?= $block->escapeHtml($track->getTracking()) ?>">
         <caption class="table-caption"><?= $block->escapeHtml(__('Track history')) ?></caption>
         <thead>
         <tr>
diff --git a/app/code/Magento/Signifyd/etc/db_schema.xml b/app/code/Magento/Signifyd/etc/db_schema.xml
index 731ae1e94b2..d416112c20d 100644
--- a/app/code/Magento/Signifyd/etc/db_schema.xml
+++ b/app/code/Magento/Signifyd/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="signifyd_case" resource="default" engine="innodb" comment="signifyd_case">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Entity_id"/>
diff --git a/app/code/Magento/Sitemap/etc/db_schema.xml b/app/code/Magento/Sitemap/etc/db_schema.xml
index 4abc9a2fbe0..82a9b8ef514 100644
--- a/app/code/Magento/Sitemap/etc/db_schema.xml
+++ b/app/code/Magento/Sitemap/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="sitemap" resource="default" engine="innodb" comment="XML Sitemap">
         <column xsi:type="int" name="sitemap_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Sitemap Id"/>
diff --git a/app/code/Magento/Store/Model/Config/Placeholder.php b/app/code/Magento/Store/Model/Config/Placeholder.php
index b08e58c59c1..4e4139d47bd 100644
--- a/app/code/Magento/Store/Model/Config/Placeholder.php
+++ b/app/code/Magento/Store/Model/Config/Placeholder.php
@@ -91,8 +91,9 @@ protected function _processPlaceholders($value, $data)
             if ($url) {
                 $value = str_replace('{{' . $placeholder . '}}', $url, $value);
             } elseif (strpos($value, $this->urlPlaceholder) !== false) {
-                // localhost is replaced for cli requests, for http requests method getDistroBaseUrl is used
-                $value = str_replace($this->urlPlaceholder, 'http://localhost/', $value);
+                $distroBaseUrl = $this->request->getDistroBaseUrl();
+
+                $value = str_replace($this->urlPlaceholder, $distroBaseUrl, $value);
             }
 
             if (null !== $this->_getPlaceholder($value)) {
diff --git a/app/code/Magento/Store/Setup/Patch/Data/UpdateStoreGroupCodes.php b/app/code/Magento/Store/Setup/Patch/Data/UpdateStoreGroupCodes.php
index 3d1cba53f82..43fd3f84c2a 100644
--- a/app/code/Magento/Store/Setup/Patch/Data/UpdateStoreGroupCodes.php
+++ b/app/code/Magento/Store/Setup/Patch/Data/UpdateStoreGroupCodes.php
@@ -7,8 +7,8 @@
 namespace Magento\Store\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateStoreGroupCodes
diff --git a/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php b/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
index 506800168ea..a282f2c21ef 100644
--- a/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
+++ b/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
@@ -8,8 +8,8 @@
 
 use Magento\Catalog\Helper\DefaultCategory;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
-use Magento\Setup\Model\Patch\SchemaPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
 
 /**
  * Create stores and websites. Actually stores and websites are part of schema as
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/PlaceholderTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/PlaceholderTest.php
index fd42be4cb8f..e44eacc79b8 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/PlaceholderTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/PlaceholderTest.php
@@ -23,7 +23,7 @@ protected function setUp()
     {
         $this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
         $this->_requestMock->expects(
-            $this->any()
+            $this->once()
         )->method(
             'getDistroBaseUrl'
         )->will(
diff --git a/app/code/Magento/Store/etc/db_schema.xml b/app/code/Magento/Store/etc/db_schema.xml
index e3cd8c8e816..3c2bc3e3c11 100644
--- a/app/code/Magento/Store/etc/db_schema.xml
+++ b/app/code/Magento/Store/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="store_website" resource="default" engine="innodb" comment="Websites">
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="true"
                 comment="Website Id"/>
diff --git a/app/code/Magento/Swatches/Helper/Media.php b/app/code/Magento/Swatches/Helper/Media.php
index baa90343cc4..f3694515ecb 100644
--- a/app/code/Magento/Swatches/Helper/Media.php
+++ b/app/code/Magento/Swatches/Helper/Media.php
@@ -211,7 +211,7 @@ protected function setupImageProperties(\Magento\Framework\Image $image, $isSwat
         if ($isSwatch) {
             $image->keepFrame(true);
             $image->keepTransparency(true);
-            $image->backgroundColor('#FFF');
+            $image->backgroundColor([255, 255, 255]);
         }
         return $this;
     }
diff --git a/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageAttribute.php b/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageAttribute.php
index 760fbc73b90..2dbfeba3a2e 100644
--- a/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageAttribute.php
+++ b/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageAttribute.php
@@ -11,8 +11,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Eav\Setup\EavSetup;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class AddSwatchImageAttribute
diff --git a/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageToDefaultAttribtueSet.php b/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageToDefaultAttribtueSet.php
index edd0bb6df46..ca5a0d38e15 100644
--- a/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageToDefaultAttribtueSet.php
+++ b/app/code/Magento/Swatches/Setup/Patch/Data/AddSwatchImageToDefaultAttribtueSet.php
@@ -9,8 +9,8 @@
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class AddSwatchImageToDefaultAttribtueSet
diff --git a/app/code/Magento/Swatches/Setup/Patch/Data/ConvertAdditionalDataToJson.php b/app/code/Magento/Swatches/Setup/Patch/Data/ConvertAdditionalDataToJson.php
index 0ecd5aa668f..0a37e846c8f 100644
--- a/app/code/Magento/Swatches/Setup/Patch/Data/ConvertAdditionalDataToJson.php
+++ b/app/code/Magento/Swatches/Setup/Patch/Data/ConvertAdditionalDataToJson.php
@@ -9,8 +9,8 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ConvertAdditionalDataToJson
diff --git a/app/code/Magento/Swatches/Setup/Patch/Data/UpdateAdminTextSwatchValues.php b/app/code/Magento/Swatches/Setup/Patch/Data/UpdateAdminTextSwatchValues.php
index abcb67a99d9..d63fbf14256 100644
--- a/app/code/Magento/Swatches/Setup/Patch/Data/UpdateAdminTextSwatchValues.php
+++ b/app/code/Magento/Swatches/Setup/Patch/Data/UpdateAdminTextSwatchValues.php
@@ -11,8 +11,8 @@
 use Zend_Db;
 use Zend_Db_Expr;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateAdminTextSwatchValues
diff --git a/app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php b/app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php
index 7ecfeab53b9..9602291df48 100644
--- a/app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php
@@ -158,6 +158,7 @@ public function testGenerateSwatchVariations()
         $this->imageFactoryMock->expects($this->any())->method('create')->willReturn($image);
         $this->generateImageConfig();
         $image->expects($this->any())->method('resize')->will($this->returnSelf());
+        $image->expects($this->atLeastOnce())->method('backgroundColor')->with([255, 255, 255])->willReturnSelf();
         $this->mediaHelperObject->generateSwatchVariations('/e/a/earth.png');
     }
 
diff --git a/app/code/Magento/Swatches/etc/db_schema.xml b/app/code/Magento/Swatches/etc/db_schema.xml
index 6613c412744..c960f27b0fb 100644
--- a/app/code/Magento/Swatches/etc/db_schema.xml
+++ b/app/code/Magento/Swatches/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalog_eav_attribute" resource="default" comment="Catalog EAV Attribute Table">
         <column xsi:type="text" name="additional_data" nullable="true" comment="Additional swatch attributes data"/>
     </table>
diff --git a/app/code/Magento/Tax/Setup/Patch/Data/AddTaxAttributeAndTaxClasses.php b/app/code/Magento/Tax/Setup/Patch/Data/AddTaxAttributeAndTaxClasses.php
index d6cf3bf6451..8b7b9df9360 100644
--- a/app/code/Magento/Tax/Setup/Patch/Data/AddTaxAttributeAndTaxClasses.php
+++ b/app/code/Magento/Tax/Setup/Patch/Data/AddTaxAttributeAndTaxClasses.php
@@ -8,8 +8,8 @@
 
 use Magento\Directory\Model\RegionFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Tax\Setup\TaxSetup;
 use Magento\Tax\Setup\TaxSetupFactory;
 
diff --git a/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxClassAttributeVisibility.php b/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxClassAttributeVisibility.php
index 840afb270cb..24d21d513ca 100644
--- a/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxClassAttributeVisibility.php
+++ b/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxClassAttributeVisibility.php
@@ -7,8 +7,8 @@
 namespace Magento\Tax\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Tax\Setup\TaxSetup;
 use Magento\Tax\Setup\TaxSetupFactory;
 
diff --git a/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxRegionId.php b/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxRegionId.php
index efe7b04dfb8..d2f5aac4426 100644
--- a/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxRegionId.php
+++ b/app/code/Magento/Tax/Setup/Patch/Data/UpdateTaxRegionId.php
@@ -10,8 +10,8 @@
 use Magento\Framework\Api\Search\SearchCriteriaFactory;
 use Magento\Tax\Api\TaxRateRepositoryInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Tax\Setup\TaxSetupFactory;
 
 class UpdateTaxRegionId implements DataPatchInterface, PatchVersionInterface
diff --git a/app/code/Magento/Tax/etc/db_schema.xml b/app/code/Magento/Tax/etc/db_schema.xml
index bde6879c073..6cc4041f75a 100644
--- a/app/code/Magento/Tax/etc/db_schema.xml
+++ b/app/code/Magento/Tax/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="tax_class" resource="default" engine="innodb" comment="Tax Class">
         <column xsi:type="smallint" name="class_id" padding="6" unsigned="false" nullable="false" identity="true"
                 comment="Class Id"/>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 5409aa1822b..50fa6c425c2 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -38,7 +38,6 @@
 </tr>
 
 <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value != 0): ?>
-    <?php $isTop = 1; ?>
     <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
         <?php if (isset($info['hidden']) && $info['hidden']) {
             continue;
@@ -64,7 +63,6 @@
                 <?php endif; ?>
             </tr>
             <?php $isFirst = 0; ?>
-            <?php $isTop = 0; ?>
         <?php endforeach; ?>
     <?php endforeach; ?>
 <?php endif;?>
diff --git a/app/code/Magento/Theme/Setup/Patch/Data/ConvertSerializedData.php b/app/code/Magento/Theme/Setup/Patch/Data/ConvertSerializedData.php
index 4c3f41faedb..0e132eb429f 100644
--- a/app/code/Magento/Theme/Setup/Patch/Data/ConvertSerializedData.php
+++ b/app/code/Magento/Theme/Setup/Patch/Data/ConvertSerializedData.php
@@ -10,8 +10,8 @@
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ConvertSerializedData
diff --git a/app/code/Magento/Theme/Setup/Patch/Data/RegisterThemes.php b/app/code/Magento/Theme/Setup/Patch/Data/RegisterThemes.php
index 6c75e0b224b..31b6c6b4777 100644
--- a/app/code/Magento/Theme/Setup/Patch/Data/RegisterThemes.php
+++ b/app/code/Magento/Theme/Setup/Patch/Data/RegisterThemes.php
@@ -8,8 +8,8 @@
 
 use Magento\Theme\Model\Theme\Registration;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class RegisterThemes
diff --git a/app/code/Magento/Theme/etc/db_schema.xml b/app/code/Magento/Theme/etc/db_schema.xml
index 62f7135d7b9..ee1185e6e57 100644
--- a/app/code/Magento/Theme/etc/db_schema.xml
+++ b/app/code/Magento/Theme/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="theme" resource="default" engine="innodb" comment="Core theme">
         <column xsi:type="int" name="theme_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Theme identifier"/>
diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv
index daa5c27e75f..2b8765c36d2 100644
--- a/app/code/Magento/Theme/i18n/en_US.csv
+++ b/app/code/Magento/Theme/i18n/en_US.csv
@@ -107,7 +107,7 @@ Remove,Remove
 "For the best experience on our site, be sure to turn on Javascript in your browser.","For the best experience on our site, be sure to turn on Javascript in your browser."
 "Local Storage seems to be disabled in your browser.","Local Storage seems to be disabled in your browser."
 "For the best experience on our site, be sure to turn on Local Storage in your browser.","For the best experience on our site, be sure to turn on Local Storage in your browser."
-"This is demo store. No orders will be fulfilled.","This is demo store. No orders will be fulfilled."
+"This is a demo store. No orders will be fulfilled.","This is a demo store. No orders will be fulfilled."
 "Items %1 to %2 of %3 total","Items %1 to %2 of %3 total"
 "%1 Item","%1 Item"
 "%1 Item(s)","%1 Item(s)"
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
index 3e74362851c..720ee440079 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
@@ -54,7 +54,7 @@ require(['jquery'], function(jQuery){
 <?php if ($block->displayDemoNotice()): ?>
     <div class="message global demo">
         <div class="content">
-            <p><?= /* @escapeNotVerified */ __('This is demo store. No orders will be fulfilled.') ?></p>
+            <p><?= /* @escapeNotVerified */ __('This is a demo store. No orders will be fulfilled.') ?></p>
         </div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
index 06da0c7c0af..a73d4ee99b5 100644
--- a/app/code/Magento/Translation/Model/Js/DataProvider.php
+++ b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -113,7 +113,7 @@ public function getData($themePath)
                     }
                 } catch (\Exception $e) {
                     throw new LocalizedException(
-                        sprintf(__('Error while translating phrase "%s" in file %s.'), $phrase, $filePath[0])
+                        __('Error while translating phrase "%s" in file %s.', $phrase, $filePath[0])
                     );
                 }
             }
@@ -145,7 +145,7 @@ protected function getPhrases($content)
             }
             if (false === $result) {
                 throw new LocalizedException(
-                    sprintf(__('Error while generating js translation dictionary: "%s"'), error_get_last())
+                    __('Error while generating js translation dictionary: "%s"', error_get_last())
                 );
             }
         }
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
index 26ea51babc5..021709bdda1 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Translation\Test\Unit\Model\Js;
 
 use Magento\Framework\App\State;
@@ -148,4 +149,39 @@ public function testGetData()
 
         $this->assertEquals($expectedResult, $this->model->getData($themePath));
     }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testGetDataThrowingException()
+    {
+        $themePath = 'blank';
+        $areaCode = 'adminhtml';
+
+        $patterns = ['~\$\.mage\.__\(([\'"])(.+?)\1\)~'];
+
+        $this->fileReadMock->expects($this->once())
+            ->method('readAll')
+            ->willReturn('content1$.mage.__("hello1")content1');
+
+        $this->appStateMock->expects($this->once())
+            ->method('getAreaCode')
+            ->willReturn($areaCode);
+        $this->filesUtilityMock->expects($this->any())
+            ->method('getJsFiles')
+            ->willReturn(['test']);
+        $this->filesUtilityMock->expects($this->any())
+            ->method('getStaticHtmlFiles')
+            ->willReturn(['test']);
+
+        $this->configMock->expects($this->any())
+            ->method('getPatterns')
+            ->willReturn($patterns);
+
+        $this->translateMock->expects($this->once())
+            ->method('render')
+            ->willThrowException(new \Exception('Test exception'));
+
+        $this->model->getData($themePath);
+    }
 }
diff --git a/app/code/Magento/Translation/etc/db_schema.xml b/app/code/Magento/Translation/etc/db_schema.xml
index 633a7a6d3dd..523ef3a1279 100644
--- a/app/code/Magento/Translation/etc/db_schema.xml
+++ b/app/code/Magento/Translation/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="translation" resource="default" engine="innodb" comment="Translations">
         <column xsi:type="int" name="key_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Key Id of Translation"/>
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Input.php b/app/code/Magento/Ui/Component/Filters/Type/Input.php
index cbcb33ffcca..9cc060ae581 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Input.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Input.php
@@ -65,7 +65,7 @@ public function prepare()
     protected function applyFilter()
     {
         if (isset($this->filterData[$this->getName()])) {
-            $value = $this->filterData[$this->getName()];
+            $value = str_replace(['%', '_'], ['\%', '\_'], $this->filterData[$this->getName()]);
 
             if (!empty($value)) {
                 $filter = $this->filterBuilder->setConditionType('like')
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
index cda3106a14f..e249a64861d 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
@@ -80,7 +80,9 @@ public function getDocumentElement()
      */
     public function appendLayoutConfiguration()
     {
-        $layoutConfiguration = $this->wrapContent(json_encode($this->structure->generate($this->component)));
+        $layoutConfiguration = $this->wrapContent(
+            json_encode($this->structure->generate($this->component), JSON_HEX_TAG)
+        );
         $this->template->append($layoutConfiguration);
     }
 
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
index ed571f44dd6..d814fdcd153 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
@@ -111,8 +111,7 @@ public function testPrepare($name, $filterData, $expectedCondition)
             ->method('addComponentDefinition')
             ->with(Input::NAME, ['extends' => Input::NAME]);
         $this->contextMock->expects($this->any())
-            ->method('getRequestParam')
-            ->with(UiContext::FILTER_VAR)
+            ->method('getFiltersParams')
             ->willReturn($filterData);
         $dataProvider = $this->getMockForAbstractClass(
             \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class,
@@ -120,20 +119,41 @@ public function testPrepare($name, $filterData, $expectedCondition)
             '',
             false
         );
+
         $this->contextMock->expects($this->any())
             ->method('getDataProvider')
             ->willReturn($dataProvider);
-        if ($expectedCondition !== null) {
-            $dataProvider->expects($this->any())
-                ->method('addFilter')
-                ->with($expectedCondition, $name);
-        }
 
         $this->uiComponentFactory->expects($this->any())
             ->method('create')
             ->with($name, Input::COMPONENT, ['context' => $this->contextMock])
             ->willReturn($uiComponent);
 
+        if ($expectedCondition !== null) {
+            $this->filterBuilderMock->expects($this->once())
+                ->method('setConditionType')
+                ->with('like')
+                ->willReturnSelf();
+
+            $this->filterBuilderMock->expects($this->once())
+                ->method('setField')
+                ->with($name)
+                ->willReturnSelf();
+
+            $this->filterBuilderMock->expects($this->once())
+                ->method('setValue')
+                ->with($expectedCondition['like'])
+                ->willReturnSelf();
+
+            $filterMock = $this->getMockBuilder(\Magento\Framework\Api\Filter::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->filterBuilderMock->expects($this->once())
+                ->method('create')
+                ->willReturn($filterMock);
+        }
+
         $date = new Input(
             $this->contextMock,
             $this->uiComponentFactory,
@@ -160,7 +180,12 @@ public function getPrepareDataProvider()
             [
                 'test_date',
                 ['test_date' => 'some_value'],
-                ['like' => '%some_value%'],
+                ['like' => '%some\_value%'],
+            ],
+            [
+                'test_date',
+                ['test_date' => '%'],
+                ['like' => '%\%%'],
             ],
         ];
     }
diff --git a/app/code/Magento/Ui/etc/db_schema.xml b/app/code/Magento/Ui/etc/db_schema.xml
index c5e53922774..d07329df9eb 100644
--- a/app/code/Magento/Ui/etc/db_schema.xml
+++ b/app/code/Magento/Ui/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="ui_bookmark" resource="default" engine="innodb" comment="Bookmark">
         <column xsi:type="int" name="bookmark_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Bookmark identifier"/>
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
index dc5c2389ba8..de899fd8f2e 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
@@ -23,12 +23,10 @@ define([
             value: '',
             $wysiwygEditorButton: '',
             links: {
-                value: '${ $.provider }:${ $.dataScope }',
-                stageActive: false
+                value: '${ $.provider }:${ $.dataScope }'
             },
             template: 'ui/form/field',
             elementTmpl: 'ui/form/element/wysiwyg',
-            stageActive: false,
             content:        '',
             showSpinner:    false,
             loading:        false,
@@ -49,7 +47,8 @@ define([
                 component: this,
                 selector: 'button'
             }, function (element) {
-                this.$wysiwygEditorButton = $(element);
+                this.$wysiwygEditorButton = this.$wysiwygEditorButton ?
+                    this.$wysiwygEditorButton.add($(element)) : $(element);
             }.bind(this));
 
             // disable editor completely after initialization is field is disabled
@@ -110,7 +109,6 @@ define([
 
             /* eslint-disable no-undef */
             if (typeof wysiwyg !== 'undefined' && wysiwyg.activeEditor()) {
-
                 if (wysiwyg && disabled) {
                     wysiwyg.setEnabledStatus(false);
                     wysiwyg.getPluginButtons().prop('disabled', 'disabled');
diff --git a/app/code/Magento/UrlRewrite/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/UrlRewrite/Setup/Patch/Data/ConvertSerializedDataToJson.php
index 6725aa1f826..badd645b85f 100644
--- a/app/code/Magento/UrlRewrite/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/UrlRewrite/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -9,8 +9,8 @@
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ConvertSerializedDataToJson
diff --git a/app/code/Magento/UrlRewrite/etc/db_schema.xml b/app/code/Magento/UrlRewrite/etc/db_schema.xml
index a4f73a6a3a7..af328873dee 100644
--- a/app/code/Magento/UrlRewrite/etc/db_schema.xml
+++ b/app/code/Magento/UrlRewrite/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="url_rewrite" resource="default" engine="innodb" comment="Url Rewrites">
         <column xsi:type="int" name="url_rewrite_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Rewrite Id"/>
diff --git a/app/code/Magento/User/Setup/Patch/Data/UpgradePasswordHashes.php b/app/code/Magento/User/Setup/Patch/Data/UpgradePasswordHashes.php
index 82e230d3c1a..0359d9b0499 100644
--- a/app/code/Magento/User/Setup/Patch/Data/UpgradePasswordHashes.php
+++ b/app/code/Magento/User/Setup/Patch/Data/UpgradePasswordHashes.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpgradePasswordHashes
diff --git a/app/code/Magento/User/Setup/Patch/Data/UpgradeSerializedFields.php b/app/code/Magento/User/Setup/Patch/Data/UpgradeSerializedFields.php
index 568f365ee14..78c250e4414 100644
--- a/app/code/Magento/User/Setup/Patch/Data/UpgradeSerializedFields.php
+++ b/app/code/Magento/User/Setup/Patch/Data/UpgradeSerializedFields.php
@@ -9,8 +9,8 @@
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpgradeSerializedFields
diff --git a/app/code/Magento/User/etc/db_schema.xml b/app/code/Magento/User/etc/db_schema.xml
index 030df49ac36..df9b39a2788 100644
--- a/app/code/Magento/User/etc/db_schema.xml
+++ b/app/code/Magento/User/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="admin_user" resource="default" engine="innodb" comment="Admin User Table">
         <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="User ID"/>
diff --git a/app/code/Magento/Usps/Setup/Patch/Data/UpdateAllowedMethods.php b/app/code/Magento/Usps/Setup/Patch/Data/UpdateAllowedMethods.php
index 772f7cfb1a3..913819a5c1a 100644
--- a/app/code/Magento/Usps/Setup/Patch/Data/UpdateAllowedMethods.php
+++ b/app/code/Magento/Usps/Setup/Patch/Data/UpdateAllowedMethods.php
@@ -7,8 +7,8 @@
 namespace Magento\Usps\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateAllowedMethods
diff --git a/app/code/Magento/Variable/etc/db_schema.xml b/app/code/Magento/Variable/etc/db_schema.xml
index 506034cd3a4..d89bdb7e710 100644
--- a/app/code/Magento/Variable/etc/db_schema.xml
+++ b/app/code/Magento/Variable/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="variable" resource="default" engine="innodb" comment="Variables">
         <column xsi:type="int" name="variable_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Variable Id"/>
diff --git a/app/code/Magento/Vault/Setup/Patch/Data/SetCreditCardAsDefaultTokenType.php b/app/code/Magento/Vault/Setup/Patch/Data/SetCreditCardAsDefaultTokenType.php
index c2f7cca8b70..dbea50fc9c5 100644
--- a/app/code/Magento/Vault/Setup/Patch/Data/SetCreditCardAsDefaultTokenType.php
+++ b/app/code/Magento/Vault/Setup/Patch/Data/SetCreditCardAsDefaultTokenType.php
@@ -9,8 +9,8 @@
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Model\CreditCardTokenFactory;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class SetCreditCardAsDefaultTokenType
diff --git a/app/code/Magento/Vault/etc/db_schema.xml b/app/code/Magento/Vault/etc/db_schema.xml
index 8c53e06c18b..69753691457 100644
--- a/app/code/Magento/Vault/etc/db_schema.xml
+++ b/app/code/Magento/Vault/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="vault_payment_token" resource="default" engine="innodb" comment="Vault tokens of payment">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Entity Id"/>
diff --git a/app/code/Magento/Weee/Setup/Patch/Data/InitQuoteAndOrderAttributes.php b/app/code/Magento/Weee/Setup/Patch/Data/InitQuoteAndOrderAttributes.php
index d2947686b9a..c89b6b590bc 100644
--- a/app/code/Magento/Weee/Setup/Patch/Data/InitQuoteAndOrderAttributes.php
+++ b/app/code/Magento/Weee/Setup/Patch/Data/InitQuoteAndOrderAttributes.php
@@ -10,8 +10,8 @@
 use Magento\Quote\Setup\QuoteSetupFactory;
 use Magento\Sales\Setup\SalesSetup;
 use Magento\Sales\Setup\SalesSetupFactory;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InitQuoteAndOrderAttributes
diff --git a/app/code/Magento/Weee/etc/db_schema.xml b/app/code/Magento/Weee/etc/db_schema.xml
index b53cf51a593..71d957ecaf5 100644
--- a/app/code/Magento/Weee/etc/db_schema.xml
+++ b/app/code/Magento/Weee/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="weee_tax" resource="default" engine="innodb" comment="Weee Tax">
         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
                 comment="Value Id"/>
diff --git a/app/code/Magento/Widget/Setup/Patch/Data/ConvertSerializedData.php b/app/code/Magento/Widget/Setup/Patch/Data/ConvertSerializedData.php
index 1791897b3f7..b72e024c934 100644
--- a/app/code/Magento/Widget/Setup/Patch/Data/ConvertSerializedData.php
+++ b/app/code/Magento/Widget/Setup/Patch/Data/ConvertSerializedData.php
@@ -11,8 +11,8 @@
 use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Widget\Setup\LayoutUpdateConverter;
 
 /**
diff --git a/app/code/Magento/Widget/Setup/Patch/Data/UpgradeModelInstanceClassAliases.php b/app/code/Magento/Widget/Setup/Patch/Data/UpgradeModelInstanceClassAliases.php
index 0a82e5fa223..d9890c98a8d 100644
--- a/app/code/Magento/Widget/Setup/Patch/Data/UpgradeModelInstanceClassAliases.php
+++ b/app/code/Magento/Widget/Setup/Patch/Data/UpgradeModelInstanceClassAliases.php
@@ -7,8 +7,8 @@
 namespace Magento\Widget\Setup\Patch\Data;
 
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpgradeModelInstanceClassAliases
diff --git a/app/code/Magento/Widget/etc/db_schema.xml b/app/code/Magento/Widget/etc/db_schema.xml
index c92d63b4063..149bb27fcdb 100644
--- a/app/code/Magento/Widget/etc/db_schema.xml
+++ b/app/code/Magento/Widget/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="widget" resource="default" engine="innodb" comment="Preconfigured Widgets">
         <column xsi:type="int" name="widget_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Widget Id"/>
diff --git a/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php b/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php
index 62b50c3e539..76f27756d82 100644
--- a/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php
+++ b/app/code/Magento/Wishlist/Setup/Patch/Data/ConvertSerializedData.php
@@ -11,8 +11,8 @@
 use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ConvertSerializedData
diff --git a/app/code/Magento/Wishlist/etc/db_schema.xml b/app/code/Magento/Wishlist/etc/db_schema.xml
index d837037c446..73fcb7ce0ca 100644
--- a/app/code/Magento/Wishlist/etc/db_schema.xml
+++ b/app/code/Magento/Wishlist/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="wishlist" resource="default" engine="innodb" comment="Wishlist main Table">
         <column xsi:type="int" name="wishlist_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Wishlist ID"/>
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
index 5364c48acb5..2db39c8c8b2 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
@@ -106,6 +106,11 @@
         .lib-dropdown(
         @_toggle-selector: ~'.action.showcart',
         @_options-selector: ~'.block-minicart',
+        @_dropdown-list-width: 320px,
+        @_dropdown-list-position-right: 0px,
+        @_dropdown-list-pointer-position: right,
+        @_dropdown-list-pointer-position-left-right: 26px,
+        @_dropdown-list-z-index: 101,   
         @_dropdown-toggle-icon-content: @icon-cart,
         @_dropdown-toggle-active-icon-content: @icon-cart,
         @_dropdown-list-item-padding: false,
@@ -121,23 +126,10 @@
 
         .block-minicart {
             .lib-css(padding, 25px @minicart__padding-horizontal);
-            right: 0;
-            width: 320px;
-            z-index: 101;
 
             .block-title {
                 display: none;
             }
-
-            &:after {
-                left: auto;
-                right: 25px;
-            }
-
-            &:before {
-                left: auto;
-                right: 26px;
-            }
         }
 
         .product {
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
index c58cfcd734e..5f8134193c6 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -162,6 +162,11 @@
             .lib-css(margin, 0 -(@checkout-payment-method-title-mobile__padding));
         }
 
+        .step-title {
+            .lib-css(padding-left, @checkout-payment-method-title-mobile__padding);
+            .lib-css(padding-right, @checkout-payment-method-title-mobile__padding)
+        }
+
         .payment-method-title {
             .lib-css(padding, @checkout-payment-method-title-mobile__padding)
         }
diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index d2a77081586..4499886ef0f 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -93,7 +93,7 @@
         .switcher {
             border-top: 1px solid @color-gray82;
             font-size: 1.6rem;
-            font-weight: 700;
+            font-weight: @font-weight__bold;
             margin: 0;
             padding: .8rem 3.5rem .8rem 2rem;
 
@@ -147,7 +147,7 @@
 
                 &.greet.welcome {
                     border-top: 1px solid @color-gray82;
-                    font-weight: 700;
+                    font-weight: @font-weight__bold;
                     padding: .8rem @indent__base;
                 }
 
@@ -161,7 +161,7 @@
                 .lib-css(color, @navigation-level0-item__color);
                 .lib-css(text-decoration, @navigation-level0-item__text-decoration);
                 display: block;
-                font-weight: 700;
+                font-weight: @font-weight__bold;
                 padding: .8rem @indent__base;
             }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
index 1765ef65f95..7cd3eed53d3 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
@@ -109,6 +109,11 @@
         .lib-dropdown(
         @_toggle-selector: ~'.action.showcart',
         @_options-selector: ~'.block-minicart',
+        @_dropdown-list-width: 320px,
+        @_dropdown-list-position-right: 0px,
+        @_dropdown-list-pointer-position: right,
+        @_dropdown-list-pointer-position-left-right: 26px,
+        @_dropdown-list-z-index: 101,              
         @_dropdown-toggle-icon-content: @icon-cart,
         @_dropdown-toggle-active-icon-content: @icon-cart,
         @_dropdown-list-item-padding: false,
@@ -124,23 +129,10 @@
 
         .block-minicart {
             .lib-css(padding, 25px @minicart__padding-horizontal);
-            right: 0;
-            width: 320px;
-            z-index: 101;
-
+            
             .block-title {
                 display: none;
             }
-
-            &:after {
-                left: auto;
-                right: 25px;
-            }
-
-            &:before {
-                left: auto;
-                right: 26px;
-            }
         }
 
         .product {
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
index 087f9c9fe65..3136056d942 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -162,6 +162,11 @@
             .lib-css(margin, 0 -(@checkout-payment-method-title-mobile__padding));
         }
 
+        .step-title {
+            .lib-css(padding-left, @checkout-payment-method-title-mobile__padding);
+            .lib-css(padding-right, @checkout-payment-method-title-mobile__padding)
+        }
+
         .payment-method-title {
             .lib-css(padding, @checkout-payment-method-title-mobile__padding)
         }
diff --git a/app/registration.php b/app/etc/NonComposerComponentRegistration.php
similarity index 86%
rename from app/registration.php
rename to app/etc/NonComposerComponentRegistration.php
index fdfe4aa45b4..c7c1f675463 100755
--- a/app/registration.php
+++ b/app/etc/NonComposerComponentRegistration.php
@@ -17,8 +17,8 @@
  */
 function main()
 {
-    $globPatterns = require __DIR__ . '/etc/registration_globlist.php';
-    $baseDir = dirname(__DIR__) . '/';
+    $globPatterns = require __DIR__ . '/registration_globlist.php';
+    $baseDir = dirname(dirname(__DIR__)) . '/';
 
     foreach ($globPatterns as $globPattern) {
         // Sorting is disabled intentionally for performance improvement
diff --git a/app/etc/db_schema.xml b/app/etc/db_schema.xml
index 64573fb6ced..be13c28ee02 100644
--- a/app/etc/db_schema.xml
+++ b/app/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="patch_list" resource="default" comment="List of data/schema patches">
         <column xsi:type="int" name="patch_id" identity="true" comment="Patch Auto Increment" />
         <column xsi:type="varchar" name="patch_name" length="1024" nullable="false" comment="Patch Class Name" />
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 5d49b5d26a5..e43a019697b 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -176,10 +176,32 @@
     <preference for="Magento\Framework\View\Element\Message\InterpretationStrategyInterface" type="Magento\Framework\View\Element\Message\InterpretationMediator" />
     <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\Setup\Model\Declaration\Schema\Db\DbSchemaReaderInterface" type="Magento\Setup\Model\Declaration\Schema\Db\MySQL\DbSchemaReader" />
-    <preference for="Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface" type="Magento\Setup\Model\Declaration\Schema\Db\MySQL\DbSchemaWriter" />
-    <preference for="Magento\Setup\Model\Declaration\Schema\SchemaConfigInterface" type="Magento\Setup\Model\Declaration\Schema\SchemaConfig" />
-    <preference for="Magento\Setup\Model\Declaration\Schema\DataSavior\DumpAccessorInterface" type="Magento\Setup\Model\Declaration\Schema\FileSystem\Csv" />
+    <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" />
+    <preference for="Magento\Framework\Setup\Declaration\Schema\DataSavior\DumpAccessorInterface" type="Magento\Framework\Setup\Declaration\Schema\FileSystem\Csv" />
+    <preference for="Magento\Framework\MessageQueue\PublisherInterface" type="Magento\Framework\MessageQueue\PublisherPool" />
+    <preference for="Magento\Framework\MessageQueue\BulkPublisherInterface" type="Magento\Framework\MessageQueue\Bulk\PublisherPool" />
+    <preference for="Magento\Framework\MessageQueue\MessageIdGeneratorInterface" type="Magento\Framework\MessageQueue\MessageIdGenerator" />
+    <preference for="Magento\Framework\MessageQueue\Consumer\ConfigInterface" type="Magento\Framework\MessageQueue\Consumer\Config" />
+    <preference for="Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\HandlerInterface" type="Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler" />
+    <preference for="Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface" type="Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem" />
+    <preference for="Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface" type="Magento\Framework\MessageQueue\Consumer\Config\CompositeValidator" />
+    <preference for="Magento\Framework\MessageQueue\Consumer\Config\ReaderInterface" type="Magento\Framework\MessageQueue\Consumer\Config\CompositeReader" />
+    <preference for="Magento\Framework\Amqp\Topology\BindingInstallerInterface" type="Magento\Framework\Amqp\Topology\BindingInstaller" />
+    <preference for="Magento\Framework\MessageQueue\Topology\ConfigInterface" type="Magento\Framework\MessageQueue\Topology\Config" />
+    <preference for="Magento\Framework\MessageQueue\Topology\Config\ReaderInterface" type="Magento\Framework\MessageQueue\Topology\Config\CompositeReader" />
+    <preference for="Magento\Framework\MessageQueue\Topology\Config\ValidatorInterface" type="Magento\Framework\MessageQueue\Topology\Config\CompositeValidator" />
+    <preference for="Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemInterface" type="Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem" />
+    <preference for="Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface" type="Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding" />
+    <preference for="Magento\Framework\MessageQueue\Publisher\ConfigInterface" type="Magento\Framework\MessageQueue\Publisher\Config" />
+    <preference for="Magento\Framework\MessageQueue\Publisher\Config\ReaderInterface" type="Magento\Framework\MessageQueue\Publisher\Config\CompositeReader" />
+    <preference for="Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface" type="Magento\Framework\MessageQueue\Publisher\Config\CompositeValidator" />
+    <preference for="Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface" type="Magento\Framework\MessageQueue\Publisher\Config\PublisherConnection" />
+    <preference for="Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemInterface" type="Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem" />
+    <preference for="Magento\Framework\MessageQueue\ExchangeFactoryInterface" type="Magento\Framework\MessageQueue\ExchangeFactory" />
+    <preference for="Magento\Framework\MessageQueue\Bulk\ExchangeFactoryInterface" type="Magento\Framework\MessageQueue\Bulk\ExchangeFactory" />
+    <preference for="Magento\Framework\MessageQueue\QueueFactoryInterface" type="Magento\Framework\MessageQueue\QueueFactory" />
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Acl\Data\Cache">
         <arguments>
@@ -207,6 +229,10 @@
                     <item name="reader" xsi:type="object">Magento\Framework\Communication\Config\Reader\EnvReader</item>
                     <item name="sortOrder" xsi:type="string">20</item>
                 </item>
+                <item name="remoteServiceReader" xsi:type="array">
+                    <item name="reader" xsi:type="object">Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader\Communication</item>
+                    <item name="sortOrder" xsi:type="string">5</item>
+                </item>
             </argument>
         </arguments>
     </type>
@@ -697,6 +723,7 @@
                 <item name="searchResults" xsi:type="string">\Magento\Framework\Api\Code\Generator\SearchResults</item>
                 <item name="extensionInterface" xsi:type="string">\Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceGenerator</item>
                 <item name="extension" xsi:type="string">\Magento\Framework\Api\Code\Generator\ExtensionAttributesGenerator</item>
+                <item name="remote" xsi:type="string">\Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator</item>
             </argument>
         </arguments>
     </type>
@@ -1353,121 +1380,116 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Setup\Model\Declaration\Schema\Dto\ElementFactory">
+    <type name="Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory">
         <arguments>
             <argument name="typeFactories" xsi:type="array">
-                <item name="table" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Table</item>
-                <item name="decimal" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Real</item>
-                <item name="float" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Real</item>
-                <item name="double" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Real</item>
-                <item name="smallint" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Integer</item>
-                <item name="tinyint" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Integer</item>
-                <item name="bigint" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Integer</item>
-                <item name="int" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Integer</item>
-                <item name="date" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Date</item>
-                <item name="timestamp" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Timestamp</item>
-                <item name="datetime" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Timestamp</item>
-                <item name="longtext" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\LongText</item>
-                <item name="mediumtext" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\MediumText</item>
-                <item name="text" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Text</item>
-                <item name="varchar" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\StringBinary</item>
-                <item name="varbinary" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\StringBinary</item>
-                <item name="blob" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Blob</item>
-                <item name="mediumblob" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\MediumBlob</item>
-                <item name="longblob" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\LongBlob</item>
-                <item name="boolean" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Boolean</item>
-                <item name="unique" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Unique</item>
-                <item name="primary" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Primary</item>
-                <item name="foreign" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Foreign</item>
-                <item name="index" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Dto\Factories\Index</item>
+                <item name="table" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table</item>
+                <item name="decimal" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real</item>
+                <item name="float" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real</item>
+                <item name="double" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Real</item>
+                <item name="smallint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer</item>
+                <item name="tinyint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer</item>
+                <item name="bigint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer</item>
+                <item name="int" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Integer</item>
+                <item name="date" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Date</item>
+                <item name="timestamp" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Timestamp</item>
+                <item name="datetime" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Timestamp</item>
+                <item name="longtext" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\LongText</item>
+                <item name="mediumtext" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\MediumText</item>
+                <item name="text" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Text</item>
+                <item name="varchar" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary</item>
+                <item name="varbinary" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\StringBinary</item>
+                <item name="blob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Blob</item>
+                <item name="mediumblob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\MediumBlob</item>
+                <item name="longblob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\LongBlob</item>
+                <item name="boolean" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Boolean</item>
+                <item name="unique" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Unique</item>
+                <item name="primary" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Primary</item>
+                <item name="foreign" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Foreign</item>
+                <item name="index" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Index</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator">
+    <type name="Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator">
         <arguments>
             <argument name="definitionProcessors" xsi:type="array">
-                <item name="boolean" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean</item>
-                <item name="int" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
-                <item name="smallint" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
-                <item name="tinyint" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
-                <item name="bigint" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
-                <item name="decimal" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Real</item>
-                <item name="float" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Real</item>
-                <item name="double" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Real</item>
-                <item name="text" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
-                <item name="blob" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
-                <item name="mediumblob" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
-                <item name="longblob" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
-                <item name="mediumtext" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
-                <item name="longtext" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
-                <item name="datetime" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp</item>
-                <item name="date" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Date</item>
-                <item name="timestamp" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp</item>
-                <item name="char" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
-                <item name="varchar" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
-                <item name="binary" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
-                <item name="varbinary" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
-                <item name="index" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Index</item>
-                <item name="unique" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal</item>
-                <item name="primary" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal</item>
-                <item name="constraint" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal</item>
-                <item name="reference" xsi:type="object">\Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Constraints\ForeignKey</item>
+                <item name="boolean" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean</item>
+                <item name="int" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
+                <item name="smallint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
+                <item name="tinyint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
+                <item name="bigint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer</item>
+                <item name="decimal" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real</item>
+                <item name="float" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real</item>
+                <item name="double" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real</item>
+                <item name="text" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="blob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="mediumblob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="longblob" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="mediumtext" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="longtext" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob</item>
+                <item name="datetime" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp</item>
+                <item name="date" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Date</item>
+                <item name="timestamp" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp</item>
+                <item name="char" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
+                <item name="varchar" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
+                <item name="binary" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
+                <item name="varbinary" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary</item>
+                <item name="index" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Index</item>
+                <item name="unique" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal</item>
+                <item name="primary" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal</item>
+                <item name="constraint" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal</item>
+                <item name="reference" xsi:type="object">\Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\ForeignKey</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Setup\Model\Declaration\Schema\Operations\AddColumn">
+    <type name="Magento\Framework\Setup\Declaration\Schema\Operations\AddColumn">
         <arguments>
             <argument name="triggers" xsi:type="array">
-                <item name="migrateDataFromSameTable" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataFrom</item>
-                <item name="migrateDataFromAnotherTable" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataFromAnotherTable</item>
+                <item name="migrateDataFromSameTable" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataFrom</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Setup\Model\Declaration\Schema\Operations\CreateTable">
-        <arguments>
-            <argument name="triggers" xsi:type="array">
-                <item name="migrateDataFromAnotherTable" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataFromAnotherTable</item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\Setup\Model\Declaration\Schema\Declaration\ReaderComposite">
+    <type name="Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite">
         <arguments>
             <argument name="readers" xsi:type="array">
-                <item name="xml" xsi:type="object">Magento\Setup\Model\Declaration\Schema\FileSystem\XmlReader</item>
+                <item name="xml" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\FileSystem\XmlReader</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Setup\Model\Declaration\Schema\OperationsExecutor">
+    <type name="Magento\Framework\Setup\Declaration\Schema\OperationsExecutor">
         <arguments>
             <argument name="operations" xsi:type="array">
-                <item name="recreate_table" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Operations\ReCreateTable</item>
-                <item name="drop_table" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Operations\DropTable</item>
-                <item name="create_table" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Operations\CreateTable</item>
-                <item name="drop_reference" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Operations\DropReference</item>
-                <item name="modify_column" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Operations\ModifyColumn</item>
-                <item name="add_column" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Operations\AddColumn</item>
-                <item name="drop_element" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Operations\DropElement</item>
-                <item name="add_complex_element" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Operations\AddComplexElement</item>
-                <item name="modify_table" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Operations\ModifyTable</item>
+                <item name="recreate_table" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\ReCreateTable</item>
+                <item name="drop_table" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\DropTable</item>
+                <item name="create_table" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\CreateTable</item>
+                <item name="drop_reference" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\DropReference</item>
+                <item name="modify_column" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\ModifyColumn</item>
+                <item name="add_column" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\AddColumn</item>
+                <item name="drop_element" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\DropElement</item>
+                <item name="add_complex_element" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\AddComplexElement</item>
+                <item name="modify_table" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Operations\ModifyTable</item>
             </argument>
             <argument name="dataSaviorsCollection" xsi:type="array">
-                <item name="table_savior" xsi:type="object">Magento\Setup\Model\Declaration\Schema\DataSavior\TableSavior</item>
-                <item name="column_savior" xsi:type="object">Magento\Setup\Model\Declaration\Schema\DataSavior\ColumnSavior</item>
+                <item name="table_savior" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\DataSavior\TableSavior</item>
+                <item name="column_savior" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\DataSavior\ColumnSavior</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Setup\Model\Declaration\Schema\Sharding">
+    <type name="Magento\Framework\Setup\Declaration\Schema\Sharding">
         <arguments>
             <argument name="resources" xsi:type="array">
                 <item name="default" xsi:type="string">default</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Setup\Model\Declaration\Schema\Declaration\ValidationComposite">
+    <type name="Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationComposite">
         <arguments>
             <argument name="rules" xsi:type="array">
-                <item name="check_references" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex</item>
-                <item name="real_types" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules\RealTypes</item>
+                <item name="check_references" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex</item>
+                <item name="real_types" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\RealTypes</item>
+                <item name="check_primary_key" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\PrimaryKeyCanBeCreated</item>
+                <item name="inconsistence_references" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\IncosistentReferenceDefinition</item>
+                <item name="auto_increment_validation" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\AutoIncrementColumnValidation</item>
             </argument>
         </arguments>
     </type>
@@ -1497,20 +1519,132 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="\Magento\Setup\Model\Patch\SchemaPatchReader" type="\Magento\Setup\Model\Patch\PatchReader">
+    <virtualType name="\Magento\Framework\Setup\Patch\SchemaPatchReader" type="\Magento\Framework\Setup\Patch\PatchReader">
         <arguments>
             <argument name="type" xsi:type="string">schema</argument>
         </arguments>
     </virtualType>
-    <virtualType name="\Magento\Setup\Model\Patch\DataPatchReader" type="\Magento\Setup\Model\Patch\PatchReader">
+    <virtualType name="\Magento\Framework\Setup\Patch\DataPatchReader" type="\Magento\Framework\Setup\Patch\PatchReader">
         <arguments>
             <argument name="type" xsi:type="string">data</argument>
         </arguments>
     </virtualType>
-    <type name="\Magento\Setup\Model\Patch\PatchApplier">
+    <type name="\Magento\Framework\Setup\Patch\PatchApplier">
+        <arguments>
+            <argument name="dataPatchReader" xsi:type="object">\Magento\Framework\Setup\Patch\DataPatchReader</argument>
+            <argument name="schemaPatchReader" xsi:type="object">\Magento\Framework\Setup\Patch\SchemaPatchReader</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Setup\Declaration\Schema\Db\SchemaBuilder">
+        <arguments>
+            <argument name="logger" xsi:type="object">\Magento\Framework\Setup\Patch\DataPatchReader</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Config\CompositeReader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="xmlReader" xsi:type="array">
+                    <item name="reader" xsi:type="object">Magento\Framework\MessageQueue\Config\Reader\Xml</item>
+                    <item name="sortOrder" xsi:type="string">10</item>
+                </item>
+                <item name="envReader" xsi:type="array">
+                    <item name="reader" xsi:type="object">Magento\Framework\MessageQueue\Config\Reader\Env</item>
+                    <item name="sortOrder" xsi:type="string">20</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Config\Reader\Xml\CompositeConverter">
+        <arguments>
+            <argument name="converters" xsi:type="array">
+                <item name="topicConfig" xsi:type="array">
+                    <item name="converter" xsi:type="object">Magento\Framework\MessageQueue\Config\Reader\Xml\Converter\TopicConfig</item>
+                    <item name="sortOrder" xsi:type="string">20</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Consumer\Config\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Framework\MessageQueue\Consumer\Config\CompositeReader</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Consumer\Config\CompositeReader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="xmlReader" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Consumer\Config\Xml\Reader</item>
+                <item name="envReader" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Consumer\Config\Env\Reader</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Consumer\Config\CompositeValidator">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="requiredFields" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Consumer\Config\Validator\RequiredFields</item>
+                <item name="fieldTypes" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Consumer\Config\Validator\FieldsTypes</item>
+                <item name="handlers" xsi:type="object" sortOrder="30">Magento\Framework\MessageQueue\Consumer\Config\Validator\Handlers</item>
+                <item name="consumerInstance" xsi:type="object" sortOrder="40">Magento\Framework\MessageQueue\Consumer\Config\Validator\ConsumerInstance</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Publisher\Config\CompositeValidator">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="connectionFormat" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Publisher\Config\Validator\Format</item>
+                <item name="enabledConnection" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Publisher\Config\Validator\EnabledConnection</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Publisher\Config\CompositeReader">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="remoteServiceReader" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Publisher\Config\RemoteService\Reader</item>
+                <item name="xmlReader" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Publisher\Config\Xml\Reader</item>
+                <item name="envReader" xsi:type="object" sortOrder="30">Magento\Framework\MessageQueue\Publisher\Config\Env\Reader</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Topology\Config\CompositeValidator">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="format" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Topology\Config\Validator\Format</item>
+                <item name="fieldsTypes" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Topology\Config\Validator\FieldsTypes</item>
+                <item name="dependantFields" xsi:type="object" sortOrder="30">Magento\Framework\MessageQueue\Topology\Config\Validator\DependentFields</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Topology\Config\CompositeReader">
         <arguments>
-            <argument name="dataPatchReader" xsi:type="object">\Magento\Setup\Model\Patch\DataPatchReader</argument>
-            <argument name="schemaPatchReader" xsi:type="object">\Magento\Setup\Model\Patch\SchemaPatchReader</argument>
+            <argument name="readers" xsi:type="array">
+                <item name="remoteServiceReader" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Topology\Config\RemoteService\Reader</item>
+                <item name="xmlReader" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Topology\Config\Xml\Reader</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Amqp\Topology\BindingInstaller">
+        <arguments>
+            <argument name="installers" xsi:type="array">
+                <item name="queue" xsi:type="object">Magento\Framework\Amqp\Topology\BindingInstallerType\Queue</item>
+                <item name="exchange" xsi:type="object">Magento\Framework\Amqp\Topology\BindingInstallerType\Exchange</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Config\Reader\Env\Converter\Publisher">
+        <arguments>
+            <argument name="connectionToExchangeMap" xsi:type="array">
+                <item name="amqp" xsi:type="string">magento</item>
+                <item name="db" xsi:type="string">magento-db</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\MessageQueue\Publisher\Config\Env\Reader">
+        <arguments>
+            <argument name="publisherNameToConnectionMap" xsi:type="array">
+                <item name="amqp-magento" xsi:type="string">amqp</item>
+                <item name="db-magento-db" xsi:type="string">db</item>
+            </argument>
         </arguments>
     </type>
+    <!-- \Magento\Framework\MessageQueue\Bulk\PublisherPool is @api -->
+    <virtualType name="Magento\Framework\MessageQueue\Bulk\PublisherPool" type="Magento\Framework\MessageQueue\PublisherPool" />
 </config>
diff --git a/composer.json b/composer.json
index 95f6dea8a55..863c0a25c0b 100644
--- a/composer.json
+++ b/composer.json
@@ -42,6 +42,7 @@
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
         "pelago/emogrifier": "^2.0.0",
+        "php-amqplib/php-amqplib": "2.5.*",
         "phpseclib/phpseclib": "2.0.*",
         "ramsey/uuid": "3.6.1",
         "symfony/console": "~2.3, !=2.7.0",
@@ -90,7 +91,9 @@
         "magento/module-marketplace": "100.3.0-dev",
         "magento/module-admin-notification": "100.3.0-dev",
         "magento/module-advanced-pricing-import-export": "100.3.0-dev",
+        "magento/module-amqp": "100.3.0-dev",
         "magento/module-analytics": "100.3.0-dev",
+        "magento/module-asynchronous-operations": "100.3.0-dev",
         "magento/module-authorization": "100.3.0-dev",
         "magento/module-authorizenet": "100.3.0-dev",
         "magento/module-backend": "100.3.0-dev",
@@ -160,8 +163,10 @@
         "magento/module-integration": "100.3.0-dev",
         "magento/module-layered-navigation": "100.3.0-dev",
         "magento/module-media-storage": "100.3.0-dev",
+        "magento/module-message-queue": "100.3.0-dev",
         "magento/module-msrp": "100.3.0-dev",
         "magento/module-multishipping": "100.3.0-dev",
+        "magento/module-mysql-mq": "100.3.0-dev",
         "magento/module-new-relic-reporting": "100.3.0-dev",
         "magento/module-newsletter": "100.3.0-dev",
         "magento/module-offline-payments": "100.3.0-dev",
@@ -228,6 +233,9 @@
         "magento/language-pt_br": "100.3.0-dev",
         "magento/language-zh_hans_cn": "100.3.0-dev",
         "magento/framework": "100.3.0-dev",
+        "magento/framework-amqp": "100.1.0-dev",
+        "magento/framework-bulk": "100.3.0-dev",
+        "magento/framework-message-queue": "100.3.0-dev",
         "trentrichardson/jquery-timepicker-addon": "1.4.3",
         "components/jquery": "1.11.0",
         "blueimp/jquery-file-upload": "5.6.14",
@@ -266,7 +274,7 @@
             ]
         },
         "files": [
-            "app/registration.php"
+            "app/etc/NonComposerComponentRegistration.php"
         ],
         "exclude-from-classmap": [
             "**/dev/**",
diff --git a/composer.lock b/composer.lock
index 300f95d3737..0496603ccb7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +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"
     ],
-    "content-hash": "29977708b816625e70177283e2df0d74",
+    "content-hash": "b1c20b199edd4d000534ce72b84a5edf",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -974,6 +974,60 @@
             ],
             "time": "2018-01-05T23:30:21+00:00"
         },
+        {
+            "name": "php-amqplib/php-amqplib",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-amqplib/php-amqplib.git",
+                "reference": "eb8f94d97c8e79900accf77343dbd7eca7f58506"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/eb8f94d97c8e79900accf77343dbd7eca7f58506",
+                "reference": "eb8f94d97c8e79900accf77343dbd7eca7f58506",
+                "shasum": ""
+            },
+            "require": {
+                "ext-bcmath": "*",
+                "ext-mbstring": "*",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*"
+            },
+            "suggest": {
+                "ext-sockets": "Use AMQPSocketConnection"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpAmqpLib\\": "PhpAmqpLib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "authors": [
+                {
+                    "name": "Alvaro Videla"
+                }
+            ],
+            "description": "This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
+            "homepage": "https://github.com/videlalvaro/php-amqplib/",
+            "keywords": [
+                "message",
+                "queue",
+                "rabbitmq"
+            ],
+            "time": "2015-08-11T12:30:09+00:00"
+        },
         {
             "name": "phpseclib/phpseclib",
             "version": "2.0.10",
diff --git a/dev/tests/acceptance/.env.example b/dev/tests/acceptance/.env.example
index fd4537bdd5f..432851acbf2 100644
--- a/dev/tests/acceptance/.env.example
+++ b/dev/tests/acceptance/.env.example
@@ -1,35 +1,6 @@
 #Copyright © Magento, Inc. All rights reserved.
 #See COPYING.txt for license details.
 
-#*** Start of example .env ***#
-#
-# MAGENTO_BASE_URL=http://127.0.0.1:32772/
-#
-# MAGENTO_BACKEND_NAME=admin
-# MAGENTO_ADMIN_USERNAME=admin
-# MAGENTO_ADMIN_PASSWORD=123123q
-#
-# MAGENTO_CLI_COMMAND_PATH=dev/tests/functional/utils/command.php
-# MAGENTO_CLI_COMMAND_PARAMETER=command
-#
-# SELENIUM_HOST=127.0.0.1
-# SELENIUM_PORT=4444
-# SELENIUM_PROTOCOL=http
-# SELENIUM_PATH=/wd/hub
-#
-# MAGENTO_RESTAPI_SERVER_HOST=127.0.0.1
-# MAGENTO_RESTAPI_SERVER_PORT=32769
-#
-# TESTS_BP=/Users/First_Last/GitHub/magento2ce/dev/tests/acceptance/tests/functional
-# FW_BP=/Users/First_Last/GitHub/magento2-functional-testing-framework
-# TESTS_MODULE_PATH=/Users/First_Last/GitHub/magento2ce/dev/tests/acceptance/tests/functional/Magento/FunctionalTest
-# MODULE_WHITELIST=Magento_NewModule
-#
-#*** End of example .env ***#
-
-
-#*** Start of .env ***#
-
 #*** Set the base URL for your Magento instance ***#
 MAGENTO_BASE_URL=
 
@@ -58,9 +29,9 @@ MAGENTO_ADMIN_PASSWORD=
 #TESTS_MODULE_PATH=
 
 #*** These properties impact the modules loaded into MFTF, you can point to your own full path, or a custom set of modules located with the core set
-#MODULE_WHITELIST=
+MODULE_WHITELIST=Magento_Framework,Magento_ConfigurableProductWishlist,Magento_ConfigurableProductCatalogSearch
 #CUSTOM_MODULE_PATHS=
 
 #*** Bool property which allows the user to toggle debug output during test execution
 #MFTF_DEBUG=
-#*** End of .env ***#
\ No newline at end of file
+#*** End of .env ***#
diff --git a/dev/tests/acceptance/RoboFile.php b/dev/tests/acceptance/RoboFile.php
index 51fe3e546a0..fb4056278b9 100644
--- a/dev/tests/acceptance/RoboFile.php
+++ b/dev/tests/acceptance/RoboFile.php
@@ -43,8 +43,15 @@ function buildProject()
      * @param array $opts
      * @return void
      */
-    function generateTests($opts = ['config' => null])
+    function generateTests($opts = ['config' => null, 'force' => false])
     {
+        $GLOBALS['GENERATE_TESTS'] = true;
+
+        if ($opts['force'])
+        {
+            $GLOBALS['FORCE_PHP_GENERATE'] = true;
+        }
+
         require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
         \Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllTestFiles($opts['config']);
         $this->say("Generate Tests Command Run");
diff --git a/dev/tests/acceptance/composer.json b/dev/tests/acceptance/composer.json
index 09b3aa58672..b16536ef5d2 100755
--- a/dev/tests/acceptance/composer.json
+++ b/dev/tests/acceptance/composer.json
@@ -21,7 +21,7 @@
         "consolidation/robo": "^1.0.0",
         "symfony/process": ">=2.7 <3.4",
         "henrikbjorn/lurker": "^1.2",
-        "magento/magento2-functional-testing-framework": "~2.0.2",
+        "magento/magento2-functional-testing-framework": "~2.1.0",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
         "vlucas/phpdotenv": "~2.4"
     },
diff --git a/dev/tests/acceptance/composer.lock b/dev/tests/acceptance/composer.lock
index 29cfc59adce..1cab4308589 100644
--- a/dev/tests/acceptance/composer.lock
+++ b/dev/tests/acceptance/composer.lock
@@ -4,7 +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"
     ],
-    "content-hash": "8549e85c50597c0494002f415527fcad",
+    "content-hash": "9ccb653562f20f9a5dd5aa73a2b3442b",
     "packages": [
         {
             "name": "allure-framework/allure-codeception",
@@ -55,7 +55,7 @@
                 "steps",
                 "testing"
             ],
-            "time": "2017-03-30T09:01:00+00:00"
+            "time": "2017-03-30 09:01:00"
         },
         {
             "name": "allure-framework/allure-php-api",
@@ -1641,11 +1641,11 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "2.0.3",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "git@github.com:magento/magento2-functional-testing-framework.git",
-                "reference": "22c803fc16024d417d920d03fdd95dea84779dd6"
+                "reference": "fc79d091f368a52316b3f7b738acbcff521ec7fc"
             },
             "require": {
                 "codeception/codeception": "~2.3.4",
@@ -1699,7 +1699,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2018-01-30T15:17:13+00:00"
+            "time": "2018-03-05T19:56:38+00:00"
         },
         {
             "name": "moontoast/math",
diff --git a/dev/tests/acceptance/tests/_bootstrap.php b/dev/tests/acceptance/tests/_bootstrap.php
index 43139994761..ee1b588ca2e 100644
--- a/dev/tests/acceptance/tests/_bootstrap.php
+++ b/dev/tests/acceptance/tests/_bootstrap.php
@@ -21,6 +21,14 @@
         defined($key) || define($key, $var);
     }
 }
+if (!defined('MAGENTO_CLI_COMMAND_PATH')) {
+    define('MAGENTO_CLI_COMMAND_PATH', 'dev/tests/acceptance/utils/command.php');
+    $env->setEnvironmentVariable('MAGENTO_CLI_COMMAND_PATH', 'dev/tests/acceptance/utils/command.php');
+}
+if (!defined('MAGENTO_CLI_COMMAND_PARAMETER')) {
+    define('MAGENTO_CLI_COMMAND_PARAMETER', 'command');
+    $env->setEnvironmentVariable('MAGENTO_CLI_COMMAND_PARAMETER', 'command');
+}
 defined('FW_BP') || define('FW_BP', PROJECT_ROOT . $RELATIVE_FW_PATH);
 
 // add the debug flag here
diff --git a/dev/tests/acceptance/tests/_data/magento3.jpg b/dev/tests/acceptance/tests/_data/magento3.jpg
new file mode 100644
index 00000000000..79ed12ec0ae
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magento3.jpg differ
diff --git a/dev/tests/acceptance/tests/_suite/sampleSuite.xml b/dev/tests/acceptance/tests/_suite/sampleSuite.xml
index 372dc19b136..4c6a78afd40 100644
--- a/dev/tests/acceptance/tests/_suite/sampleSuite.xml
+++ b/dev/tests/acceptance/tests/_suite/sampleSuite.xml
@@ -6,58 +6,20 @@
   */
 -->
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
-    <suite name="mySuite">
+    <suite name="sample">
         <before>
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="_defaultProduct" stepKey="createProduct">
-                <required-entity createDataKey="createCategory"/>
-            </createData>
+            <createData entity="defaultCategory" stepKey="createCategory"/>
         </before>
         <after>
-            <deleteData stepKey="deleteMyProduct" createDataKey="createProduct"/>
-            <deleteData stepKey="deleteMyCategory" createDataKey="createCategory"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
         </after>
-        <include>
-            <group name="example"/>
-            <cest test="PersistMultipleEntitiesTest"  name="PersistMultipleEntitiesCest"/>
-            <module name="SampleTests" file="SampleCest.xml"/>
-        </include>
-        <exclude>
-            <group name="testGroup"/>
-        </exclude>
-    </suite>
-    <suite name="Catalog">
         <include>
             <module name="Catalog" />
+            <group name="login" />
         </include>
         <exclude>
-            <test name="AdminCreateCategoryCest"/>
-            <test name="AdminCreateSimpleProductCest"/>
-        </exclude>
-    </suite>
-    <suite name="Cms">
-        <include>
-            <module name="Cms" />
-        </include>
-        <exclude>
-            <test name="AdminCreateCmsPageCest"/>
-        </exclude>
-    </suite>
-    <suite name="Newsletter">
-        <include>
-           <module name="Newsletter"/>
-        </include>
-    </suite>
-    <suite name="MAGETWO36659">
-        <include>
-           <module name="Cms" />
-           <module name="Catalog" />
-           <module name="Newsletter" />
-        </include>
-        <exclude>
-            <test name="AdminCreateCmsPageCest"/>
-            <test name="AdminCreateCategoryCest"/>
-            <test name="AdminCreateSimpleProductCest"/>
+            <test name="AddImageToWYSIWYGCatalogEditor"/>
+            <module name="Catalog" file="AdminCreateCategoryTest.xml" />
         </exclude>
     </suite>
 </suites>
diff --git a/dev/tests/acceptance/tests/functional.suite.dist.yml b/dev/tests/acceptance/tests/functional.suite.dist.yml
index 432151bdf56..e01c46ea7c6 100644
--- a/dev/tests/acceptance/tests/functional.suite.dist.yml
+++ b/dev/tests/acceptance/tests/functional.suite.dist.yml
@@ -21,6 +21,7 @@ modules:
             depends: PhpBrowser
             part: Json
         - \Magento\FunctionalTestingFramework\Module\MagentoSequence
+        - \Magento\FunctionalTestingFramework\Module\MagentoAssert
         - Asserts
     config:
         \Magento\FunctionalTestingFramework\Module\MagentoWebDriver:
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/README.md
new file mode 100644
index 00000000000..49028ae4181
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/README.md
@@ -0,0 +1,3 @@
+# Magento 2 Functional Tests
+
+The Functional Tests Module for **Magento_Amqp** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json
new file mode 100644
index 00000000000..87071431219
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "magento/magento2-functional-test-module-amqp",
+    "description": "Magento 2 Functional Test Module Amqp",
+    "type": "magento2-test-module",
+    "version": "100.0.0-dev",
+    "license": [
+        "proprietary"
+    ],
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "1.0.0",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\FunctionalTest\\Amqp\\": ""
+        }
+    },
+    "extra": {
+        "map": [
+            [
+                "*",
+                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryCest.xml
index 6f2f7b57823..cd0ee19fc49 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryCest.xml
@@ -13,7 +13,7 @@
             <stories value="Try to save empty Magento Advanced Reporting vertical"/>
             <title value="Try to save empty Magento Advanced Reporting vertical"/>
             <description value="An admin user cannot save a blank industry setting on the Advanced Reporting configuration page."/>
-            <severity value="NORMAL"/>
+            <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-63981"/>
             <group value="analytics"/>
             <group value="skip"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationEnableDisableAnalyticsCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationEnableDisableAnalyticsCest.xml
index c7ca8b799d2..bcf715ca173 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationEnableDisableAnalyticsCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationEnableDisableAnalyticsCest.xml
@@ -13,7 +13,7 @@
             <stories value="Enable/disable Advanced Reporting"/>
             <title value="Enable Disable Advanced Reporting"/>
             <description value="An admin user can enable/disable Advanced Reporting."/>
-            <severity value="NORMAL"/>
+            <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-66465"/>
             <group value="analytics"/>
         </annotations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationIndustryCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationIndustryCest.xml
index 046cc17c432..1678a563170 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationIndustryCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationIndustryCest.xml
@@ -14,7 +14,7 @@
             <stories value="Set Magento Advanced reporting industry"/>
             <title value="Set Magento Advanced reporting industry"/>
             <description value="An admin user can change the industry setting on the Advanced Reporting configuration page."/>
-            <severity value="NORMAL"/>
+            <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-63898"/>
             <group value="analytics"/>
         </annotations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/README.md
new file mode 100644
index 00000000000..39f11e663cf
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/README.md
@@ -0,0 +1,3 @@
+# Magento 2 Functional Tests
+
+The Functional Tests Module for **Magento_AsynchronousOperations** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json
new file mode 100644
index 00000000000..5f13cad7fbb
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "magento/magento2-functional-test-module-asynchronous-operations",
+    "description": "Magento 2 Functional Test Module Asynchronous Operations",
+    "type": "magento2-test-module",
+    "version": "100.0.0-dev",
+    "license": [
+        "proprietary"
+    ],
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "1.0.0",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "suggest": {
+        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
+        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
+        "magento/magento2-functional-test-module-logging": "100.0.0-dev",
+        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
+        "magento/magento2-functional-test-module-user": "100.0.0-dev"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\FunctionalTest\\AsynchronousOperations\\": ""
+        }
+    },
+    "extra": {
+        "map": [
+            [
+                "*",
+                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminConfirmationModalSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminConfirmationModalSection.xml
new file mode 100644
index 00000000000..f7b2f246b55
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminConfirmationModalSection.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="AdminConfirmationModalSection">
+        <element name="title" type="text" selector="aside.confirm .modal-title"/>
+        <element name="message" type="text" selector="aside.confirm .modal-content"/>
+        <element name="cancel" type="button" selector="aside.confirm .modal-footer button.action-dismiss" timeout="30"/>
+        <element name="ok" type="button" selector="aside.confirm .modal-footer button.action-accept" timeout="60"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml
index 4c10fbce0fb..d072f4aecb5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml
@@ -7,8 +7,8 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../../../../magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminMessagesSection">
-        <element name="test" type="input" selector=".test"/>
+        <element name="success" type="text" selector="#messages div.message-success"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EndToEndB2CAdminTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EndToEndB2CAdminTest.xml
index 6bc4594bce4..34132defab8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EndToEndB2CAdminTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EndToEndB2CAdminTest.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
         <test name="EndToEndB2CAdminTest">
             <!--Create Bundle Product-->
-            <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageBundle" after="viewVirtualProductInGrid"/>
+            <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageBundle" after="seeSimpleProductInGrid"/>
             <waitForPageLoad stepKey="waitForProductPageLoadBundle" after="visitAdminProductPageBundle"/>
             <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct" after="waitForProductPageLoadBundle">
                 <argument name="product" value="BundleProduct"/>
@@ -32,11 +32,12 @@
             <fillField selector="{{AdminProductFormBundleSection.firstProductQuantity}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty" after="clickAddSelectedBundleProducts"/>
             <actionGroup ref="saveProductForm" stepKey="saveBundleProduct" after="fillProductDefaultQty"/>
             <actionGroup ref="viewBundleProductInAdminGrid" stepKey="viewBundleProductInGrid" after="saveBundleProduct">
-            <argument name="product" value="BundleProduct"/>
+                <argument name="product" value="BundleProduct"/>
             </actionGroup>
 
-            <!--TODO - Move to 'after' block when MQE-732 is fixed-->
-            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteBundleProduct" after="deleteVirtualProduct">
+            <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
+            <comment userInput="Clean up bundle product" stepKey="cleanUpBundleProduct" after="deleteSimpleProduct"/>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteBundleProduct" after="cleanUpBundleProduct">
                 <argument name="product" value="BundleProduct"/>
             </actionGroup>
         </test>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json
index 4a724336f1d..d76fd5195c3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/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.0.2|7.0.4|~7.0.6|~7.1.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-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
         "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml
index c8c062c7ae7..48f21affb86 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml
@@ -13,7 +13,6 @@
         <arguments>
             <argument name="categoryEntity" defaultValue="_defaultCategory"/>
         </arguments>
-
         <seeInCurrentUrl url="{{AdminCategoryPage}}" stepKey="seeOnCategoryPage"/>
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Category" stepKey="seeCategoryPageTitle"/>
@@ -31,7 +30,6 @@
         <arguments>
             <argument name="categoryEntity" defaultValue="_defaultCategory"/>
         </arguments>
-
         <amOnPage url="/{{categoryEntity.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{categoryEntity.name_lwr}}" stepKey="assertCategoryOnStorefront"/>
@@ -43,13 +41,14 @@
         <arguments>
             <argument name="categoryEntity" defaultValue="_defaultCategory"/>
         </arguments>
-        <seeInCurrentUrl url="{{AdminCategoryPage}}" stepKey="seeOnCategoryPage"/>
+        <amOnPage url="{{AdminCategoryPage}}" stepKey="goToCategoryPage"/>
+        <waitForPageLoad time="60" stepKey="waitForCategoryPageLoad"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="clickCategoryLink"/>
         <click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete"/>
         <waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal"/>
         <see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage"/>
         <click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete"/>
-        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
+        <waitForPageLoad time="60" stepKey="waitForDeleteToFinish"/>
         <see selector="You deleted the category." stepKey="seeDeleteSuccess"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
         <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="dontSeeCategoryInTree"/>
@@ -70,7 +69,7 @@
             <argument name="Category"/>
         </arguments>
         <amOnPage url="{{AdminCategoryPage.page}}" stepKey="amOnCategoryPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(Category.Name)}}" stepKey="navigateToCreatedCategory" />
         <waitForPageLoad stepKey="waitForPageLoad2"/>
         <waitForLoadingMaskToDisappear stepKey="waitForSpinner" />
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 e67a4a1a443..436d7cf5a8d 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
@@ -57,7 +57,46 @@
             <argument name="image" defaultValue="ImageUpload"/>
         </arguments>
         <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
+        <waitForPageLoad time="30" stepKey="waitForPageRefresh"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.imageUploadButton}}" stepKey="seeImageSectionIsReady"/>
         <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="{{image.file}}" stepKey="uploadFile"/>
-        <waitForAjaxLoad stepKey="waitForAjaxUpload"/>
+        <waitForAjaxLoad time="30" stepKey="waitForAjaxUpload"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
+    </actionGroup>
+
+    <!--Fill fields for simple product in a category in Admin-->
+    <actionGroup name="FillAdminSimpleProductForm">
+        <arguments>
+            <argument name="category"/>
+            <argument name="simpleProduct"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{simpleProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="searchAndSelectCategory"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
+        <seeInField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
+        <seeInField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
+        <seeInField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
+        <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
+    </actionGroup>
+
+    <!--Assert text in Related, Up-Sell or Cross-Sell section in Admin Product page-->
+    <actionGroup name="AssertTextInAdminProductRelatedUpSellCrossSellSection">
+        <arguments>
+            <argument name="element" defaultValue="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
+            <argument name="expectedText"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openTab"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
+        <see selector="{{element}}" userInput="{{expectedText}}" stepKey="AssertText"/>
     </actionGroup>
 </actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductAttributeActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductAttributeActionGroup.xml
new file mode 100644
index 00000000000..d3d6f133868
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="navigateToCreatedProductAttribute">
+        <arguments>
+            <argument name="ProductAttribute"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{AdminProductAttributeGridSection.AttributeCode(ProductAttribute.attribute_code)}}" stepKey="navigateToAttributeEditPage1" />
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+    </actionGroup>
+</actionGroups>
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 52ae266915a..b153cf4a5b5 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
@@ -10,6 +10,7 @@
               xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Reset the product grid to the default view-->
     <actionGroup name="resetProductGridToDefaultView">
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
         <click selector="{{AdminProductGridFilterSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
         <click selector="{{AdminProductGridFilterSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
         <waitForPageLoad stepKey="waitForProductGridLoad"/>
@@ -71,6 +72,16 @@
         <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
     </actionGroup>
 
+    <!--Search product grid with keyword search-->
+    <actionGroup name="searchProductGridByKeyword">
+        <arguments>
+            <argument name="keyword"/>
+        </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>
@@ -96,7 +107,7 @@
         </arguments>
         <!--TODO use other action group for filtering grid when MQE-539 is implemented -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForPageLoadInitial"/>
+        <waitForPageLoad time="60" stepKey="waitForPageLoadInitial"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
         <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
@@ -106,7 +117,7 @@
         <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
         <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
         <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
-        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="waitForConfirmModal"/>
+        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
         <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
     </actionGroup>
 
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
new file mode 100644
index 00000000000..cfaf91e4788
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertProductInStorefrontCategoryPage">
+        <arguments>
+            <argument name="category"/>
+            <argument name="product"/>
+        </arguments>
+        <!-- Go to storefront category page, assert product visibility -->
+        <amOnPage url="{{StorefrontCategoryPage.url(category.name)}}" stepKey="navigateToCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <see userInput="{{product.name}}" stepKey="assertProductPresent"/>
+        <see userInput="{{product.price}}" stepKey="assertProductPricePresent"/>
+    </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
new file mode 100644
index 00000000000..6b9310cb95f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertProductInStorefrontProductPage">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <!-- Go to storefront product page, assert product visibility -->
+        <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.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/NewProductActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/NewProductActionGroup.xml
deleted file mode 100644
index 2f00168733d..00000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/NewProductActionGroup.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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">
-    <actionGroup name="createNewSimpleProduct">
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
-        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
-        <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="[$$createPreReqCategory.name$$]" stepKey="searchAndSelectCategory"/>
-        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-        <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
-        <seeInField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
-        <seeInField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
-        <seeInField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
-        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
-        <seeInField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
-    </actionGroup>
-</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SearchAndMultiselectActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SearchAndMultiselectActionGroup.xml
new file mode 100644
index 00000000000..a0546ec8bca
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SearchAndMultiselectActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="searchAndMultiSelectActionGroup">
+        <arguments>
+            <argument name="dropDownSelector"/>
+            <argument name="options"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{dropDownSelector}} .action-select.admin__action-multiselect" stepKey="waitForDropdown"/>
+        <click selector="{{dropDownSelector}} .action-select.admin__action-multiselect" stepKey="clickDropdown"/>
+        <selectMultipleOptions filterSelector="{{dropDownSelector}} .admin__action-multiselect-search-wrap>input[data-role='advanced-select-text']" optionSelector="{{dropDownSelector}} .admin__action-multiselect-label>span" stepKey="selectSpecifiedOptions">
+            <array>[{{options}}]</array>
+        </selectMultipleOptions>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCategoryActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCategoryActionGroup.xml
new file mode 100644
index 00000000000..af71e1520bf
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -0,0 +1,35 @@
+<?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">
+    <!-- Check the category page -->
+    <actionGroup name="StorefrontCheckCategoryActionGroup">
+        <arguments>
+            <argument name="category"/>
+            <argument name="productCount"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{category.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <seeInTitle userInput="{{category.name}}" stepKey="assertCategoryNameInTitle"/>
+        <see userInput="{{category.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
+        <see userInput="{{productCount}}" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCount"/>
+    </actionGroup>
+
+    <!-- Check simple product on the category page -->
+    <actionGroup name="StorefrontCheckCategorySimpleProduct">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName(product.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{product.price}}.00" selector="{{StorefrontCategoryProductSection.ProductPriceByName(product.name)}}" stepKey="AssertProductPrice"/>
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCompareActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCompareActionGroup.xml
new file mode 100644
index 00000000000..9c80ce4b0b5
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCompareActionGroup.xml
@@ -0,0 +1,71 @@
+<?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 Product to Compare from the category page and check message -->
+    <actionGroup name="StorefrontAddCategoryProductToCompareActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(productVar.name)}}" stepKey="moveMouseOverProduct" />
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCompareByName(productVar.name)}}" stepKey="clickAddProductToCompare"/>
+        <waitForElement selector="{{StorefrontMessagesSection.success}}" time="30" stepKey="waitForAddCategoryProductToCompareSuccessMessage"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added product {{productVar.name}} to the comparison list." stepKey="assertAddCategoryProductToCompareSuccessMessage"/>
+    </actionGroup>
+
+    <!-- Add Product to Compare from the product page and check message -->
+    <actionGroup name="StorefrontAddProductToCompareActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <click selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="clickAddToCompare" />
+        <waitForElement selector="{{StorefrontMessagesSection.success}}" time="30" stepKey="waitForAddProductToCompareSuccessMessage"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added product {{productVar.name}} to the comparison list." stepKey="assertAddProductToCompareSuccessMessage"/>
+    </actionGroup>
+
+    <!-- Check the product in compare sidebar -->
+    <actionGroup name="StorefrontCheckCompareSidebarProductActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontComparisonSidebarSection.ProductTitleByName(productVar.name)}}" stepKey="waitForProduct"/>
+    </actionGroup>
+
+    <!-- Open and check comparison page -->
+    <actionGroup name="StorefrontOpenAndCheckComparisionActionGroup">
+        <click selector="{{StorefrontComparisonSidebarSection.Compare}}" stepKey="clickCompare"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForComparePageloaded" />
+        <seeInCurrentUrl url="{{StorefrontProductComparePage.url}}" stepKey="checkUrl"/>
+        <seeInTitle userInput="Products Comparison List" stepKey="assertPageNameInTitle"/>
+        <see userInput="Compare Products" selector="{{StorefrontProductCompareMainSection.PageName}}" stepKey="assertPageName"/>
+    </actionGroup>
+
+    <!-- Check the simple product in comparison page -->
+    <actionGroup name="StorefrontCheckCompareSimpleProductActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName(productVar.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{productVar.price}}.00" selector="{{StorefrontProductCompareMainSection.ProductPriceByName(productVar.name)}}" stepKey="assertProductPrice"/>
+        <see userInput="{{productVar.sku}}" selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName('SKU', productVar.name)}}" stepKey="assertProductPrice"/>
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <seeElement selector="{{StorefrontProductCompareMainSection.ProductAddToCartByName(productVar.name)}}" stepKey="assertProductAddToCart"/>
+    </actionGroup>
+
+    <!-- Clear the compare list -->
+    <actionGroup name="StorefrontClearCompareActionGroup">
+        <waitForElementVisible selector="{{StorefrontComparisonSidebarSection.ClearAll}}" time="30" stepKey="waitForClearAll"/>
+        <click selector="{{StorefrontComparisonSidebarSection.ClearAll}}" stepKey="clickClearAll"/>
+        <waitForElementVisible selector="{{ModalConfirmationSection.OkButton}}" time="30" stepKey="waitForClearOk"/>
+        <scrollTo selector="{{ModalConfirmationSection.OkButton}}" stepKey="scrollToClearOk"/>
+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="clickClearOk"/>
+        <waitForElement selector="{{StorefrontMessagesSection.message('You cleared the comparison list.')}}" time="30" stepKey="AssertMessageCleared"/>
+        <waitForElement selector="{{StorefrontComparisonSidebarSection.NoItemsMessage}}" time="30" stepKey="assertNoItems"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
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
new file mode 100644
index 00000000000..ffc1687bc9f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductActionGroup.xml
@@ -0,0 +1,26 @@
+<?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">
+    <!-- Check the simple product on the product page -->
+    <actionGroup name="StorefrontCheckSimpleProduct">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="AssertProductNameInTitle"/>
+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+        <see userInput="${{product.price}}.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+        <see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="assertInStock"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="assertAddToCart" />
+        <see userInput="{{product.custom_attributes[description]}}" selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="assertProductDescription"/>
+        <see userInput="{{product.custom_attributes[short_description]}}" selector="{{StorefrontProductInfoMainSection.productShortDescription}}" stepKey="assertProductShortDescription"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml
new file mode 100644
index 00000000000..0644cdf3cc0
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!--Click Add to Cart button in storefront product page-->
+    <actionGroup name="addToCartFromStorefrontProductPage">
+        <arguments>
+            <argument name="productName"/>
+        </arguments>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAdding"/>
+        <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
+        <waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAdded"/>
+        <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>
+        <waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAddToCart}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAddToCart"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
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 b734ffff46c..5de996809b7 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
@@ -13,6 +13,10 @@
         <data key="name_lwr" unique="suffix">simplecategory</data>
         <data key="is_active">true</data>
     </entity>
+    <entity name="ApiCategory" type="category">
+        <data key="name" unique="suffix">Api Category</data>
+        <data key="is_active">true</data>
+    </entity>
     <entity name="SimpleSubCategory" type="category">
         <data key="name" unique="suffix">SimpleSubCategory</data>
         <data key="name_lwr" unique="suffix">simplesubcategory</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/CouponData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ConstData.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/CouponData.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ConstData.xml
index 2acdc14e51c..b26fa64bcea 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/CouponData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ConstData.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  /**
   * Copyright © Magento, Inc. All rights reserved.
@@ -9,10 +8,9 @@
 
 <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="_defaultCoupon" type="coupon">
-        <data key="rule_id">4</data>
-        <data key="code">FREESHIPPING123</data>
-        <data key="times_used">0</data>
-        <data key="is_primary">false</data>
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="CONST" type="CONST">
+        <data key="one">1</data>
+        <data key="two">2</data>
     </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml
index f309665ba50..86e8ce17dc6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml
@@ -23,7 +23,13 @@
     <entity name="CustomAttributeProductAttribute" type="custom_attribute">
         <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
         <var key="value" entityKey="value" entityType="ProductAttributeOption"/>
-        <data key="value">test product attribute</data>
-        <data key="attribute_code">test_product_attribute</data>
+    </entity>
+    <entity name="ApiProductDescription" type="custom_attribute">
+        <data key="attribute_code">description</data>
+        <data key="value" unique="suffix">API Product Description</data>
+    </entity>
+    <entity name="ApiProductShortDescription" type="custom_attribute">
+        <data key="attribute_code">short_description</data>
+        <data key="value" unique="suffix">API Product Short Description</data>
     </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ImageContentData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ImageContentData.xml
new file mode 100644
index 00000000000..79842ccb47e
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ImageContentData.xml
@@ -0,0 +1,21 @@
+<?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="TestImageContent" type="ImageContent">
+        <data key="base64_encoded_data">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDIBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAGAAYAMBIgACEQEDEQH/xACXAAEBAAMBAQEBAAAAAAAAAAAABgMEBQgCAQcQAAEDAQUFBgQDCQAAAAAAAAABAgMEBQYRFpESMTZV0QchcnOzwhMUIkEygaE1QlFSYXGCsbIBAAEFAQAAAAAAAAAAAAAAAAACAwQGBwERAAECAwMLBAMBAAAAAAAAAAEAAgMEERMhkRQxMzRBUVJTcXKxBRJhoSKBwUL/2gAMAwEAAhEDEQA/AP7+AYKysp7Po5aurlbFBEmL3u3NQ6ASaBdArcFnBN5/urzqn0d0Gf7q86p9HdCRkUzy3YFOWEXhOCpATef7q86p9HdBn+6vOqfR3QMimeW7AosIvCcFSAm8/wB1edU+jugz/dXnVPo7oGRTPLdgUWEXhOCpATef7q86p9HdBn+6vOqfR3QMimeW7AosIvCcFSA1bPtGktWiZWUM7Z6d6qjZG7lwXBf1Q2iO5paaOFCmyCDQoTd/uBLX8n3IUhN3+4EtfyfchIk9Zh9w8pyBpW9QvN4Bwbcsujis+pq2Q4Tq5HbW0u9XJj3Y4fc0ibjPgQjEY0GgJNTS4brj/FaIz3Q2FwFafNP4V3gc1aWz7FY+rjhVrsNjBrlcrsV3Iir/ABPxtqzRyM+boJKeJ7kakm2jkRV3Yom4TlbYf4xrnfFSBuqaCn7ouWwbc+4/FT90XTBz57RlbVvpqWjdUSRoiyfWjUbju71MUlqSyWdVPjpnsqIUVJI3ORFZ3fix+4OnoLSRU3V2HZnANKEjcEGOwVG74OxdUGjZM1RNQROqIlYuw3Zcr9pXpgn1f0xN4kQYgiww8bU4xwe0OG1eg+y7gCg8cvqOLEjuy7gCg8cvqOLEzT1HXIvcfKq0zpn9ShN3+4EtfyfchSE3f7gS1/J9yCJPWYfcPKTA0reoXm85l4P2HUf4/wDSHTPmSOOZiskY17F3tcmKKaXMwjGgvhj/AECMQrTFZ72ObvC5lvxq+gjeivRsUzXvVn4kb34qmpozxWc+NjVtWtqPiOREjbMj1Vf7YFHvMMdLTxP244ImP/maxEUhzMhaxC8UvABrXZuoR9pmLL+9xddfvXNrfkVtJyPqJaOpRiL8VHbKPT8+5THFVS1FnWnE+VKhsUbmsmamG3i1e78jsSwQzoiTRRyIm5HtRf8AZ9MjZGxGMY1rU/damCHTJPMQuDgAa5q31G0VpdnrnuRYO9xNaA1+/r9rUsmeGazqdscrHuZExHo1cVauH30U3THFBDBtfBijj2t+w1Ex0MhMgMcyG1r843J+GC1oDs69B9l3AFB45fUcWJHdl3AFB45fUcWJm3qOuRe4+VV5nTP6lCbv9wJa/k+5CkJu/wBwJa/k+5BEnrMPuHlJgaVvULzeADUlbUAAIQAAhAACF6D7LuAKDxy+o4sSO7LuAKDxy+o4sTMPUdci9x8qqTOmf1KE3f7gS1/J9yFITd/uBLX8n3IIk9Zh9w8pMDSt6hebwAakragABCAAEIAAQvQfZdwBQeOX1HFiR3ZdwBQeOX1HFiZh6jrkXuPlVSZ0z+pQwVlHT2hRy0lXE2WCVMHsduchnBEBINQmQaXhTeQLq8lp9XdRkC6vJafV3UpASMtmeY7Epy3i8RxU3kC6vJafV3UZAuryWn1d1KQBlszzHYlFvF4jipvIF1eS0+ruoyBdXktPq7qUgDLZnmOxKLeLxHFTeQLq8lp9XdRkC6vJafV3UpAGWzPMdiUW8XiOK1bPs6ksqiZR0MDYKdiqrY27kxXFf1U2gCO5xcauNSmySTUr/9k=</data>
+        <data key="type">image/jpeg</data>
+        <data key="name" unique="prefix">test_image.jpg</data>
+    </entity>
+    <entity name="MagentoLogoImageContent" type="ImageContent">
+        <data key="base64_encoded_data">iVBORw0KGgoAAAANSUhEUgAAAP8AAAEsCAYAAAAM1WX/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAACY7SURBVHhe7Z0LlBxXnd6HXWyWhx9g8HS3pJFGPVU1klmC2RB28frBIbY00y2NpBnN9GMkG4JJcOJsgCVrszZg56wJuxj2BTjLY8FsADsb20kwmEc4WYgNxPYuiwX2yg9ZxrKsefS7R5IlufP/qm+N76hbo5qa7p6qru875zs6M5quvvd/76/q3lt1/9VDhU/7Ll79ikrauL66y8pVUsZ1ezf1nan+i6KoblV+bP22uUlrT+1dG2vlycEa/pWfH5kej4+oP6Eoqpt0aGx9vJqxvnF892Dt2JUbavmMNW/8fEx+X81aXy9MxNerj1AUFWQ9eGHPy4sp4wOHJ60ZXOWLWauW08CH8TN+r0YBM8W0+f47B3vOUIegKCpoyo/HL6tkzAcA9eFdgw3Qn2z8/5z8Hf6+krEeyE/EL1WHoigqCHo+2X9+MW18dm5y8MSLV25sCvrpfEI+V520TuA4h4b6etWhKYryqwTWXTJ3fxpXbyzone5qfyrjc+WsjALeLSeBrPl0MWNOqq+gKMpPmh3rf2Mpbdxbu2pj7ejuDZ6hP9k4Do6HEUQpY34zl+r/TfWVFEWtpH52ee+rZF7/kbmsVQb4hZPgbZVxXBx/btIqldLmjQeSkVeqIlAU1Wnl0gNJAf/nGOJXlzHEd2scH99jLwhmzX8sTgwkVFEoiuqEcjvW9pWzxleO7hqsHT/pnn2njO/F95cz5pefk/KoolEU1S5VM+Y1law1hatvqck9+04Z34vvr48CrEMolyoiRVGtVG5n/0Vylf07zLvd3LPvlFEOlAflkqnA/5kdX/92VWSKopajZ8Zir53LGrdWJ61jL161oW0Lest1fUFwQ60i5ZxLG7fuT/Sdq6pAUdRSVU4ZqXLGenK59+w7ZZTP2SxUzlpPlNPGhKoKRVFuND22zpQh9N+euHJD7YXdK7Ogt1yj3Ch/JWv97fSOPktVjaKoZsK++krGuK6cNUu4emKzTTOwgmJns5CcyIqVtPkH9zJvAEU1amZi3eXVjPkQYMHmGr8P8d0a9XA2C1Wz5oOFsXX/UlWZosKt6a1rotWs9XmsmGOY3AygbjHqd3hysFbNWH+1X+qtQkBR4VMpZbynOmkewFWxlO2eq/2pjPqhnvboJms+i/qrUFBUOFRI9f+WdP7v4tbYkRZuwgmKUV/UG/WXqcB3Cjvjb1Ghoaju1L6RtedUM8YtMsw/2s5NOEGxs1moOmkdKWeMjyM+KlQU1T3KTxjb57LWL+3V7wDcs++UEQfEoz4VsH6RT63fpkJGUcFWPXGm+V+PyzD35MSZ9EI7iUQrGetriJsKIUUFS0icmU8ZH0BCTFzVmiXOpBca8XGeDTictaaLqYH/gDiqkFKU/1VKxy+Zy1h24sxuumffKSNe9mYhiV81a92fG4tfokJLUf7UoZ19vcWM8ZnqMhJn0guNONqJRFPGXyIxqQo1RflHFSTOnLT24WoVhE04QTHiaG8Werf9bMBTchLYrUJOUSurfCr+5lLG+taLV25oaeJMeqER13oi0Q21Ytr4Vn7nwD9TTUBRndWeS899dTltfFSu9hXes++cnWcD5iTuiP/By3tfpZqEotqvysRAopOJM+mFRrz1RKKVlDGsmoai2qN64kzzS0d3r1ziTHqh0Q5HdtmJRP86t7N/jWoqimqdyinj31Wz1iFcbVYycSa90GgHJ5GotM/zTCRKtUzFifjvyBDfTpyJKwyh96fRLmgftBMSiRbT639bNSFFLU3PXBF7bSVdT5yJ3WfNOhztPzuJRKXdXqhkjE8ykSi1JBVSRqqStR7nPftgGu3lPBuAdkR7qqalqOY6OBrfKJ3l7iAnzqQXGu2IRUEZBdw1s3XNBtXUFFXXnrHBM2SIf305Y5ZxtecmnO4x2lFLJFpCO+8ZHDxDNT0VZs2MDlxezVh24sxqiBb0AASemMO/zf6/24x2RfvW7woMPjjDRKLh1dT2NZG5tHkbEkqeCNEmHEAA6Oek3vm0+Rh2z4XtsWS0t51INGv+F2zGUl2CCoNKE8bV1UkrNIkzYdSxrJJnYgNSLjWQrSUjr5wZj++qZq2n8Xv8f1hi8VIiUetXTCQaAk3vjL9FzvahTJyJ9/xVZIg/lzH//Int/W9QIbF1UH6uZI2/kJOA/XfNPt+NRvs7iUQlLt/Jj8cvVCGhukUzm/vPKmaMj8sV70iYNuGgc9svzJA6y0nv/unR+KUqJE01PR6/rDpp3m9fEUO0/uFsFqpI/yimjFv2Sn9RIaGCrPzEeiTO/AU6dFgSZ6KO8yvcGTNXThkfuGN7z6+pkCyqj17c8+tyovygjBJy+HxY7nygjkwk2iWa2rbOqGSsO5AQMmyJM+uJMDfgzTjfOLTFWyLMqR39A3LiuBPHCWf87ESi30AcVEgovwsJH4sTxgfDljhTv3LJVfuX+fTADhWSZamUGhiVk8Cj9nFDOHJCP5KpwAd+ICMiFRLKj8qND1wcxsSZzpy1nDXx8otbprec8xoVkpZoZvPZZ1UzxsflpBLONZN32W8Wuh/9S4WE8ouwWl1MG39RnbSOvyids1lDdqPROZ3VagHzu+1+7RVeM1bJGN8L590S3CIdPI5+hv6mQkKtpJDQ8XDIEmeijs596nLGPFDp8H1qGQVcXZXvxfeH6jkJNa2qZq19chLYpcJBdVpI4FhKG6FMnGm/6lqGo5W0eRte8a1C0lHNjK2OyRTjr7CHvttfLa4b/cxJJCr9716ZCrxJhYRqtw4kI68sp4yPze2y7E04YZp/Os+mlzLmQ4Xx+BUqJCuqQmr9JinPw/YVMSQjL9hZZ5nLWmUkEkW/VCGh2qFieiCJhI2h62hq5bmaNYtytf+DvZt6zlQh8YX2buo7s5IxrkP57BOylLdZPbrN9glZTQWQ0LWYGUiokFCtUn5i7dpqxrr9qFz5wpQ4E50L+9ExrC6nzXtmR+MbVUh8qdlUfGM5Y/4PJx9CWE7OMPol+mc5bX0lP7J2rQoJtRzJvPLasCXORB21xaXHZVg5ocIRCMm0DJmQnkAmnXAtwjojNOsQEr6qcFBLVXE8/rZKxrITZ2JxKyxXEWcuiRx0hbRxq8wlz1MhCZRQ7lLa+BTqgfo0q2s3Gv3Ufsmo1BmJRGfHmEjUtZBwsZoxPilXjtB1Gjv7rP1AidU1nWYW2Y8n5SQu9QrfSdx+/uKFatb8k30ja89RIaGaqTAxkLaHizJ0CuNw8fCkdbCcMq+pqXh0i27o6XlZQYbBc1nr+bBO36RfM5FoM81MGIMSnLvCmDgTC0Uv7FZvnMms7VMh6Uqphdsvo75hWriFnYXbSsb879M7DEuFJLy6F7eI0sb1SKyIs2OYNuE4t4jkavgPsyF711xR6iv1/hnqH5Zbtqijs1mojESiGeM69H8VknBpdjx+hcyFHrQBCNtc0O70VjXMb5nFW47lJHBTNWvNIR5helirvlkIdwXMB5FAVoWk+4XEmdWM+QUs/oT1sVC56n0zlzJ+U4Uk1Do0PvAmice9oX1MW0Y+1bT1eXChQtKdKqSN91YnQ7ghRG3Ckavc0/kJ40oVDkpTfnzgKonPfsQpnIlEzWcLE8bVKhzdI2zCkcp9J6yJM6VT42r/508m+89XIaGa6HmJTyVj/aVMicKbSHTSvC8/Gn+zCklw9eTYurPLKeMW6fyHcc8+TPM650EPmdfdPzUWv0SFhHKh6Yn4pQJBaJOyVLODh8tp84/AjwpJsITEmQL9L9GAoUycmbVmkTiT6Z+8CXGrMJFosBKJHhpbH0fiyOOhTpxpfu35HX39KiTUMnRoIr5eLiJfC3MiUan/1wsSBxUS/8lOnClXusMhT5xZmjC2q5BQLRQSkoY+kWjafD84UyHxh/Lj8cukYew5Whg34eBlD9WMccujLU6cSS3U9BbzNSqR6NGwrSFpzwbcn59Y/OUrHRFWZ4tp47Nzk4MnXgzZyy6d1VkZkn13Zqz/rSokVAdUSPe/VaaW9USiu0J290g4q05aJ8op4zPgT4Wks0ICQ+n49Rc8hmgYNp84M2s9V8p04X3ZAKmUNt4ro4CDaI/QJRJ9tz0KeLqYMSdVONqv2bH+NyJxIYZdYU2cicSV0ylzRRJnUgs1M2bEymnj8+F9YtTO6fjNXKq/fU+M/uzy3lfJvP4jc1mrHNb5VhmJMydC9Cx2gFRIx6+Q9rETiYbx2YC5SatUSps3tjyRaA6JMzPmzxHYMCXOdFZaZY5VkCH+dX5LnEkt1A8uXv0KGZVeLyAU0G5ov2bt2m0Gj/OJRLPmPxYnWpBINLdjbV85a3wlbIkz4fnEmRnjLuQbUCGhAiC0l0wF7kb7hTE/hJ1INGN++TnhV4VkaapmzGsqWWsKZ5PQJs6cMMdVOKgAqpA2JtCOaM8wZoYSfg+BYxWO0yu3s/8iOWuEMnFm/X1s1jEZOt5aGIu9VoWECrCeHYm+TqZsn0a7on3DtFbl7C+xE4mOr3+7CkmjnpHOPpc1bq0HaUP4gvQupFiy/m7RIFGBVS5tXlS1s0GHNJGocD0nFzUkyFUhqQt54csZ68nwDY/qQ/w5GR4VJox/i0STKiRUF+qOnp5fU4lE7fdAhOkRdGc6W85aT8y/ByI3MXDHcRkahHJhROosQ/yvYGHTDgYVCiGRqEwFbg9lIlGpL3gH9z3Ht6+pFXbG6/8pV8KT/7ibjDOgljjzZ8VxY0j1ByqEQuJU9AP0h1DcwlZ8g3dw3zM7FKnZ3rq6lhuXkwD+oAtPAvbcB42ctSphTpxJLdSesXNfXcZbnyetStc+vKaYBt/g3GG+Z3Y4WrPtnAS29dXyKUN9oMmBAmaczecTZ05a/2t2vP8C1e4UNS88ti6jgO5KJAp+wbHwDK7nGVfMvwS/Y/Wfue1ra/m0Wf9wswP73PoiR3XS2ldMx3epdqaoU6qYMnZ3xYY1cCv8gmOda92N8DvGHyditdxo/0sHO/kLfOwT9tbHwVolY3zmudH1r1dtS1GnFfpLJWt9Zk76T+A2CylOwS34bQa941PDD+OD8JZVtRwWBXFgH58EcJaef7AhYz4wvSN+mWpPilqypsf63yH96MeBeOBNsQlOwes8u824Vl4cfsfqQLmta2r58QHfnQTQKM4mHDlj54oZ44NMnEm1QrchPV3a+H3pV3n0L989G+CwKFyCTzfQO3YHv2N10Ny2tbWcsyjYrEAd9nzizKz5tUPbfJzokAqs7MS0WevreC7AN4lEhT9wCB51Pt16afA7xpdgPWDHuhVbFMTZ10mcKY3CxJlUR2QnEp1c4USi4A2LecLf6eb1i9kb/I7xpUk5CYytf6lQJxe0Da4/r2xDf1iu9n/ExJlUJ7V389lnlTPGx/FyjY4+G6D4Am/gziv0jpcHP4wCwFva/5AQzrK4B2tvVMia353eGX+Lag+K6rimR/t/q+IkEm3nswGKKfshHZeLeW68fPgd2wWSf0fW1PITrV0URFDnE2dmzAOllPEeFf/QSaY3g7WxwTPUj77Q3k19Z6Jc6sfQqZoxrm7LC2gdhoQncGXz1QLoHbcOfseqcDn7ScHWrAfgXuuRXYO1ctr6/MzY6piKeah0aGdfbylrfTmXMp6ckWGn+rUvlHvnWWdLuZ4qZ80voZzq16HSzLboKrkwfQH9tCXPBoAbezGvbwFXrXTr4XeMwi5jURBnTydxZiljPlwYj1+h4hw6VVLWu8oZ61e1q9+IWD7+zGjsN9R/+UJIGjmbMp9C+UpSzkp64Cr1X6FTJR2/opQ2/x791lMiUXDSgsU8N24f/I5R+OSqJS0KOvfs5yatfCVtXI/EjCq2odLUePzCatb8NuaUWOuA82njsZZnaF2msEkqlzL3Yt7rrMlUs9a9U93wqmkP2if9Vfrth5eUSFRxUV/MU/P6Zjy10O2HH0ZFxDkXi4J64sywziORJr2aMf9T5aRXmwcBfpTTuRtTxt2YtHmz38rbKc2OxjeeNpGoYgFcgA+HlaYctdidgd+xU7GRNbXchLNzsD400l52+bjMnUKbOLM0Ed9azVh77FicdB85KPDDepvKKOCRXCq+Rf156FRIGSmJweN4y878ZiGn7wsH9cW8zkHvuLPwO1aVxI4j6TS1Oek0MkQ6WkoZn0TCRRWzUCk/tmadDPH/BleIUz1BFiT4daM+yJojo5mv5kfWrlUfC5Wkzc5DYlj0c/R39PvFdtx1wisDv2OpdHnLqlppbN3B2XEjlIkzsQehOGG+v5I1T/tq86DCj/q8tPfCnC6nzN9DPj318VAJiUQr0t/R71cKescrC7/4ha2x2vRQ5CcqNqGSDPl+V672/xdQuNk1FlT4HaN+zq5LGQb/KLfTvEgdIlSaHer9Kfp9Mx466RWH/6gEYWY48pCKSyj0mAwBKxnzzypZ6wTSpDcDpZmDDr9u5NAvS/0rafNPwzTVq4lnhyMPo98346GTJvwdVmFiIF2dtJ7A1X6pmWK6CX7U28m0JPPgx2dTRkodrqtF+DWHBX7kDpzLmPcgRxwW9ZYCveNugt8x4uDc3pXR0D2zqfhGddiuFOHX3O3wA9RCeuBGmeOWcZUruHng4xTuRvgdIy6IT3XSLEm8bnjIZ3VslQi/5m6Gf3Zi/WYZ0tqPerYiL3w3ww8jPtp7FR6eHVu/SX1F14jwa+5G+PFq5HLG/GKrX23e7fDrRtywSaYkcczt7F+jvirwIvyauw3+UnrgfXLVeg5Xr5Zu7xSHCX7Ebf5dipPWgVJq4F+rrwu0CL/mboFfhqi/Xc2a/9tO7LCrPYkdwgS/Y8QR8bQ3C2Ws7xfH429TXxtIEX7NQYd/38jac0pp84/l6nSk3Smdwgi/4/nUbRLnUsr8xJNj685WXx8oEX7NQYa/PGGNVTuYzDHM8MOIr7ZZ6JcyFRhVRQiMCL/mIMI/vcOwyhnzv9lpnNvc4XWHHX7d2CyE+JfT5p3TY5apiuJ7EX7NQYL/wQt7Xl7JmB+Sq878Cxyadcx2mfAvtLNZSNojV0kbv4/2UUXyrQi/5qDAXxg33ilX+/9nrz57Sc/UAhP+RqMdnHRv5Yz103LKfIcqli9F+DX7Hf79W9dEK1nzs/ZLG5ewCacdJvyLG5ukqpPWCbyc9entayKqeL4S4dfsZ/grafNflbPms7iqtPqevRcT/sWN9nGeDShlzGdlivZuVUTfiPBr9iP8eBmInjhzpaF3TPjdGe2FWKlnA76FRKiqqCsuwq/ZT/Dnd7/pHJnXNyTO9IsJ/9LsPBsg7TlXTps3o31VkVdMhF+zn+DP7ej/cO09F9SqbXpCb7km/Es32hHtiXadGe2/XhV5xUT4NfsJ/unNvTfXRvtquZ2dffGoWxP+JVq1H3Lh10bX1KR9b1JFXjERfs1+gn92KPrR2og0ylCkltu6ppYbb+07B5drwu/Sqs3Qfrmt9Vz4aFfpZx9RRV4xEX7NvoN/26p62VRmVbwrLZdy3jHQpKN10IT/NEb7APoJo5YbWfiOO7Qr4V9owq9pAfyOnZPAdm/vHGylCf8iRrvgHXfSTnq7OSb8jSb8mprC7xidCS8eHe1/qbOd3AHbbMLfxKod0C6LvdiS8Dea8GtaFH4YHQvesqq+KKiGmQ0dsk0m/JoRd4k/2gHtMd82zdpNTPgbTfg1nRZ+x05H27pa5pedWxQk/GIVa8Qd8T8d9I4Jf6MJvybX8DtWnQ6LgnlnUbBZh22RQw8/4itxRrz1+Lsx4W804de0ZPgdOyeBHe1dFAwt/IgnFvMkvnq8l2LC32jCr8kz/I7RKZOxWm6sPYuCoYNfxQ/xRFy9QO+Y8Dea8GtaNvwwOii8ZXUttzNe78AtOgmEBn4VM8QPcZyPabN4uzThbzTh19QS+B2rDpsbWWM/dNKKk0DXw+9APzFgx60V0Dsm/I0m/JpaCr9j1Xlz29Yue1Gwq+FHXOzFvLUL4tYqE/5GE35NbYHfsXMSsBcFVWdvBsEi7kr4EQeJx3IW89yY8Dea8GtqK/yO0bmTq+ydZvOd/2QgTuGugl/VG3FAPNoFvWPC32jCr6kj8MPo6DAWBcfdLwp2Bfyqrqh3qxbz3JjwN5rwa+oY/I5Vx8fiVn5+UbAJMMqBht95FNrecdfaxTw3JvyNJvyaOg6/YwVBbjsWBU/9kFBg4Ud9pF6on17fTprwN5rwa1ox+B0DikV2DgYOflX+3Oi6RXfcdcKEv9GEX9OKww8PwQIJFgXxkJAGUWDgd6DHQzrOYh7q1ay+HTLhbzTh1+QL+B3bwIixc1AtCh69cqO/4Uf5pJz2Yt4Sdtx1woS/0YRfk6/gd+wAtK2vdnQSw2nznwCbKrIvdOjSc1+dy1iPH8ladjn9BL1jwt9owq/Jl/A7FpiObJWpwLa+R2pjg2eoIvtCezf1nZnbtmbPYSmf36B3TPgbTfg1+Rp+sR2rod4HVXF9pdmh3of80KFPZcLfaMKvKRDw+yRWuvzUoU9lwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt9owq+J8HsT4Xcvwq+Z8Ls34fduwt/onmNbV9UKiagEpvkftNuE370Jv3cT/rrBOXgH9z0zQ9HPVZKx2gsrVBjC796E37sJf93gHLyDe7tAUphNpUT04drIqloZ/9HkQ+0y4Xdvwu/dYYYfPINr8F1KxB4C7/XSKO27ePUrSsnYHxYT0fKL8kd59aFmB2ulCb97E37vDiP84DcvQ3zwLBf3Umk48uEfCOf1kjTRbKL3AjlL3I3hwZEt7S8g4Xdvwu/dYYQf/ILjciJ218Et52+sl8CFColoRkYB+xA0+dc+izT7guWa8Ls34ffusMAPTsGr4vap2WQ0Xf/mJepAMnKeTAU+XU5GXzjepsISfvcm/N4dBvhz4uMjsVpJeBVuP/WY8Fv/1mUol4xcVEzEfoS5Q7XFC4KE370Jv3d3M/zgsSpDfPBZTER+ODsUeXv921qkG3p6XiYjgGtl/jCFQGIhoRUnAcLv3oTfu7sRfvAHDlE34fJQcTh6LTitf1MbdHBL77ricOyrWExoRQUIv3sTfu/uRvidRflSInp7ftMb1ta/oQMqJqJbxHvss84ypgKE370Jv3d3C/zgzL5nL/UR/h4pJqPJ+pE7rL2bzz6rOBS9uZKIVU7IfAMLDs0KvJgJv3sTfu/uBvjBF+b1MsSvCPgf23Ppua+uH3UFld8ce3N+OHLfiZFY7bAMQ5YyCiD87k34vTvo8IMrrOTLHP9bU8Jb/Wg+Un4odlUlGd2vhiSuTgKE370Jv3cHEX7wA45Q9nIiuj+XiO2uH8Wnmtq0JiKjgNuweQA7h5pVSjfhd2/C791BhB/8gKPcUPRzh4bO660fIQDKD/W+o5yM/gRBt3cRNakcTPjdm/B7d1DgByfgxd5kl4j+OD98/mX1TwZMezf1nSlzlA9JJXIIfrNnAwi/exN+7w4C/M49e5k6z+aHYx/cMzZ4Rv1TAdb0pqgpo4A7m20WIvzuTfi92+/wH1XPzQgnd0wNRY36X3eR8oneUTmrPYaGKCXrowDC796E37v9CD/6f0nds5fR8aP5ZGRH/a+6VPsTfeeWEtE/LiaiR/FsAEYDhN+dCb93+w1+9Hv0f2HhSCER/cTPhYv6X4RAM1esfmslEf1+bXR1TaD7hfr1iorwexPhX5okVo+i30v//9705t5/rn4dLqHTlJOR908PR+6rXX3hy+u/XTkRfm8i/O5VGxs8Q2J1nwzzf0/9Ktya3nLOa2oX9/y6+nHFRPi9ifC7F/o5+rv6kfKLCL83EX4q8CL83kT4qcCL8HsT4acCL8LvTYSfCrwIvzcRfirwIvzeRPipwIvwexPhpwIvwu9NhJ8KvAi/NxF+KvAi/N5E+KnAi/B7E+GnAi/C702Enwq8CL83EX4q8CL83kT4qcDL7/Aj+8v0cPQnqri+kpTvpyjfyWX2iwk/taj8Dj/e0VZIRA9ODUcuVkX2hXKbey8pSrlQvmbl9oMJP7Wo/A6/k9O9lIgeKyVif3rgksh5qugrouc29b5eyvFnUp7ji72bwQ8m/NSi8jv8MABzXuEk0D1ZHI5kVfE7qmIyMinf/xTK4fbVbCtpwk8tqunN0Zv8Dr9uvAPhmMyzy8noPQcv771AVaOten7oDW8sJ6L/89hI4zsY/Gy7XYd6P6aqQVELJVf+j9XGVmNe7fsrmWPntc1yFS6XEpEb9l28+hWqOi3VA2+L/UZpOHKjjDQq+D4vr2NfCaMd0Z5oV175qVNqZnh1TK6iX6jKFc3PK9cnGx0ci232VCAZ/fupzb1Dqkot0dRw77Ac9x9wfHxPUE6MMNqxIu1ZGI58YXrrmqiqEkU11+xwZFM5EXsoqJ29KmWWofkXf7U5ukpVyZOevSK6Wo7zpSCfDNGOU0ORzapKFHV64SWjpUTshqIMpwM5zMUoIBE9WBiOvU9VaUnKDcWukc8/j+MEaRqUF6O90G6lZOQP0Y6qShS1NB1M9F5QTMTuxsLa4QAtcAHWOSmvWg/4/kxi9VtVlRbVzPCqf1FJRr+PV0nh80Ea9WABEiMUmaLcM7vp/I2qShS1POGWmlxNAnNryzFGLOqdcEcLw9E/2XNF7LWqSgv0jPy+JP+Pv8PfB2mkg/ZQ7fJkLhHNqCpRVOt0IBk5T4aSn5J58LHjI8EaBeCtyACkkog+NpvoHVNVslUY7t0pV/t/sqcK6u3JzY7jN+MEhXYoJ6MvlJKxTz/7zujrVJUoqj2Sq8vvlhORH9bkConFtSAOjWeGIt+Y2Ry5fHYoegd+DtI9e8QbcX9RwC9KO+SSkYtU01BU+1W7oedlxWT02nIiNhXERTEAjxVx/Iufg1B2lNFZzETci0PRf3+DtINqEorqrA5tfv364nDsq1gM9POW1mbOC0jNfu9X40SFOMsJ4PbnE2/oV01AUSsrmQpsKSVij9TnzcGaCvjZiKNzz76SjP08NxzZqkJOUf4RXr0sV9Oby4loNUgr5n414odblTLEr8jU5KZHf4evtqZ8rvzm2JuLyci3j0vHxTCVo4ClGfFC3BC/4nDk24inCi1FBUP5odhVMgrYjyFrkJ4NWCkjPs49e7naP50f7r1ShZKigqepTa+L5Iain0Oyi2NyJWvW6em6ER+Z35/IS7yelripEFJUsJXfsuod5WT0x3g2wO9ZbzppxAHxQFxklPRAfvj8y1TIKKp7hE0m+eHof5ROnsNCVtButbXaqL+9oJeMzs4moh/aMzZ4hgoVRXWnnt0UNYvJ6J32k3UBezagVcYzEbDM8e+YGooaKjQUFQ4VEr1jlWT00fqzAd2/IIj6OXsM5Gr/aH5z76gKBUWFT/sTfeeWEtFPBG033VKNejm7C4vJ2H9GvVUIKCrcOhjgffSLGfVAfVCvaiL6Pbd5BSgqdJpN9P4bGRo/h6FxkDYLnWyU29mEI/U5UBqOvFdVkaKoUwm592R4/EVcMbEo2AwuvxvlRvmREPWZ4dUxVTWKotxodiiyWU4CD9v3wAPwbADK52zCKSViDyERqqoKRVFLFfLwF4ajNxZ9nEgU0DuJM+VkVSokIjf8oE3vD6Co0Gk20XuBXFXvxiOwfsu6g/LYj+YmYncd3MLEmRTVFqlEovswtF7JzUL4XmcTjvz7VIGJMymq/aonEo19WubVx4+vwIIgph524sxE7JiU41OPSXlU0SiK6oRyw5GLi4nYjzDX7kQiURy/njgTV/vID0tMnElRK6cbenpeVtYSiWKzTKtPAjgejovj43uKw9Fr8b2qCBRFraScRKJYfGt1IlF7A5Ict5SI3l5g4kyK8qeKiegW8R77Kr2MqQA+59yzl+M9UkxGk+orKIryq/ZuPvus4lD05koiVvGyWcjZhCND/IoM8W96dAsTZ1JUoITEl/nhyH0nRur57t2MAuqJM/Eij8i3p5g4k6KCLSQSrSRPnUgUP+P39QW96P5iIrZbfZSiqKBratOaiFzNb7MTiW5dmEgUP+P3SDR6aOi8XvURiqK6SfmhXiQS/Qnu1QN4/CtX+x8zcSZFhUC4R19I9l5THYk9kRuOvE/9mgqVenr+P+OvTjWo+kMRAAAAAElFTkSuQmCC</data>
+        <data key="type">image/png</data>
+        <data key="name" unique="prefix">magento-logo.png</data>
+    </entity>
+</entities>
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 9f6c9f44e63..0adf1e91ae8 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
@@ -8,7 +8,7 @@
 
 <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="productAttributeWithTwoOptions" type="ProductAttribute">
+    <entity name="productAttributeWysiwyg" type="ProductAttribute">
         <data key="attribute_code" unique="suffix">attribute</data>
         <data key="frontend_input">textarea</data>
         <data key="scope">global</data>
@@ -31,4 +31,46 @@
         <data key="used_for_sort_by">true</data>
         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
     </entity>
+    <entity name="productAttributeWithTwoOptions" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</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>
+    <entity name="productDropDownAttribute" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</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/ProductAttributeMediaGalleryEntryData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeMediaGalleryEntryData.xml
new file mode 100644
index 00000000000..5dee0651064
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeMediaGalleryEntryData.xml
@@ -0,0 +1,33 @@
+<?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="ApiProductAttributeMediaGalleryEntryTestImage" type="ProductAttributeMediaGalleryEntry">
+        <data key="media_type">image</data>
+        <data key="label" unique="suffix">Test Image </data>
+        <data key="position">1</data>
+        <array key="types">
+            <item>image</item>
+            <item>small_image</item>
+            <item>thumbnail</item>
+        </array>
+        <data key="disabled">false</data>
+        <requiredEntity type="ImageContent">TestImageContent</requiredEntity>
+    </entity>
+    <entity name="ApiProductAttributeMediaGalleryEntryMagentoLogo" type="ProductAttributeMediaGalleryEntry">
+        <data key="media_type">image</data>
+        <data key="label" unique="suffix">Magento Logo </data>
+        <data key="position">1</data>
+        <array key="types">
+            <item>small_image</item>
+        </array>
+        <data key="disabled">false</data>
+        <requiredEntity type="ImageContent">MagentoLogoImageContent</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 704d2dd2743..231bcd5b427 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
@@ -21,6 +21,23 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="ApiSimpleProduct" 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">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="ApiSimpleProductUpdateDescription" type="product2">
+        <requiredEntity type="custom_attribute">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute">ApiProductShortDescription</requiredEntity>
+    </entity>
     <entity name="SimpleProduct" type="product">
         <data key="sku" unique="suffix">SimpleProduct</data>
         <data key="type_id">simple</data>
@@ -48,6 +65,32 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
+    <entity name="ApiSimpleOne" type="product2">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <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">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
+    <entity name="ApiSimpleTwo" type="product2">
+        <data key="sku" unique="suffix">api-simple-product-two</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 Two</data>
+        <data key="price">234.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product-two</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
     <entity name="VirtualProduct" type="product">
         <data key="sku" unique="suffix">virtualproduct</data>
         <data key="type_id">virtual</data>
@@ -59,11 +102,35 @@
         <data key="status">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
     </entity>
+    <entity name="SimpleTwo" type="product2">
+        <data key="sku" unique="suffix">SimpleTwo</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">1.23</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductUrlKey</requiredEntity>
+    </entity>
     <entity name="ImageUpload" type="uploadImage">
         <data key="title" unique="suffix">Image1</data>
         <data key="price">1.00</data>
         <data key="file_type">Upload File</data>
         <data key="shareable">Yes</data>
-        <data key="file">logo.png</data>
+        <data key="file">magento-logo.png</data>
+    </entity>
+    <entity name="ProductWithUnicode" type="product">
+        <data key="sku" unique="suffix">&#38657;&#20135;&#21697;</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">&#38657;&#20135;&#21697;</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_media_gallery_entry-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_media_gallery_entry-meta.xml
new file mode 100644
index 00000000000..16979410131
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_media_gallery_entry-meta.xml
@@ -0,0 +1,46 @@
+<?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="CreateProductAttributeMediaGalleryEntry" dataType="ProductAttributeMediaGalleryEntry" type="create" auth="adminOauth" url="/V1/products/{sku}/media" method="POST">
+        <contentType>application/json</contentType>
+        <object key="entry" dataType="ProductAttributeMediaGalleryEntry">
+            <field key="id">integer</field>
+            <field key="media_type" required="true">string</field>
+            <field key="label" required="true">string</field>
+            <field key="position" required="true">integer</field>
+            <field key="disabled" required="true">boolean</field>
+            <array key="types">
+                <value>string</value>
+            </array>
+            <field key="file">string</field>
+            <field key="content">ImageContent</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+    <operation name="UpdateProductAttributeMediaGalleryEntry" dataType="ProductAttributeMediaGalleryEntry" type="update" auth="adminOauth" url="/V1/products/{sku}/media/{id}" method="PUT">
+        <contentType>application/json</contentType>
+        <object key="entry" dataType="ProductAttributeMediaGalleryEntry">
+            <field key="id" required="true">integer</field>
+            <field key="media_type" required="true">string</field>
+            <field key="label" required="true">string</field>
+            <field key="position" required="true">integer</field>
+            <field key="disabled" required="true">boolean</field>
+            <array key="types">
+                <value>string</value>
+            </array>
+            <field key="file">string</field>
+            <field key="content">ImageContent</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+    <operation name="DeleteProductAttributeMediaGalleryEntry" dataType="ProductAttributeMediaGalleryEntry" type="delete" auth="adminOauth" url="/V1/products/{sku}/media/{id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml
index 2a0a9baae40..305dcb59704 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml
@@ -15,5 +15,6 @@
         <section name="AdminProductImagesSection"/>
         <section name="AdminAddProductsToOptionPanel"/>
         <section name="AdminProductMessagesSection"/>
+        <section name="AdminProductFormRelatedUpSellCrossSellSection"/>
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml
index b3e3400d877..ac699e55f45 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml
@@ -8,7 +8,7 @@
 
 <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="StorefrontCategoryPage" url="/{{var1}}.html" area="storefront" module="Category" parameterized="true">
+    <page name="StorefrontCategoryPage" url="/{{var1}}.html" area="storefront" module="Catalog" parameterized="true">
         <section name="StorefrontCategoryMainSection"/>
         <section name="WYSIWYGToolbarSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductComparePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductComparePage.xml
new file mode 100644
index 00000000000..e110ee7f3bc
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductComparePage.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="StorefrontProductComparePage" url="catalog/product_compare/index" module="Magento_Catalog" area="storefront">
+        <section name="StorefrontProductCompareMainSection" />
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductPage.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductPage.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductPage.xml
index b811a65a5b6..d6e135e9af2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductPage.xml
@@ -8,10 +8,12 @@
 
 <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="AdminProductPage" url="catalog/product/view" area="admin" module="Magento_Catalog">
+    <page name="StorefrontProductPage" url="/{{var1}}.html" area="storefront" module="Catalog" parameterized="true">
         <section name="StorefrontProductInfoMainSection" />
         <section name="StorefrontProductInfoDetailsSection" />
+        <section name="WYSIWYGToolbarSection"/>
         <section name="StorefrontProductImageSection" />
         <section name="StorefrontMessagesSection" />
+        <section name="StorefrontProductRelatedProductsSection"/>
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCreateProductAttributeSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCreateProductAttributeSection.xml
index 003957c56ee..362a039e341 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCreateProductAttributeSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCreateProductAttributeSection.xml
@@ -13,8 +13,9 @@
         <element name="InputType" type="select" selector="#frontend_input"/>
         <element name="ValueRequired" type="select" selector="#is_required"/>
         <element name="AdvancedProperties" type="button" selector="#advanced_fieldset-wrapper"/>
-        <element name="Default Value" type="input" selector="#default_value_text"/>
+        <element name="DefaultValue" type="input" selector="#default_value_text"/>
         <element name="Save" type="button" selector="#save"/>
+        <element name="SaveAndEdit" type="button" selector="#save_and_edit_button"/>
         <element name="TinyMCE4" type="button" selector="//span[text()='Default Value']/parent::label/following-sibling::div//div[@class='mce-branding-powered-by']"/>
         <element name="checkIfTabOpen" selector="//div[@id='advanced_fieldset-wrapper' and not(contains(@class,'opened'))]" type="button"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml
index 86bb7321a07..97e8a913e60 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductAttributeGridSection">
         <element name="AttributeCode" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="createNewAttributeBtn" type="button" selector="button[data-index='add_new_attribute_button']"/>
     </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 1516850c792..2599116bcc4 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
@@ -19,6 +19,20 @@
         <element name="contentTab" type="button" selector="//strong[@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']"/>
+        <element name="addAttributeBtn" type="button" selector="#addAttribute"/>
+        <element name="createNewAttributeBtn" type="button" selector="button[data-index='add_new_attribute_button']"/>
+        <element name="save" type="button" selector="#save"/>
+        <element name="attributeTab" type="button" selector="//strong[@class='admin__collapsible-title']/span[text()='Attributes']"/>
+        <element name="attributeLabel" type="input" selector="//input[@name='frontend_label[0]']"/>
+        <element name="frontendInput" type="select" selector="select[name = 'frontend_input']"/>
+        <element name="productFormTab" type="button" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]" parameterized="true"/>
+        <element name="productFormTabState" type="text" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]/parent::*/parent::*[@data-state-collapsible='{{state}}']" parameterized="true"/>
+    </section>
+    <section name="AdminProductFormRelatedUpSellCrossSellSection">
+        <element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
+    </section>
+    <section name="AdminAddRelatedProductsModalSection">
+        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'product_form_product_form_related_related_modal')]//button/span[contains(text(), 'Add Selected Products')]" timeout="30"/>
     </section>
     <section name="ProductWYSIWYGSection">
         <element name="Switcher" type="button" selector="//select[@id='dropdown-switcher']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridConfirmActionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridConfirmActionSection.xml
index 0b3982d7880..c9ea9993c7b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridConfirmActionSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridConfirmActionSection.xml
@@ -12,6 +12,6 @@
         <element name="title" type="text" selector=".modal-popup.confirm h1.modal-title"/>
         <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
         <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
-        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="30"/>
+        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
     </section>
 </sections>
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 0bc82c8bcdd..ea822d223e4 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,6 +10,10 @@
         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="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"/>
         <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
         <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="columnsDropdown" type="button" selector=".admin__data-grid-action-columns button.admin__action-dropdown"/>
@@ -24,5 +28,7 @@
         <element name="priceFilterTo" type="input" selector="input.admin__control-text[name='price[to]']"/>
         <element name="typeFilter" type="select" selector="select.admin__control-select[name='type_id']"/>
         <element name="statusFilter" type="select" selector="select.admin__control-select[name='status']"/>
+        <element name="keywordSearch" type="input" selector="input#fulltext"/>
+        <element name="keywordSearchButton" type="button" selector=".data-grid-search-control-wrap button.action-submit" timeout="30"/>
     </section>
 </sections>
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 fc693d6aa1d..7136dba2a1f 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
@@ -11,6 +11,7 @@
     <section name="AdminProductGridSection">
         <element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
         <element name="productGridElement1" type="input" selector="#addselector" />
         <element name="productGridElement2" type="text" selector="#addselector" />
         <element name="productGridRows" type="text" selector="table.data-grid tr.data-row"/>
@@ -22,5 +23,6 @@
         <element name="multicheckOption" type="button" selector="//div[@data-role='grid-wrapper']//th[contains(@class, data-grid-multicheck-cell)]//li//span[text() = '{{label}}']" parameterized="true"/>
         <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"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml
index f048027eaf3..f88f8c72c64 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductMessagesSection">
         <element name="successMessage" type="text" selector=".message-success"/>
+        <element name="errorMessage" type="text" selector=".message.message-error.error"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductModalSlideGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductModalSlideGridSection.xml
new file mode 100644
index 00000000000..746b95f4201
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductModalSlideGridSection.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="AdminProductModalSlideGridSection">
+        <element name="productGridXRowYColumnButton" type="input" selector=".modal-slide table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductRelatedUpSellCrossSellSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductRelatedUpSellCrossSellSection.xml
new file mode 100644
index 00000000000..225bedb6fd2
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductRelatedUpSellCrossSellSection.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="AdminProductFormRelatedUpSellCrossSellSection">
+        <element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
+        <element name="relatedProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='related']"/>
+        <element name="upSellProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='upsell']"/>
+        <element name="crossSellProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='crosssell']"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryFilterSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryFilterSection.xml
new file mode 100644
index 00000000000..8f612e4d99e
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryFilterSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryFilterSection">
+        <element name="CategoryFilter" type="button" selector="//main//div[@class='filter-options']//div[contains(text(), 'Category')]"/>
+        <element name="CategoryByName" type="button" selector="//main//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
+    </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 4df917c4574..e2102ea351c 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
@@ -16,5 +16,6 @@
         <element name="productCount" type="text" selector="#toolbar-amount"/>
         <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}}') and not(contains(@src,'{{var2}}/'))]" parameterized="true"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryProductSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryProductSection.xml
new file mode 100644
index 00000000000..e736378ca8c
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryProductSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryProductSection">
+        <element name="ProductTitleByNumber" type="button" selector="//main//li[{{var1}}]//a[@class='product-item-link']" parameterized="true"/>
+        <element name="ProductPriceByNumber" type="text" selector="//main//li[{{var1}}]//span[@class='price']" parameterized="true"/>
+        <element name="ProductInfoByNumber" type="text" selector="//main//li[{{var1}}]//div[@class='product-item-info']" parameterized="true"/>
+        <element name="ProductAddToCompareByNumber" type="text" selector="//main//li[{{var1}}]//a[contains(@class, 'tocompare')]" parameterized="true"/>
+
+        <element name="ProductTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="ProductPriceByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
+        <element name="ProductImageByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
+        <element name="ProductInfoByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//div[@class='product-item-info']" parameterized="true"/>
+        <element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontComparisonSidebarSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontComparisonSidebarSection.xml
new file mode 100644
index 00000000000..615d37f75cd
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontComparisonSidebarSection.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="StorefrontComparisonSidebarSection">
+        <element name="Compare" type="button" selector="//main//div[contains(@class, 'block-compare')]//a[contains(@class, 'action compare')]"/>
+        <element name="ClearAll" type="button" selector="//main//div[contains(@class, 'block-compare')]//a[contains(@class, 'action clear')]"/>
+        <element name="ProductTitleByName" type="button" selector="//main//ol[@id='compare-items']//a[@class='product-item-link'][text()='{{var1}}']" parameterized="true"/>
+        <element name="NoItemsMessage" type="text" selector="//main//div[contains(@class, 'block-compare')]//div[@class='empty']"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontHeaderSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontHeaderSection.xml
new file mode 100644
index 00000000000..dbca5f06a14
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontHeaderSection.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="StorefrontHeaderSection">
+        <element name="NavigationCategoryByName" type="button" selector="//nav//a[span[contains(., '{{var1}}')]]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml
index eae52608b37..5f3851ad9b2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml
@@ -9,6 +9,6 @@
 <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="StorefrontMessagesSection">
-        <element name="test" type="input" selector=".test"/>
+        <element name="success" type="text" selector="div.message-success.success.message"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProducRelatedProductsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProducRelatedProductsSection.xml
new file mode 100644
index 00000000000..9165697051d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProducRelatedProductsSection.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="StorefrontProductRelatedProductsSection">
+        <element name="relatedProductsActionsHeaderText" type="text" selector=".block.related .block-actions" />
+        <element name="relatedProductsListSectionText" type="text" selector=".block.related .products.wrapper.grid.products-grid.products-related" />
+        <element name="relatedProductName" type="button" selector="//*[@class='block related']//a[contains(text(), '{{productName}}')]" parameterized="true"/>
+        <element name="relatedProductCheckBoxButton" type="button" selector="//*[@class='block related']//a[contains(text(), '{{productName}}')]/parent::*/parent::*//input[@class='checkbox related']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml
index 976bd2adac2..337db47880c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml
@@ -9,5 +9,8 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductActionSection">
         <element name="addToCart" type="button" selector="#product-addtocart-button"/>
+        <element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
+        <element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/>
+        <element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductCompareMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductCompareMainSection.xml
new file mode 100644
index 00000000000..cd7e7637b27
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductCompareMainSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductCompareMainSection">
+        <element name="PageName" type="text" selector="//*[@id='maincontent']//h1//span"/>
+        <element name="ProductLinkByName" type="button" selector="//*[@id='product-comparison']//tr//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="ProductPriceByName" type="text" selector="//*[@id='product-comparison']//td[.//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
+        <element name="ProductImageByName" type="text" selector="//*[@id='product-comparison']//td[.//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
+        <element name="ProductAttributeByCodeAndProductName" type="text" selector="//*[@id='product-comparison']//tr[.//th[./span[contains(text(), '{{var1}}')]]]//td[count(//*[@id='product-comparison']//tr//td[.//strong[@class='product-item-name']/a[contains(text(), '{{var2}}')]]/preceding-sibling::td)+1]/div" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml
index 1f0c0721b64..d87c97adf11 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml
@@ -12,13 +12,15 @@
         <element name="stock" type="input" selector=".stock.available"/>
         <element name="productName" type="text" selector=".base"/>
         <element name="productSku" type="text" selector=".product.attribute.sku>.value"/>
-        <element name="productPrice" type="text" selector=".price"/>
+        <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
         <element name="productStockStatus" type="text" selector=".stock[title=Availability]>span"/>
-        <element name="productDescription" type="text" selector="//div[@id='product.info.description']//p[1]"/>
-        <element name="productShortDescription" type="text" selector="//div[@class='product attribute overview']//p"/>
+        <element name="productImage" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[@class='fotorama__img']"/>
+        <element name="productDescription" type="text" selector="//div[@id='product.info.description']//div[@class='value']"/>
+        <element name="productShortDescription" type="text" selector="//div[@class='product attribute overview']//div[@class='value']"/>
         <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
         <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
         <element name="mediaDescription" type="text" selector=".product.attribute.description>div>p>img"/>
         <element name="mediaShortDescription" type="text" selector=".product.attribute.overview>div>p>img"/>
+        <element name="productAddToCompare" type="button" selector="a.action.tocompare"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogCest.xml
index 77f85a2522c..8aa58cf1fb1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogCest.xml
@@ -21,6 +21,8 @@
             <description value="Admin should be able to add image to WYSIWYG Editor on Catalog Page"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84373"/>
+            <!--Skip because of issue MAGETWO-88266-->
+            <group value="skip"/>
         </annotations>
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToNewCatalog"/>
         <waitForPageLoad stepKey="wait1"/>
@@ -37,18 +39,19 @@
                 <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         <actionGroup ref="attachImage" stepKey="attachImage1">
-            <argument name="Image" value="ImageUpload"/>
+            <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
         <actionGroup ref="deleteImage" stepKey="deleteImage"/>
         <actionGroup ref="attachImage" stepKey="attachImage2">
-            <argument name="Image" value="ImageUpload"/>
+            <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
         <actionGroup ref="saveImage" stepKey="insertImage"/>
         <actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup" />
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCatalog"/>
         <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload.content)}}" stepKey="assertMediaDescription"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
+        <seeElementInDOM selector="{{StorefrontCategoryMainSection.ImageSource(ImageUpload3.fileName,ImageUpload3.extension)}}" stepKey="assertMediaSource"/>
         <after>
             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml
index 572c535eabd..ddc904d2ae3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml
@@ -16,6 +16,8 @@
             <description value="Admin should be able to add image to WYSIWYG Editor on Product Page"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84375"/>
+            <!--Skip because of issue MAGETWO-88266-->
+            <group value="skip"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="login"/>
@@ -49,24 +51,24 @@
         <waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder1" />
         <click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder1" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoading4" />
-        <attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload.file}}" stepKey="uploadImage1"/>
+        <attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage1"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading5" />
-        <waitForElementVisible  selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="waitForUploadImage1" />
-        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.imageSelected(ImageUpload.file)}}" stepKey="seeImageSelected1" />
+        <waitForElementVisible  selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage1" />
+        <seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.imageSelected(ImageUpload1.value)}}" stepKey="seeImageSelected1" />
         <see selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn1"/>
         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected1" />
         <waitForText userInput="OK" stepKey="waitForConfirm1" />
         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.confirmDelete}}" stepKey="confirmDelete1" />
-        <waitForElementNotVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="waitForImageDeleted1" />
-        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="dontSeeImage1" />
-        <attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload.file}}" stepKey="uploadImage2"/>
+        <waitForElementNotVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForImageDeleted1" />
+        <dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="dontSeeImage1" />
+        <attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage2"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading6" />
-        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="waitForUploadImage2" />
+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage2" />
         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn1" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoading7" />
         <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="waitForOkBtn1" />
-        <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription1" />
-        <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload.height}}" stepKey="fillImageHeight1" />
+        <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload1.content}}" stepKey="fillImageDescription1" />
+        <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload1.height}}" stepKey="fillImageHeight1" />
         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn1" />
         <waitForPageLoad stepKey="waitForPageLoad3"/>
         <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="scrollToTinyMCE4" />
@@ -78,8 +80,8 @@
         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" userInput="Add Selected" stepKey="seeAddSelectedBtn2" />
-        <attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.file}}" stepKey="uploadImage3"/>
-        <waitForElementVisible  selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload1.file)}}" stepKey="waitForUploadImage3" />
+        <attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage3"/>
+        <waitForElementVisible  selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage3" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoading9" />
         <wait time="3" stepKey="waitMore" />
         <waitForElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="waitForDeletebtn" />
@@ -87,14 +89,14 @@
         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected2" />
         <waitForText userInput="OK" stepKey="waitForConfirm3" />
         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.confirmDelete}}" stepKey="confirmDelete2" />
-        <attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.file}}" stepKey="uploadImage4"/>
+        <attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage4"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading10" />
-        <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload1.file)}}" stepKey="waitForUploadImage4" />
+        <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage4" />
         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoading11" />
         <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="waitForOkBtn2" />
-        <fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload1.content}}" stepKey="fillImageDescription2" />
-        <fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload1.height}}" stepKey="fillImageHeight2" />
+        <fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload3.content}}" stepKey="fillImageDescription2" />
+        <fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload3.height}}" stepKey="fillImageHeight2" />
         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn2" />
         <waitForPageLoad stepKey="waitForPageLoad6"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
@@ -102,7 +104,8 @@
         <amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
         <waitForPageLoad stepKey="waitForPageLoad7"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.mediaDescription}}" stepKey="assertMediaDescription"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.mediaShortDescription}}" stepKey="assertMediaShortDescription"/>
+        <seeElementInDOM selector="{{StorefrontCategoryMainSection.ImageSource(ImageUpload3.fileName,ImageUpload3.extension)}}" stepKey="assertMediaSource3"/>
+        <seeElementInDOM selector="{{StorefrontCategoryMainSection.ImageSource(ImageUpload1.fileName,ImageUpload1.extension)}}" stepKey="assertMediaSource1"/>
         <after>
             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
             <actionGroup ref="logout" stepKey="logout"/>
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
new file mode 100644
index 00000000000..9a95ce7ddcf
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductDuplicateUrlkeyTest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminCreateSimpleProductDuplicateUrlkeyTest">
+        <annotations>
+            <features value="Product Creation Negative"/>
+            <stories value="Error when try to save project with duplicate URL key"/>
+            <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"/-->
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleTwo" stepKey="simpleProduct">
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="$$simpleProduct.name$$new" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="$$simpleProduct.sku$$new" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="$$simpleProduct.price$$" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="$$simpleProduct.quantity$$" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="$$simpleProduct.custom_attributes[url_key]$$" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <see userInput="The value specified in the URL Key field would generate a URL that already exists" selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="assertErrorMessage"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductTest.xml
index df6a1400c66..14e2478e9df 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductTest.xml
@@ -27,36 +27,16 @@
         </after>
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
-        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
-        <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="[$$createPreReqCategory.name$$]" stepKey="searchAndSelectCategory"/>
-        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-        <fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
-        <seeInField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
-        <seeInField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
-        <seeInField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
-        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
-        <seeInField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
-
-        <!-- Go to storefront category page, assert product visibility -->
-        <amOnPage url="{{StorefrontCategoryPage.url($$createPreReqCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/>
-        <see userInput="{{_defaultProduct.price}}" stepKey="assertProductPricePresent"/>
-
-        <!-- Go to storefront product page, assert product visibility -->
-        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="navigateToProductPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/>
-        <see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
-        <see userInput="{{_defaultProduct.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
-        <see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="_defaultProduct"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
     </test>
 </tests>
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
new file mode 100644
index 00000000000..46cf809ce9d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductWithUnicodeTest.xml
@@ -0,0 +1,43 @@
+<?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="AdminCreateSimpleProductWithUnicodeTest">
+        <annotations>
+            <features value="Product Creation"/>
+            <stories value="Create a Unicode Named Simple Product via Admin"/>
+            <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"/-->
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="simpleProduct" value="ProductWithUnicode"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
+            <argument name="category" value="$$createPreReqCategory$$"/>
+            <argument name="product" value="ProductWithUnicode"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2">
+            <argument name="product" value="ProductWithUnicode"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminEditTextEditorProductAttributeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminEditTextEditorProductAttributeCest.xml
index 370a331bc58..8d6159c0f8c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminEditTextEditorProductAttributeCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminEditTextEditorProductAttributeCest.xml
@@ -16,12 +16,13 @@
             <description value="Admin should be able to switch between 2 version of Tinymce in the admin back-end."/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-85745"/>
+            <group value="skip"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
             <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
-            <createData stepKey="myProductAttributeCreation" entity="productAttributeWithTwoOptions"/>
+            <createData stepKey="myProductAttributeCreation" entity="productAttributeWysiwyg"/>
             <createData stepKey="myProductAttributeSetAssign" entity="AddToDefaultSet">
                 <requiredEntity createDataKey="myProductAttributeCreation"/>
             </createData>
@@ -66,6 +67,11 @@
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGrid" />
         <waitForPageLoad stepKey="waitForPageLoad9"/>
         <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending" />
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.enabledFilters}}" visible="true" stepKey="clearAllExistingFilter"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingAfterFilterIsCleared"/>
+        <fillField selector="{{AdminProductGridFilterSection.basicSearchFilter}}" userInput="{{_defaultProduct.name}}" stepKey="addSearchFilterForTestProduct"/>
+        <click selector="{{AdminProductGridFilterSection.basicSearchFilterButton}}" stepKey="clickOnBasicSearchFilterButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingAfterBasicFilter"/>
         <click selector="{{AdminProductGridActionSection.productName(_defaultProduct.name)}}"  stepKey="navigateToEditProduct" />
         <waitForPageLoad stepKey="waitForPageLoad10" />
         <seeElement selector="{{ProductAttributeWYSIWYGSection.TinyMCE4($$myProductAttributeCreation.attribute_code$$)}}" stepKey="waitForPageLoad11"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CAdminTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CAdminTest.xml
index 981530993f0..027ffd59cdc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CAdminTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CAdminTest.xml
@@ -10,29 +10,26 @@
     <test name="EndToEndB2CAdminTest">
         <annotations>
             <features value="End to End scenarios"/>
-            <stories value="B2C - Admin"/>
+            <stories value="B2C admin - MAGETWO-75412"/>
             <group value="e2e"/>
+            <!--Skipped; see MAGETWO-88963-->
+            <group value="skip"/>
             <title value="Pass End to End B2C Admin scenario"/>
             <description value="Admin creates products, creates and manages categories, creates promotions, creates an order, processes an order, processes a return, uses admin grids"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-87014"/>
-            <!-- Skipped; see MAGETWO-88218 -->
-            <group value="skip"/>
         </annotations>
-        <before>
-            <!--Login to Admin Area-->
-            <actionGroup ref="LoginActionGroup" stepKey="loginToAdminArea"/>
-        </before>
         <after>
-            <!--Clean up products-->
-
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
         </after>
 
-        <!--Step 2. Admin create product-->
+        <!--Login to Admin Area-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+
+        <!--Admin creates product-->
         <!--Create Simple Product-->
         <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageSimple"/>
-        <waitForPageLoad stepKey="waitForProductPageLoadSimple"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageLoadSimple"/>
         <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="goToCreateProductPage" stepKey="goToCreateSimpleProduct">
                 <argument name="product" value="SimpleProduct"/>
@@ -57,7 +54,7 @@
 
         <!--Create Virtual Product-->
         <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageVirtual"/>
-        <waitForPageLoad stepKey="waitForProductPageLoadVirtual"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageLoadVirtual"/>
         <actionGroup ref="goToCreateProductPage" stepKey="goToCreateVirtualProduct">
             <argument name="product" value="VirtualProduct"/>
         </actionGroup>
@@ -70,10 +67,165 @@
             <argument name="product" value="VirtualProduct"/>
         </actionGroup>
 
-        <!--TODO - Move to 'after' block when MQE-732 is fixed-->
+        <!--Admin uses product grid-->
+        <!--Start with default view-->
+        <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageGrid"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+
+        <!--Search by keyword-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+        <actionGroup ref="searchProductGridByKeyword" stepKey="useKeywordSearchSimpleProduct">
+            <argument name="keyword" value="SimpleProduct.name"/>
+        </actionGroup>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOnlyOneProductInGrid"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{SimpleProduct.name}}" stepKey="seeOnlySimpleProductInGrid"/>
+
+        <!--Paging works-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultPagination"/>
+        <comment userInput="Admin uses paging on product grid" stepKey="usePagingProductGridComment"/>
+        <click selector="{{AdminProductGridPaginationSection.perPageDropdown}}" stepKey="clickProductPerPageDropdown"/>
+        <click selector="{{AdminProductGridPaginationSection.perPageOption('50')}}" stepKey="selectProductsPerPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForProductGridLoad50PerPage"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" parameterArray="[5,50]" stepKey="see50ProductsInGrid"/>
+        <click selector="{{AdminProductGridPaginationSection.perPageDropdown}}" stepKey="clickProductPerPageDropdownCustom"/>
+        <click selector="{{AdminProductGridPaginationSection.perPageOption('Custom')}}" stepKey="selectCustomPerPage"/>
+        <fillField selector="{{AdminProductGridPaginationSection.perPageInput}}" userInput="5" stepKey="fillCustomPerPage"/>
+        <click selector="{{AdminProductGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
+        <waitForPageLoad stepKey="waitForPageRefreshCustomPerPage"/>
+        <seeInField selector="{{AdminProductGridPaginationSection.currentPage}}" userInput="1" stepKey="seeOnFirstProductPage"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="5" stepKey="seeProductsOnFirstPage"/>
+        <click selector="{{AdminProductGridPaginationSection.nextPage}}" stepKey="clickNextProductPage"/>
+        <seeInField selector="{{AdminProductGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondProductPage"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" parameterArray="[1,5]" stepKey="seeProductsOnSecondPage"/>
+
+        <!--Filtering works  (by Name, By Price, by Status)-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultFiltering"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridByGroupedSku">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOneMatchingSkuInProductGrid"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1','SKU')}}" userInput="{{GroupedProduct.sku}}" stepKey="seeProductInFilteredGridSku"/>
+        <!--Filter by price-->
+        <actionGroup ref="filterProductGridByPriceRange" stepKey="filterProductGridByPrice">
+            <argument name="filter" value="PriceFilterRange"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="clickPriceHeaderToSortAscForFilter"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'Price')}}" stepKey="getMinimumPriceInGrid"/>
+        <click selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="clickPriceHeaderToSortDescForFilter"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'Price')}}" stepKey="getMaximumPriceInGrid"/>
+        <assertRegExp expected="'/\$[0-9]{2}\.[0-9]{2}/'" actual="$getMinimumPriceInGrid" stepKey="assertMinimumPriceIsCorrect"/>
+        <assertRegExp expected="'/\$[0-9]{2}\.[0-9]{2}/'" actual="$getMaximumPriceInGrid" stepKey="assertMaximumPriceIsCorrect"/>
+        <assertLessThan expected="$getMaximumPriceInGrid" actual="$getMinimumPriceInGrid" stepKey="checkPriceSortCorrect"/>
+        <!--Filter by status-->
+        <actionGroup ref="filterProductGridByEnabledStatus" stepKey="filterGridByEnabledProducts"/>
+        <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" parameterArray="[1,20]" stepKey="seeEnabledProductsNotEmpty"/>
+        <see selector="{{AdminProductGridSection.column('Status')}}" userInput="Enabled" stepKey="seeOnlyEnabledProducts"/>
+        <actionGroup ref="filterProductGridByDisabledStatus" stepKey="filterGridByDisabledProducts"/>
+        <dontSee selector="{{AdminProductGridSection.column('Status')}}" userInput="Enabled" stepKey="dontSeeEnabledProducts"/>
+
+        <!--Sorting works (By Price, by ID)-->
+        <!--By Price-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultSortingPrice"/>
+        <!--Filter by price so grid contains prices that we can compare correctly-->
+        <actionGroup ref="filterProductGridByPriceRange" stepKey="filterProductGridByPriceForCompare">
+            <argument name="filter" value="PriceFilterRange"/>
+        </actionGroup>
+        <!--Sort Ascending-->
+        <click selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="clickPriceHeaderToSortAsc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'Price')}}" stepKey="getFirstPriceSortAsc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('2', 'Price')}}" stepKey="getSecondPriceSortAsc"/>
+        <assertLessThanOrEqual expected="$getSecondPriceSortAsc" actual="$getFirstPriceSortAsc" stepKey="checkPriceAscSortCorrect"/>
+        <!--Sort Descending-->
+        <click selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="clickPriceHeaderToSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'Price')}}" stepKey="getFirstPriceSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('2', 'Price')}}" stepKey="getSecondPriceSortDesc"/>
+        <assertGreaterThanOrEqual expected="$getSecondPriceSortDesc" actual="$getFirstPriceSortDesc" stepKey="checkPriceDescSortCorrect"/>
+        <!--By Product ID-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultSortingId"/>
+        <!--Sort Ascending-->
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'ID')}}" stepKey="getFirstProductIdSortAsc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('2', 'ID')}}" stepKey="getSecondProductIdSortAsc"/>
+        <assertLessThan expected="$getSecondProductIdSortAsc" actual="$getFirstProductIdSortAsc" stepKey="checkProductIdAscSortCorrect"/>
+        <!--Sort Descending-->
+        <click selector="{{AdminProductGridSection.columnHeader('ID')}}" stepKey="clickIdHeaderToSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('1', 'ID')}}" stepKey="getFirstProductIdSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('2', 'ID')}}" stepKey="getSecondProductIdSortDesc"/>
+        <assertGreaterThan expected="$getSecondProductIdSortDesc" actual="$getFirstProductIdSortDesc" stepKey="checkProductIdDescSortCorrect"/>
+
+        <!--Adding column works-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultColumns"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsDropdownToReset"/>
+        <click selector="{{AdminProductGridFilterSection.resetGridColumns}}" stepKey="resetProductGridColumns"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsDropdownAfterReset"/>
+        <!--Remove Price column-->
+        <seeElement selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="seeProductPriceColumn"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsDropdown"/>
+        <uncheckOption selector="{{AdminProductGridFilterSection.viewColumnOption('Price')}}" stepKey="hidePriceColumn"/>
+        <dontSeeElement selector="{{AdminProductGridSection.columnHeader('Price')}}" stepKey="dontSeeProductPriceColumn"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsDropdown"/>
+        <!--Add Weight column-->
+        <dontSeeElement selector="{{AdminProductGridSection.columnHeader('Weight')}}" stepKey="dontSeeWeightColumn"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsDropdownWeight"/>
+        <checkOption selector="{{AdminProductGridFilterSection.viewColumnOption('Weight')}}" stepKey="showWeightColumn"/>
+        <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsDropdownWeight"/>
+        <seeElement selector="{{AdminProductGridSection.columnHeader('Weight')}}" stepKey="seeWeightColumn"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridToCheckWeightColumn">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <see selector="{{AdminProductGridSection.productGridCell('1','Weight')}}" userInput="{{SimpleProduct.weight}}" stepKey="seeCorrectProductWeightInGrid"/>
+        <!--END Admin uses product grid-->
+
+        <!--Admin creates category-->
+        <comment userInput="Admin creates category." stepKey="adminCreatesCategoryComment" before="navigateToCategoryPage"/>
+        <amOnPage url="{{AdminCategoryPage}}" stepKey="navigateToCategoryPage"/>
+        <waitForPageLoad time="30" stepKey="waitForCategoryPageLoad"/>
+        <!--Create category under Default Category-->
+        <click selector="{{AdminCategorySidebarTreeSection.categoryTreeRoot}}" stepKey="clickDefaultCategory"/>
+        <actionGroup ref="CheckCategoryNameIsRequiredField" stepKey="checkCategoryNameIsRequired"/>
+        <actionGroup ref="CreateCategory" stepKey="createCategory">
+            <argument name="categoryEntity" value="_defaultCategory"/>
+        </actionGroup>
+        <!--Create category under newly created category-->
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="clickCreatedCategoryInTree"/>
+        <actionGroup ref="CreateCategory" stepKey="createSubCategory">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+
+        <!--Admin moves category-->
+        <comment userInput="Admin moves category." stepKey="adminMovesCategoryComment" before="onCategoryPageToMoveCategory"/>
+        <amOnPage url="{{AdminCategoryPage}}" stepKey="onCategoryPageToMoveCategory"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoadMoveCategory"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandTree"/>
+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}"
+                     selector2="{{AdminCategorySidebarTreeSection.categoryTreeRoot}}"
+                     stepKey="dragAndDropCategory"/>
+        <waitForPageLoad time="30" stepKey="waitForMoveConfirmation"/>
+        <see selector="{{AdminCategoryModalSection.title}}" userInput="Warning Message" stepKey="seeMoveConfirmationModal"/>
+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkConfirmMove"/>
+        <waitForPageLoad time="30" stepKey="waitForMove"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeCategoryMoveSuccessMessage"/>
+        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryInTreeUnderRoot(SimpleSubCategory.name)}}" stepKey="seeSubcategoryIsUnderDefault"/>
+
+        <!--Admin deletes category-->
+        <comment userInput="Admin deletes category" stepKey="deleteCategoryComment"/>
+        <amOnPage url="{{AdminCategoryPage}}" stepKey="onCategoryPageToDeleteCategory"/>
+        <waitForPageLoad time="30" stepKey="waitForCategoryPageDelete"/>
+        <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
+            <argument name="categoryEntity" value="_defaultCategory"/>
+        </actionGroup>
+
+        <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
+        <!--Clean up categories-->
+        <comment userInput="Clean up categories" stepKey="cleanupCategoriesComment"/>
+        <actionGroup ref="DeleteCategory" stepKey="cleanSimpleSubCategory">
+            <argument name="categoryEntity" value="SimpleSubCategory"/>
+        </actionGroup>
+        <!--Clean up products-->
+        <comment userInput="Clean up simple product" stepKey="cleanUpSimpleProduct"/>
         <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProduct">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>
+        <comment userInput="Clean up virtual product" stepKey="cleanUpVirtualProduct"/>
         <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProduct">
             <argument name="product" value="VirtualProduct"/>
         </actionGroup>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 00000000000..818c538d015
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,205 @@
+<?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="EndToEndB2CGuestUserTest">
+        <annotations>
+            <features value="End to End scenarios"/>
+            <stories value="B2C guest user - MAGETWO-75411"/>
+            <group value="e2e"/>
+            <title value="You should be able to pass End to End B2C Guest User scenario"/>
+            <description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-87435"/>
+        </annotations>
+        <before>
+            <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
+
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct1Image">
+                <requiredEntity createDataKey="createSimpleProduct1"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createSimpleProduct1Image1">
+                <requiredEntity createDataKey="createSimpleProduct1"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct1" createDataKey="createSimpleProduct1"/>
+
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct2Image">
+                <requiredEntity createDataKey="createSimpleProduct2"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct2" createDataKey="createSimpleProduct2"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct1Image" stepKey="deleteSimpleProduct1Image"/>-->
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct1Image1" stepKey="deleteSimpleProduct1Image1"/>-->
+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
+
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct2Image" stepKey="deleteSimpleProduct2Image"/>-->
+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Step 1: User browses catalog -->
+        <comment userInput="Start of browsing catalog" stepKey="startOfBrowsingCatalog" />
+        <amOnPage url="{{StorefrontHomePage}}" stepKey="amOnHomePage"/>
+        <waitForPageLoad stepKey="homeWaitForPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeWaitForWelcomeMessage"/>
+        <see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome"/>
+
+        <!-- Open Category -->
+        <comment userInput="Open category" stepKey="commentOpenCategory" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategory">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <!-- Check simple product 1 in category -->
+        <comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" />
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct1ImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct1ImageSrc" stepKey="browseAssertSimpleProduct1ImageNotDefault"/>
+        <!-- Check simple product 2 in category -->
+        <comment userInput="Check simple product 2 in category" stepKey="commentCheckSimpleProduct2InCategory" />
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct2">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct2ImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct2ImageSrc" stepKey="browseAssertSimpleProduct2ImageNotDefault"/>
+
+        <!-- View Simple Product 1 -->
+        <comment userInput="View simple product 1" stepKey="commentViewSimpleProduct1" after="browseAssertSimpleProduct2ImageNotDefault"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="commentViewSimpleProduct1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct1Viewloaded" />
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct1Page">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct1PageImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct1PageImageSrc" stepKey="browseAssertSimpleProduct1PageImageNotDefault"/>
+
+        <!-- View Simple Product 2 -->
+        <comment userInput="View simple product 2" stepKey="commentViewSimpleProduct2" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory1"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct2ViewLoaded" />
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct2Page">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct2PageImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct2PageImageSrc" stepKey="browseAssertSimpleProduct2PageImageNotDefault"/>
+        <comment userInput="End of browsing catalog" stepKey="endOfBrowsingCatalog" after="browseAssertSimpleProduct2PageImageNotDefault"/>
+
+        <!-- Step 4: User compares products -->
+        <comment userInput="Start of comparing products" stepKey="startOfComparingProducts" after="endOfBrowsingCatalog"/>
+        <!-- Add Simple Product 1 to comparison -->
+        <comment userInput="Add simple product 1 to comparison" stepKey="commentAddSimpleProduct1ToComparison" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory" />
+        <waitForLoadingMaskToDisappear stepKey="waitForCategoryloaded" />
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct1">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrc" stepKey="compareAssertSimpleProduct1ImageNotDefault"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="compareClickSimpleProduct1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCompareSimpleProduct1loaded" />
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="compareAssertProduct1Page">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="compareGrabSimpleProduct1PageImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$compareGrabSimpleProduct1PageImageSrc" stepKey="compareAssertSimpleProduct2PageImageNotDefault"/>
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="compareAddSimpleProduct1ToCompare">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+
+        <!-- Add Simple Product 2 to comparison -->
+        <comment userInput="Add simple product 2 to comparison" stepKey="commentAddSimpleProduct2ToComparison" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCompareCategory1loaded" />
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory1">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct2">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrc"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrc" stepKey="compareAssertSimpleProduct2ImageNotDefault"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="compareAddSimpleProduct2ToCompare">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <!-- Check products in comparison sidebar -->
+        <!-- Check simple product 1 in comparison sidebar -->
+        <comment userInput="Check simple product 1 in comparison sidebar" stepKey="commentCheckSimpleProduct1InComparisonSidebar" after="compareAddSimpleProduct2ToCompare"/>
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="commentCheckSimpleProduct1InComparisonSidebar">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- Check simple product 2 in comparison sidebar -->
+        <comment userInput="Check simple product 2 in comparison sidebar" stepKey="commentCheckSimpleProduct2InComparisonSidebar" />
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct2InSidebar">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <!-- Check products on comparison page -->
+        <!-- Check simple product 1 on comparison page -->
+        <comment userInput="Check simple product 1 on comparison page" stepKey="commentCheckSimpleProduct1OnComparisonPage" after="compareSimpleProduct2InSidebar"/>
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="commentCheckSimpleProduct1OnComparisonPage"/>
+        <actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct1InComparison">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrcInComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrcInComparison" stepKey="compareAssertSimpleProduct1ImageNotDefaultInComparison"/>
+        <!-- Check simple product2 on comparison page -->
+        <comment userInput="Check simple product 2 on comparison page" stepKey="commentCheckSimpleProduct2OnComparisonPage" />
+        <actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct2InComparison">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrcInComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrcInComparison" stepKey="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>
+
+        <!-- Clear comparison sidebar -->
+        <comment userInput="Clear comparison sidebar" stepKey="commentClearComparisonSidebar" after="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="commentClearComparisonSidebar"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory2">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="compareClearCompare"/>
+        <comment userInput="End of Comparing Products" stepKey="endOfComparingProducts" />
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 00000000000..edf9c28c3ac
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,192 @@
+<?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="EndToEndB2CLoggedInUserTest">
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct1Image">
+                <requiredEntity createDataKey="createSimpleProduct1"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createSimpleProduct1Image1">
+                <requiredEntity createDataKey="createSimpleProduct1"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct1" createDataKey="createSimpleProduct1"/>
+
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct2Image">
+                <requiredEntity createDataKey="createSimpleProduct2"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct2" createDataKey="createSimpleProduct2"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct1Image" stepKey="deleteSimpleProduct1Image"/>-->
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct1Image1" stepKey="deleteSimpleProduct1Image1"/>-->
+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
+
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createSimpleProduct2Image" stepKey="deleteSimpleProduct2Image"/>-->
+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Step 1: User browses catalog -->
+        <comment userInput="Start of browsing catalog" stepKey="startOfBrowsingCatalog" after="endOfSigningUpUserAccount"/>
+        <amOnPage url="{{StorefrontHomePage}}" stepKey="amOnHomePage" after="startOfBrowsingCatalog"/>
+        <waitForPageLoad stepKey="homeWaitForPageLoad" after="amOnHomePage"/>
+        <waitForElementVisible selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeWaitForWelcomeMessage" after="homeWaitForPageLoad"/>
+        <see userInput="Welcome, John Doe!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome" after="homeWaitForWelcomeMessage"/>
+
+        <!-- Open Category -->
+        <comment userInput="Open category" stepKey="commentOpenCategory" after="homeCheckWelcome"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory" after="commentOpenCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategory" after="browseClickCategory">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <!-- Check simple product 1 in category -->
+        <comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" after="browseAssertCategory"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1" after="commentCheckSimpleProductInCategory">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct1ImageSrc" after="browseAssertCategoryProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct1ImageSrc" stepKey="browseAssertSimpleProduct1ImageNotDefault" after="browseGrabSimpleProduct1ImageSrc"/>
+        <!-- Check simple product 2 in category -->
+        <comment userInput="Check simple product 2 in category" stepKey="commentCheckSimpleProduct2InCategory" after="browseAssertSimpleProduct1ImageNotDefault"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct2" after="commentCheckSimpleProduct2InCategory">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct2ImageSrc" after="browseAssertCategoryProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct2ImageSrc" stepKey="browseAssertSimpleProduct2ImageNotDefault" after="browseGrabSimpleProduct2ImageSrc"/>
+
+        <!-- View Simple Product 1 -->
+        <comment userInput="View simple product 1" stepKey="commentViewSimpleProduct1" after="browseAssertSimpleProduct2ImageNotDefault"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="commentViewSimpleProduct1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct1Viewloaded" after="browseClickCategorySimpleProduct1View"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct1Page" after="waitForSimpleProduct1Viewloaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct1PageImageSrc" after="browseAssertProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct1PageImageSrc" stepKey="browseAssertSimpleProduct1PageImageNotDefault" after="browseGrabSimpleProduct1PageImageSrc"/>
+
+        <!-- View Simple Product 2 -->
+        <comment userInput="View simple product 2" stepKey="commentViewSimpleProduct2" after="browseAssertSimpleProduct1PageImageNotDefault"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory1" after="commentViewSimpleProduct2"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View" after="clickCategory1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct2ViewLoaded" after="browseClickCategorySimpleProduct2View"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct2Page" after="waitForSimpleProduct2ViewLoaded">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct2PageImageSrc" after="browseAssertProduct2Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct2PageImageSrc" stepKey="browseAssertSimpleProduct2PageImageNotDefault" after="browseGrabSimpleProduct2PageImageSrc"/>
+        <comment userInput="End of browsing catalog" stepKey="endOfBrowsingCatalog" after="browseAssertSimpleProduct2PageImageNotDefault"/>
+
+        <!-- Step 4: User compares products -->
+        <comment userInput="Start of comparing products" stepKey="startOfComparingProducts" after="endOfBrowsingCatalog"/>
+        <!-- Add Simple Product 1 to comparison -->
+        <comment userInput="Add simple product 1 to comparison" stepKey="commentAddSimpleProduct1ToComparison" after="startOfComparingProducts"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory" after="commentAddSimpleProduct1ToComparison"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCategoryloaded" after="compareClickCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory" after="waitForCategoryloaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct1" after="compareAssertCategory">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrc" after="compareAssertSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrc" stepKey="compareAssertSimpleProduct1ImageNotDefault" after="compareGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="compareClickSimpleProduct1" after="compareAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCompareSimpleProduct1loaded" after="compareClickSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="compareAssertProduct1Page" after="waitForCompareSimpleProduct1loaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="compareGrabSimpleProduct1PageImageSrc" after="compareAssertProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$compareGrabSimpleProduct1PageImageSrc" stepKey="compareAssertSimpleProduct2PageImageNotDefault" after="compareGrabSimpleProduct1PageImageSrc"/>
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="compareAddSimpleProduct1ToCompare" after="compareAssertSimpleProduct2PageImageNotDefault">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+
+        <!-- Add Simple Product 2 to comparison -->
+        <comment userInput="Add simple product 2 to comparison" stepKey="commentAddSimpleProduct2ToComparison" after="compareAddSimpleProduct1ToCompare"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory1" after="commentAddSimpleProduct2ToComparison"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCompareCategory1loaded" after="compareClickCategory1"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory1" after="waitForCompareCategory1loaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct2" after="compareAssertCategory1">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrc" after="compareAssertSimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrc" stepKey="compareAssertSimpleProduct2ImageNotDefault" after="compareGrabSimpleProduct2ImageSrc"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="compareAddSimpleProduct2ToCompare" after="compareAssertSimpleProduct2ImageNotDefault">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <!-- Check products in comparison sidebar -->
+        <!-- Check simple product 1 in comparison sidebar -->
+        <comment userInput="Check simple product 1 in comparison sidebar" stepKey="commentCheckSimpleProduct1InComparisonSidebar" after="compareAddSimpleProduct2ToCompare"/>
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="commentCheckSimpleProduct1InComparisonSidebar">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- Check simple product2 in comparison sidebar -->
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct2InSidebar" after="compareSimpleProduct1InSidebar">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <!-- Check products on comparison page -->
+        <!-- Check simple product 1 on comparison page -->
+        <comment userInput="Check simple product 1 on comparison page" stepKey="commentCheckSimpleProduct1OnComparisonPage" after="compareSimpleProduct2InSidebar"/>
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="commentCheckSimpleProduct1OnComparisonPage"/>
+        <actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct1InComparison" after="compareOpenComparePage">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrcInComparison" after="compareAssertSimpleProduct1InComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrcInComparison" stepKey="compareAssertSimpleProduct1ImageNotDefaultInComparison" after="compareGrabSimpleProduct1ImageSrcInComparison"/>
+        <!-- Check simple product2 on comparison page -->
+        <actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct2InComparison" after="compareAssertSimpleProduct1ImageNotDefaultInComparison">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrcInComparison" after="compareAssertSimpleProduct2InComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrcInComparison" stepKey="compareAssertSimpleProduct2ImageNotDefaultInComparison" after="compareGrabSimpleProduct2ImageSrcInComparison"/>
+
+        <!-- Clear comparison sidebar -->
+        <comment userInput="Clear comparison sidebar" stepKey="commentClearComparisonSidebar" after="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="commentClearComparisonSidebar"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory2" after="compareClickCategoryBeforeClear">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="compareClearCompare" after="compareAssertCategory2"/>
+        <comment userInput="End of Comparing Products" stepKey="endOfComparingProducts" after="compareClearCompare"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyDefaultWYSIWYGToolbarOnProductCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyDefaultWYSIWYGToolbarOnProductCest.xml
index 26852d17e64..3c396aac369 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyDefaultWYSIWYGToolbarOnProductCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyDefaultWYSIWYGToolbarOnProductCest.xml
@@ -23,7 +23,7 @@
             <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
-        <amOnPage url="{{AdminProductCreatePage(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
         <waitForPageLoad stepKey="wait"/>
         <scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToQty" />
         <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
@@ -62,7 +62,7 @@
             <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
-        <amOnPage url="{{AdminProductCreatePage(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
+        <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
         <waitForPageLoad stepKey="wait"/>
         <scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToQty" />
         <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json
index 3b9967130fe..a4c32f5a243 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json
@@ -11,15 +11,19 @@
         "sort-packages": true
     },
     "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-testing-framework": "~2.0.0",
+        "magento/magento2-functional-test-framework": "100.0.0-dev",
+        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
+        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
+        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
+        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
+        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
         "magento/magento2-functional-test-module-cms": "100.0.0-dev",
         "magento/magento2-functional-test-module-config": "100.0.0-dev",
         "magento/magento2-functional-test-module-customer": "100.0.0-dev",
@@ -30,11 +34,8 @@
         "magento/magento2-functional-test-module-msrp": "100.0.0-dev",
         "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
         "magento/magento2-functional-test-module-product-alert": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
         "magento/magento2-functional-test-module-store": "100.0.0-dev",
         "magento/magento2-functional-test-module-tax": "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-url-rewrite": "100.0.0-dev",
         "magento/magento2-functional-test-module-widget": "100.0.0-dev",
         "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
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
new file mode 100644
index 00000000000..4fdd061640f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -0,0 +1,47 @@
+<?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">
+    <!-- Quick search the phrase and check if the result page contains correct information -->
+    <actionGroup name="StorefrontCheckQuickSearchActionGroup">
+        <arguments>
+            <argument name="phrase"/>
+        </arguments>
+        <fillField userInput="{{phrase}}" selector="{{StorefrontQuickSearchSection.searchPhrase}}" stepKey="fillQuickSearch"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickQuickSearchButton" />
+        <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
+        <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
+        <see userInput="Search results for: '{{phrase}}'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
+    </actionGroup>
+
+    <!-- Open advanced search page -->
+    <actionGroup name="StorefrontOpenAdvancedSearchActionGroup">
+        <click selector="{{StorefrontFooterSection.AdvancedSearch}}" stepKey="clickAdvancedSearchLink" />
+        <seeInCurrentUrl url="{{StorefrontCatalogSearchAdvancedFormPage.url}}" stepKey="checkUrl"/>
+        <seeInTitle userInput="Advanced Search" stepKey="assertAdvancedSearchTitle"/>
+        <see userInput="Advanced Search" selector="{{StorefrontCatalogSearchAdvancedFormSection.SearchTitle}}" stepKey="assertAdvancedSearchTitle"/>
+    </actionGroup>
+
+    <!-- Check that Advanced Search result page contains correct information -->
+    <actionGroup name="StorefrontCheckAdvancedSearchResultActionGroup">
+        <seeInCurrentUrl url="{{StorefrontCatalogSearchAdvancedResultPage.url}}" stepKey="checkUrl"/>
+        <seeInTitle userInput="Advanced Search Results" stepKey="assertAdvancedSearchTitle"/>
+        <see userInput="Catalog Advanced Search" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertAdvancedSearchName"/>
+    </actionGroup>
+
+    <!-- Select the category in the filter -->
+    <actionGroup name="StorefrontSelectSearchFilterCategoryActionGroup">
+        <arguments>
+            <argument name="category"/>
+        </arguments>
+        <click selector="{{StorefrontCategoryFilterSection.CategoryFilter}}" stepKey="clickCategoryFilterTitle" />
+        <scrollTo selector="{{StorefrontCategoryFilterSection.CategoryByName(category.name)}}" stepKey="scrollToClickCategoryFilter"/>
+        <click selector="{{StorefrontCategoryFilterSection.CategoryByName(category.name)}}" stepKey="clickCategoryFilter" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Data/ConstData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Data/ConstData.xml
new file mode 100644
index 00000000000..fd28b0ddc5c
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Data/ConstData.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">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="CONST" type="CONST">
+        <data key="apiSimpleProduct">Api Simple Product</data>
+        <data key="nonexistentProductName">NonexistentProductName</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/GuestCheckoutPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedFormPage.xml
similarity index 60%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/GuestCheckoutPage.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedFormPage.xml
index 2e1cc6ce6e7..0fa4333ca20 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/GuestCheckoutPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedFormPage.xml
@@ -8,8 +8,8 @@
 
 <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="GuestCheckoutPage" url="/checkout" area="storefront" module="Checkout">
-        <section name="GuestCheckoutShippingSection"/>
-        <section name="GuestCheckoutPaymentSection"/>
+    <page name="StorefrontCatalogSearchAdvancedFormPage" url="/catalogsearch/advanced/" area="storefront" module="Magento_CatalogSearch">
+        <section name="StorefrontCatalogSearchAdvancedFormSection" />
+        <section name="StorefrontQuickSearchSection" />
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedResultPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedResultPage.xml
new file mode 100644
index 00000000000..4afdbea5f92
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedResultPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="StorefrontCatalogSearchAdvancedResultPage" url="/catalogsearch/advanced/result" area="storefront" module="Magento_CatalogSearch">
+        <section name="StorefrontCatalogSearchAdvancedResultMainSection" />
+        <section name="StorefrontQuickSearchSection" />
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceNewPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchPage.xml
similarity index 62%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceNewPage.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchPage.xml
index 9df50cc8f28..bbca39348ba 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceNewPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchPage.xml
@@ -8,7 +8,8 @@
 
 <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="InvoiceNewPage" url="/sales/order_invoice/new/order_id/" area="admin" module="Sales">
-        <section name="InvoiceNewSection"/>
+    <page name="StorefrontCatalogSearchPage" url="/catalogsearch/result/" area="storefront" module="Magento_CatalogSearch">
+        <section name="StorefrontCatalogSearchMainSection" />
+        <section name="StorefrontQuickSearchSection" />
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedFormSection.xml
new file mode 100644
index 00000000000..30cb16d684b
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedFormSection.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="StorefrontCatalogSearchAdvancedFormSection">
+        <element name="SearchTitle" type="text" selector=".page-title span"/>
+        <element name="ProductName" type="input" selector="#name"/>
+        <element name="SKU" type="input" selector="#sku"/>
+        <element name="Description" type="input" selector="#description"/>
+        <element name="ShortDescription" type="input" selector="#short_description"/>
+        <element name="PriceFrom" type="input" selector="#price"/>
+        <element name="PriceTo" type="input" selector="#price_to"/>
+        <element name="AttributeByCode" type="input" selector="#{{var1}}" parameterized="true"/>
+        <element name="SubmitButton" type="button" selector="//*[@id='form-validate']//button[@type='submit']"/>
+    </section>
+</sections>
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
new file mode 100644
index 00000000000..25671dc8112
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
@@ -0,0 +1,19 @@
+<?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="StorefrontCatalogSearchAdvancedResultMainSection">
+        <element name="SearchTitle" type="text" selector=".page-title span"/>
+        <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
+        <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <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"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchMainSection.xml
new file mode 100644
index 00000000000..440cd4fe8da
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchMainSection.xml
@@ -0,0 +1,19 @@
+<?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="StorefrontCatalogSearchMainSection">
+        <element name="SearchTitle" type="text" selector=".page-title span"/>
+        <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
+        <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <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"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontFooterSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontFooterSection.xml
new file mode 100644
index 00000000000..97f4c355370
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontFooterSection.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="StorefrontFooterSection">
+        <element name="AdvancedSearch" type="button" selector="//footer//ul//li//a[text()='Advanced Search']"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 00000000000..a5b7e520a76
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,77 @@
+<?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="EndToEndB2CGuestUserTest">
+        <!-- Step 2: User searches for product -->
+        <comment userInput="Start of searching products" stepKey="startOfSearchingProducts" after="endOfBrowsingCatalog"/>
+        <!-- Advanced Search with Product 1 Data -->
+        <comment userInput="Advanced search" stepKey="commentAdvancedSearch" after="startOfSearchingProducts"/>
+        <actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="searchOpenAdvancedSearchForm" after="commentAdvancedSearch"/>
+        <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+        <fillField userInput="$$createSimpleProduct1.name$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" stepKey="searchAdvancedFillProductName" after="searchOpenAdvancedSearchForm"/>
+        <fillField userInput="$$createSimpleProduct1.sku$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.SKU}}" stepKey="searchAdvancedFillSKU" after="searchAdvancedFillProductName"/>
+        <fillField userInput="$$createSimpleProduct1.price$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFrom}}" stepKey="searchAdvancedFillPriceFrom" after="searchAdvancedFillSKU"/>
+        <fillField userInput="$$createSimpleProduct1.price$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceTo}}" stepKey="searchAdvancedFillPriceTo" after="searchAdvancedFillPriceFrom"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="searchClickAdvancedSearchSubmitButton" after="searchAdvancedFillPriceTo"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSearchProductsloaded" after="searchClickAdvancedSearchSubmitButton"/>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="searchCheckAdvancedSearchResult" after="waitForSearchProductsloaded"/>
+        <see userInput="1" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productCount}} span" stepKey="searchAdvancedAssertProductCount" after="searchCheckAdvancedSearchResult"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertSimpleProduct1" after="searchAdvancedAssertProductCount">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="searchAdvancedGrabSimpleProduct1ImageSrc" after="searchAssertSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchAdvancedGrabSimpleProduct1ImageSrc" stepKey="searchAdvancedAssertSimpleProduct1ImageNotDefault" after="searchAdvancedGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="searchClickSimpleProduct1View" after="searchAdvancedAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSearchSimpleProduct1Viewloaded" after="searchClickSimpleProduct1View"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="searchAssertSimpleProduct1Page" after="waitForSearchSimpleProduct1Viewloaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchAdvancedGrabSimpleProduct1PageImageSrc" after="searchAssertSimpleProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchAdvancedGrabSimpleProduct1PageImageSrc" stepKey="searchAdvancedAssertSimpleProduct1PageImageNotDefault" after="searchAdvancedGrabSimpleProduct1PageImageSrc"/>
+
+        <!-- Quick Search with common part of product names -->
+        <comment userInput="Quick search" stepKey="commentQuickSearch" after="searchAdvancedAssertSimpleProduct1PageImageNotDefault"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchQuickSearchCommonPart" after="commentQuickSearch">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="phrase" value="CONST.apiSimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSelectSearchFilterCategoryActionGroup" stepKey="searchSelectFilterCategoryCommonPart" after="searchQuickSearchCommonPart">
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+        <see userInput="3" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="searchAssertFilterCategoryProductCountCommonPart" after="searchSelectFilterCategoryCommonPart"/>
+
+        <!-- Search simple product 1 -->
+        <comment userInput="Search simple product 1" stepKey="commentSearchSimpleProduct1" after="searchAssertFilterCategoryProductCountCommonPart"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertFilterCategorySimpleProduct1" after="commentSearchSimpleProduct1">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="searchGrabSimpleProduct1ImageSrc" after="searchAssertFilterCategorySimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct1ImageSrc" stepKey="searchAssertSimpleProduct1ImageNotDefault" after="searchGrabSimpleProduct1ImageSrc"/>
+        <!-- Search simple product2 -->
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertFilterCategorySimpleProduct2" after="searchAssertSimpleProduct1ImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="searchGrabSimpleProduct2ImageSrc" after="searchAssertFilterCategorySimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct2ImageSrc" stepKey="searchAssertSimpleProduct2ImageNotDefault" after="searchGrabSimpleProduct2ImageSrc"/>
+
+        <!-- Quick Search with non-existent product name -->
+        <comment userInput="Quick Search with non-existent product name" stepKey="commentQuickSearchWithNonExistentProductName" after="searchAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchFillQuickSearchNonExistent" after="commentQuickSearchWithNonExistentProductName">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="phrase" value="CONST.nonexistentProductName"/>
+        </actionGroup>
+        <see userInput="Your search returned no results." selector="{{StorefrontCatalogSearchMainSection.message}}" stepKey="searchAssertQuickSearchMessageNonExistent" after="searchFillQuickSearchNonExistent"/>
+        <comment userInput="End of searching products" stepKey="endOfSearchingProducts" after="searchAssertQuickSearchMessageNonExistent" />
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 00000000000..cb84e46ebf5
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,77 @@
+<?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="EndToEndB2CLoggedInUserTest">
+        <!-- Step 2: User searches for product -->
+        <comment userInput="Start of searching products" stepKey="startOfSearchingProducts" after="endOfBrowsingCatalog"/>
+        <!-- Advanced Search with Product 1 Data -->
+        <comment userInput="Advanced search" stepKey="commentAdvancedSearch" after="startOfSearchingProducts"/>
+        <actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="searchOpenAdvancedSearchForm" after="commentAdvancedSearch"/>
+        <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+        <fillField userInput="$$createSimpleProduct1.name$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" stepKey="searchAdvancedFillProductName" after="searchOpenAdvancedSearchForm"/>
+        <fillField userInput="$$createSimpleProduct1.sku$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.SKU}}" stepKey="searchAdvancedFillSKU" after="searchAdvancedFillProductName"/>
+        <fillField userInput="$$createSimpleProduct1.price$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFrom}}" stepKey="searchAdvancedFillPriceFrom" after="searchAdvancedFillSKU"/>
+        <fillField userInput="$$createSimpleProduct1.price$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceTo}}" stepKey="searchAdvancedFillPriceTo" after="searchAdvancedFillPriceFrom"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="searchClickAdvancedSearchSubmitButton" after="searchAdvancedFillPriceTo"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSearchProductsloaded" after="searchClickAdvancedSearchSubmitButton"/>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="searchCheckAdvancedSearchResult" after="waitForSearchProductsloaded"/>
+        <see userInput="1" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productCount}} span" stepKey="searchAdvancedAssertProductCount" after="searchCheckAdvancedSearchResult"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertSimpleProduct1" after="searchAdvancedAssertProductCount">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="searchAdvancedGrabSimpleProduct1ImageSrc" after="searchAssertSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchAdvancedGrabSimpleProduct1ImageSrc" stepKey="searchAdvancedAssertSimpleProduct1ImageNotDefault" after="searchAdvancedGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="searchClickSimpleProduct1View" after="searchAdvancedAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSearchSimpleProduct1Viewloaded" after="searchClickSimpleProduct1View"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="searchAssertSimpleProduct1Page" after="waitForSearchSimpleProduct1Viewloaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchAdvancedGrabSimpleProduct1PageImageSrc" after="searchAssertSimpleProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchAdvancedGrabSimpleProduct1PageImageSrc" stepKey="searchAdvancedAssertSimpleProduct1PageImageNotDefault" after="searchAdvancedGrabSimpleProduct1PageImageSrc"/>
+
+        <!-- Quick Search with common part of product names -->
+        <comment userInput="Quick search" stepKey="commentQuickSearch" after="searchAdvancedAssertSimpleProduct1PageImageNotDefault"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchQuickSearchCommonPart" after="commentQuickSearch">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="phrase" value="CONST.apiSimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSelectSearchFilterCategoryActionGroup" stepKey="searchSelectFilterCategoryCommonPart" after="searchQuickSearchCommonPart">
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+        <see userInput="3" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="searchAssertFilterCategoryProductCountCommonPart" after="searchSelectFilterCategoryCommonPart"/>
+
+        <!-- Search simple product 1 -->
+        <comment userInput="Search simple product 1" stepKey="commentSearchSimpleProduct1" after="searchAssertFilterCategoryProductCountCommonPart"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertFilterCategorySimpleProduct1" after="commentSearchSimpleProduct1">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="searchGrabSimpleProduct1ImageSrc" after="searchAssertFilterCategorySimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct1ImageSrc" stepKey="searchAssertSimpleProduct1ImageNotDefault" after="searchGrabSimpleProduct1ImageSrc"/>
+        <!-- Search simple product2 -->
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertFilterCategorySimpleProduct2" after="searchAssertSimpleProduct1ImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="searchGrabSimpleProduct2ImageSrc" after="searchAssertFilterCategorySimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct2ImageSrc" stepKey="searchAssertSimpleProduct2ImageNotDefault" after="searchGrabSimpleProduct2ImageSrc"/>
+
+        <!-- Quick Search with non-existent product name -->
+        <comment userInput="Quick Search with non-existent product name" stepKey="commentQuickSearchWithNonExistentProductName" after="searchAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchFillQuickSearchNonExistent" after="commentQuickSearchWithNonExistentProductName">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="phrase" value="CONST.nonexistentProductName"/>
+        </actionGroup>
+        <see userInput="Your search returned no results." selector="{{StorefrontCatalogSearchMainSection.message}}" stepKey="searchAssertQuickSearchMessageNonExistent" after="searchFillQuickSearchNonExistent"/>
+        <comment userInput="End of searching products" stepKey="endOfSearchingProducts" after="searchAssertQuickSearchMessageNonExistent" />
+    </test>
+</tests>
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 50e466e1185..132dbba8f83 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
@@ -12,19 +12,19 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
+        "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",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.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-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-search": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "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"
     },
     "autoload": {
         "psr-4": {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/CheckoutActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/CheckoutActionGroup.xml
new file mode 100644
index 00000000000..c5b4463003b
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/CheckoutActionGroup.xml
@@ -0,0 +1,147 @@
+<?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">
+    <!-- Go to checkout from minicart -->
+    <actionGroup name="GoToCheckoutFromMinicartActionGroup">
+        <wait stepKey="wait" time="10" />
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!-- Guest checkout filling shipping section -->
+    <actionGroup name="GuestCheckoutFillingShippingSectionActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+    </actionGroup>
+
+    <!-- Logged in user checkout filling shipping section -->
+    <actionGroup name="LoggedInUserCheckoutFillingShippingSectionActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddressVar.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddressVar.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+    </actionGroup>
+
+    <!-- Check product in checkout cart items -->
+    <actionGroup name="CheckProductInCheckoutCartItemsActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="{{productVar.name}}" stepKey="seeProductInCart"/>
+    </actionGroup>
+
+    <!-- Check order summary in checkout -->
+    <actionGroup name="CheckOrderSummaryInCheckoutActionGroup">
+        <arguments>
+            <argument name="subtotal"/>
+            <argument name="shippingTotal"/>
+            <argument name="shippingMethod"/>
+            <argument name="total"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <see userInput="${{subtotal}}" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="assertSubtotal"/>
+        <see userInput="${{shippingTotal}}" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="assertShipping"/>
+        <see userInput="{{shippingMethod}}" selector="{{CheckoutPaymentSection.orderSummaryShippingMethod}}" stepKey="assertShippingMethod"/>
+        <see userInput="${{total}}" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
+   </actionGroup>
+
+    <!-- Check ship to information in checkout -->
+    <actionGroup name="CheckShipToInformationInCheckoutActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <see userInput="{{customerVar.firstname}}" selector="{{CheckoutPaymentSection.shipToInfomation}}" stepKey="assertShipToInformationFirstName"/>
+        <see userInput="{{customerVar.lastname}}" selector="{{CheckoutPaymentSection.shipToInfomation}}" stepKey="assertShipToInformationLastName"/>
+        <see userInput="{{customerAddressVar.street[0]}}" selector="{{CheckoutPaymentSection.shipToInfomation}}" stepKey="assertShipToInformationStreet"/>
+        <see userInput="{{customerAddressVar.city}}" selector="{{CheckoutPaymentSection.shipToInfomation}}" stepKey="assertShipToInformationCity"/>
+        <see userInput="{{customerAddressVar.state}}" selector="{{CheckoutPaymentSection.shipToInfomation}}" stepKey="assertShipToInformationState"/>
+        <see userInput="{{customerAddressVar.postcode}}" selector="{{CheckoutPaymentSection.shipToInfomation}}" stepKey="assertShipToInformationPostcode"/>
+        <see userInput="{{customerAddressVar.telephone}}" selector="{{CheckoutPaymentSection.shipToInfomation}}" stepKey="assertShipToInformationTelephone"/>
+    </actionGroup>
+
+    <!-- Check shipping method in checkout -->
+    <actionGroup name="CheckShippingMethodInCheckoutActionGroup">
+        <arguments>
+            <argument name="shippingMethod"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <see userInput="{{shippingMethod}}" selector="{{CheckoutPaymentSection.shippingMethodInfomation}}" stepKey="assertshippingMethodInfomation"/>
+    </actionGroup>
+
+    <!-- Checkout select Check/Money Order payment -->
+    <actionGroup name="CheckoutSelectCheckMoneyOrderPaymentActionGroup">
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.checkMoneyOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" stepKey="clickCheckMoneyOrderPayment" />
+    </actionGroup>
+
+    <!-- Check billing address in checkout -->
+    <actionGroup name="CheckBillingAddressInCheckoutActionGroup">
+        <arguments>
+            <argument name="customerVar"/>
+            <argument name="customerAddressVar"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <see userInput="{{customerVar.firstName}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressFirstName"/>
+        <see userInput="{{customerVar.lastName}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressLastName"/>
+        <see userInput="{{customerAddressVar.street[0]}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressStreet"/>
+        <see userInput="{{customerAddressVar.city}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressCity"/>
+        <see userInput="{{customerAddressVar.state}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressState"/>
+        <see userInput="{{customerAddressVar.postcode}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressPostcode"/>
+        <see userInput="{{customerAddressVar.telephone}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressTelephone"/>
+    </actionGroup>
+
+    <!-- Checkout place order -->
+    <actionGroup name="CheckoutPlaceOrderActionGroup">
+        <arguments>
+            <argument name="orderNumberMessage"/>
+            <argument name="emailYouMessage"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{orderNumberMessage}}" stepKey="seeOrderNumber"/>
+        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{emailYouMessage}}" stepKey="seeEmailYou"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontMiniCartActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontMiniCartActionGroup.xml
new file mode 100644
index 00000000000..9e7c0e08203
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontMiniCartActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="clickViewAndEditCartFromMiniCart">
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
+        <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="viewAndEditCart"/>
+        <seeInCurrentUrl url="checkout/cart" stepKey="seeInCurrentUrl"/>
+    </actionGroup>
+    <actionGroup name="assertOneProductNameInMiniCart">
+        <arguments>
+            <argument name="productName"/>
+        </arguments>
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productName}}" stepKey="seeInMiniCart"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontProductCartActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontProductCartActionGroup.xml
new file mode 100644
index 00000000000..945e70fa624
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -0,0 +1,80 @@
+<?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 Product to Cart from the category page and check message and product count in Minicart -->
+    <actionGroup name="StorefrontAddCategoryProductToCartActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="productCount"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="clickAddToCart" />
+        <!-- @TODO: Use general message selector after MQE-694 is fixed -->
+        <waitForElement selector="{{StorefrontMessagesSection.messageProductAddedToCart(product.name)}}" time="30" stepKey="assertMessage"/>
+        <waitForText userInput="{{productCount}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
+    </actionGroup>
+
+    <!-- Add Product to Cart from the product page and check message and product count in Minicart -->
+    <actionGroup name="StorefrontAddProductToCartActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="productCount"/>
+        </arguments>
+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart" />
+        <!-- @TODO: Use general message selector after MQE-694 is fixed -->
+        <waitForElement selector="{{StorefrontMessagesSection.messageProductAddedToCart(product.name)}}" time="30" stepKey="assertMessage"/>
+        <waitForText userInput="{{productCount}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
+    </actionGroup>
+
+    <!-- Open the Minicart and check Simple Product -->
+    <actionGroup name="StorefrontOpenMinicartAndCheckSimpleProductActionGroup">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontMinicartSection.productLinkByName(product.name)}}" stepKey="waitForMinicartProduct" />
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart" />
+        <see userInput="${{product.price}}.00" selector="{{StorefrontMinicartSection.productPriceByName(product.name)}}" stepKey="assertProductPrice"/>
+    </actionGroup>
+
+    <!-- Check Simple Product in the Cart -->
+    <actionGroup name="StorefrontCheckCartSimpleProductActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="productQuantity"/>
+        </arguments>
+        <seeElement selector="{{CheckoutCartProductSection.ProductLinkByName(product.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{product.price}}.00" selector="{{CheckoutCartProductSection.ProductPriceByName(product.name)}}" stepKey="assertProductPrice"/>
+        <seeInField userInput="{{productQuantity}}" selector="{{CheckoutCartProductSection.ProductQuantityByName(product.name)}}" stepKey="assertProductQuantity"/>
+    </actionGroup>
+
+    <!-- Check the Cart -->
+    <actionGroup name="StorefrontCheckCartActionGroup">
+        <arguments>
+            <argument name="subtotal"/>
+            <argument name="shipping"/>
+            <argument name="shippingMethod"/>
+            <argument name="total"/>
+        </arguments>
+        <seeInCurrentUrl url="{{CheckoutCartPage.url}}" stepKey="assertUrl"/>
+        <waitForText userInput="${{total}}" selector="{{CheckoutCartSummarySection.total}}" time="30" stepKey="waitForTotal"/>
+        <see userInput="${{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
+        <see userInput="${{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" stepKey="assertShipping"/>
+        <see userInput="({{shippingMethod}})" selector="{{CheckoutCartSummarySection.shippingMethod}}" stepKey="assertShippingMethod"/>
+        <see userInput="${{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal"/>
+    </actionGroup>
+
+    <!-- Open the Cart from Minicart-->
+    <actionGroup name="StorefrontOpenCartFromMinicartActionGroup">
+        <waitForElement selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForShowMinicart" />
+        <waitForElement selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForCartLink" />
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart" />
+        <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="clickCart" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/ConstData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/ConstData.xml
new file mode 100644
index 00000000000..10bc4fd90e7
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/ConstData.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="CONST" type="CONST">
+        <data key="successGuestCheckoutOrderNumberMessage">Your order # is:</data>
+        <data key="successCheckoutOrderNumberMessage">Your order number is:</data>
+        <data key="successCheckoutEmailYouMessage">We'll email you an order confirmation with details and tracking info.</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/QuoteData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/QuoteData.xml
new file mode 100644
index 00000000000..d3c75073909
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/QuoteData.xml
@@ -0,0 +1,18 @@
+<?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">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="E2EB2CQuote" type="Quote">
+        <data key="subtotal">480.00</data>
+        <data key="shipping">15.00</data>
+        <data key="total">495.00</data>
+        <data key="shippingMethod">Flat Rate - Fixed</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Metadata/coupon-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Metadata/coupon-meta.xml
deleted file mode 100644
index 458be017a8f..00000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Metadata/coupon-meta.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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="CreateCoupon" dataType="coupon" type="create" auth="adminOauth" url="/rest/V1/coupons" method="POST">
-        <contentType>application/json</contentType>
-        <object key="coupon" dataType="coupon">
-            <field key="rule_id" required="true">integer</field>
-            <field key="times_used" required="true">integer</field>
-            <field key="is_primary" required="true">boolean</field>
-            <field key="code">string</field>
-            <field key="usage_limit">integer</field>
-            <field key="usage_per_customer">integer</field>
-            <field key="expiration_date">string</field>
-            <field key="created_at">string</field>
-            <field key="type">integer</field>
-            <field key="extension_attributes">empty_extension_attribute</field>
-        </object>
-    </operation>
-
-    <operation name="DeleteCoupon" dataType="coupon" type="delete" auth="adminOauth" url="/rest/V1/coupons/{coupon_id}" method="DELETE">
-        <contentType>application/json</contentType>
-    </operation>
-</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml
new file mode 100644
index 00000000000..0979c647039
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.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="CheckoutCartPage" url="/checkout/cart" module="Checkout" area="storefront">
+        <section name="CheckoutCartProductSection"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml
index 63c669c76af..69bb6bf5783 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml
@@ -14,6 +14,5 @@
         <section name="CheckoutOrderSummarySection"/>
         <section name="CheckoutSuccessMainSection"/>
         <section name="CheckoutPaymentSection"/>
-        <section name="CheckoutGuestShippingInfoSection"/>
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
new file mode 100644
index 00000000000..6e4f52f689e
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
@@ -0,0 +1,28 @@
+<?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="CheckoutCartProductSection">
+        <element name="ProductLinkByName" type="button"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr//strong[contains(@class, 'product-item-name')]//a[contains(text(), '{{var1}}')]"
+                 parameterized="true"/>
+        <element name="ProductPriceByName" type="text"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'price')]//span[@class='price']"
+                 parameterized="true"/>
+        <element name="ProductImageByName" type="text"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr//img[contains(@class, 'product-image-photo') and @alt='{{var1}}']"
+                 parameterized="true"/>
+        <element name="ProductQuantityByName" type="input"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'qty')]//input[contains(@class, 'qty')]"
+                 parameterized="true"/>
+        <element name="ProductOptionByNameAndAttribute" type="input"
+                 selector="//main//table[@id='shopping-cart-table']//tbody//tr[.//strong[contains(@class, 'product-item-name')]//a[contains(text(), '{{var1}}')]]//dl[@class='item-options']//dt[.='{{var2}}']/following-sibling::dd[1]"
+                 parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
new file mode 100644
index 00000000000..b3097365645
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.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="CheckoutCartSummarySection">
+        <element name="subtotal" type="text" selector="//*[@id='cart-totals']//tr[@class='totals sub']//td//span[@class='price']"/>
+        <element name="shippingMethod" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//th//span[@class='value']"/>
+        <element name="shipping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//td//span[@class='price']"/>
+        <element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
index f9a582b2f8f..b0e3af6b024 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
@@ -9,8 +9,21 @@
 <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="CheckoutPaymentSection">
-        <element name="cartItems" type="text" selector=".minicart-items"/>
         <element name="billingAddress" type="text" selector="div.billing-address-details"/>
+        <element name="cartItems" type="text" selector="ol.minicart-items"/>
+        <element name="cartItemsArea" type="button" selector="div.block.items-in-cart"/>
+        <element name="cartItemsAreaActive" type="textarea" selector="div.block.items-in-cart.active"/>
+        <element name="checkMoneyOrderPayment" type="radio" selector="input#checkmo.radio" timeout="30"/>
         <element name="placeOrder" type="button" selector="button.action.primary.checkout" timeout="30"/>
+        <element name="paymentSectionTitle" type="text" selector="//*[@id='checkout-payment-method-load']//div[text()='Payment Method']" />
+        <element name="orderSummarySubtotal" type="text" selector="//tr[@class='totals sub']//span[@class='price']" />
+        <element name="orderSummaryShippingTotal" type="text" selector="//tr[@class='totals shipping excl']//span[@class='price']" />
+        <element name="orderSummaryShippingMethod" type="text" selector="//tr[@class='totals shipping excl']//span[@class='value']" />
+        <element name="orderSummaryTotal" type="text" selector="//tr[@class='grand totals']//span[@class='price']" />
+        <element name="ProductItemByName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']" parameterized="true" />
+        <element name="ProductOptionsByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true" />
+        <element name="ProductOptionsActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true" />
+        <element name="shipToInfomation" type="text" selector="//div[@class='ship-to']//div[@class='shipping-information-content']" />
+        <element name="shippingMethodInfomation" type="text" selector="//div[@class='ship-via']//div[@class='shipping-information-content']" />
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
index 3a95a180233..c6023a05937 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
@@ -10,6 +10,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutShippingMethodsSection">
         <element name="next" type="button" selector="button.button.action.continue.primary"/>
-        <element name="firstShippingMethod" type="radio" selector=".row:nth-of-type(1) .col-method .radio"/>
+        <element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
index 14a633ec402..780353a8a17 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
@@ -11,5 +11,15 @@
     <section name="CheckoutShippingSection">
         <element name="selectedShippingAddress" type="text" selector=".shipping-address-item.selected-item"/>
         <element name="newAddressButton" type="button" selector="#checkout-step-shipping button"/>
+        <element name="email" type="input" selector="#customer-email"/>
+        <element name="firstName" type="input" selector="input[name=firstname]"/>
+        <element name="lastName" type="input" selector="input[name=lastname]"/>
+        <element name="street" type="input" selector="input[name='street[0]']"/>
+        <element name="city" type="input" selector="input[name=city]"/>
+        <element name="region" type="select" selector="select[name=region_id]"/>
+        <element name="postcode" type="input" selector="input[name=postcode]"/>
+        <element name="telephone" type="input" selector="input[name=telephone]"/>
+        <element name="next" type="button" selector="button.button.action.continue.primary"/>
+        <element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutPaymentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutPaymentSection.xml
deleted file mode 100644
index 04693458c37..00000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutPaymentSection.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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="GuestCheckoutPaymentSection">
-        <element name="cartItemsArea" type="textarea" selector=".items-in-cart"/>
-        <element name="cartItemsAreaActive" type="textarea" selector="div.block.items-in-cart.active"/>
-        <element name="cartItems" type="text" selector=".minicart-items"/>
-        <element name="billingAddress" type="text" selector="div.billing-address-details"/>
-        <element name="placeOrder" type="button" selector="button.action.primary.checkout" timeout="30"/>
-    </section>
-</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutShippingSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutShippingSection.xml
deleted file mode 100644
index 0af05846f4b..00000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutShippingSection.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="GuestCheckoutShippingSection">
-        <element name="email" type="input" selector="#customer-email"/>
-        <element name="firstName" type="input" selector="input[name=firstname]"/>
-        <element name="lastName" type="input" selector="input[name=lastname]"/>
-        <element name="street" type="input" selector="input[name='street[0]']"/>
-        <element name="city" type="input" selector="input[name=city]"/>
-        <element name="region" type="select" selector="select[name=region_id]"/>
-        <element name="postcode" type="input" selector="input[name=postcode]"/>
-        <element name="telephone" type="input" selector="input[name=telephone]"/>
-        <element name="next" type="button" selector="button.button.action.continue.primary"/>
-        <element name="firstShippingMethod" type="radio" selector=".row:nth-of-type(1) .col-method .radio"/>
-    </section>
-</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontCategoryProductSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontCategoryProductSection.xml
new file mode 100644
index 00000000000..a23caf141fc
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontCategoryProductSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryProductSection">
+        <element name="ProductAddToCartByNumber" type="button" selector="//main//li[{{var1}}]//button[contains(@class, 'tocart')]" parameterized="true"/>
+        <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'tocart')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMessagesSection.xml
new file mode 100644
index 00000000000..d6f260ecaaa
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMessagesSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontMessagesSection">
+        <!-- @TODO: Use general message selector after MQE-694 is fixed -->
+        <element name="messageProductAddedToCart" type="text"
+                 selector="//main//div[contains(@class, 'messages')]//div[contains(@class, 'message')]/div[contains(text(), 'You added {{var1}} to your shopping cart.')]"
+                 parameterized="true"
+        />
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml
new file mode 100644
index 00000000000..8f21770491f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml
@@ -0,0 +1,26 @@
+<?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="StorefrontMinicartSection">
+        <element name="productCount" type="text" selector="//header//div[contains(@class, 'minicart-wrapper')]//a[contains(@class, 'showcart')]//span[@class='counter-number']"/>
+        <element name="viewAndEditCart" type="button" selector="//header//div[contains(@class, 'minicart-wrapper')]//a[contains(@class, 'viewcart')]"/>
+        <element name="productLinkByName" type="button" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details']//a[contains(text(), '{{var1}}')]"  parameterized="true"/>
+        <element name="productPriceByName" type="text" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//span[@class='price']"  parameterized="true"/>
+        <element name="productImageByName" type="text" selector="//header//ol[@id='mini-cart']//span[@class='product-image-container']//img[@alt='{{var1}}']"  parameterized="true"/>
+        <element name="productOptionsDetailsByName" type="button" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//span[.='See Details']"  parameterized="true"/>
+        <element name="productOptionByNameAndAttribute" type="text" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//dt[@class='label' and .='{{var2}}']/following-sibling::dd[@class='values']//span"  parameterized="true"/>
+        <element name="showCart" type="button" selector="a.showcart"/>
+        <element name="quantity" type="button" selector="span.counter-number"/>
+        <element name="miniCartOpened" type="button" selector="a.showcart.active"/>
+        <element name="goToCheckout" type="button" selector="#top-cart-btn-checkout" timeout="30"/>
+        <element name="viewAndEditCart" type="button" selector=".action.viewcart" timeout="30"/>
+        <element name="miniCartItemsText" type="text" selector=".minicart-items"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductCompareMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductCompareMainSection.xml
new file mode 100644
index 00000000000..ba706aca8fe
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductCompareMainSection.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="StorefrontProductCompareMainSection">
+        <element name="ProductAddToCartByName" type="button" selector="//*[@id='product-comparison']//td[.//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]]//button[contains(@class, 'tocart')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductInfoMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 00000000000..798bbdf115d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/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="AddToCart" type="button" selector="#product-addtocart-button"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 00000000000..d512aebb2c2
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,210 @@
+<?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="EndToEndB2CGuestUserTest">
+        <!-- Step 3: User adds products to cart -->
+        <comment userInput="Start of adding products to cart" stepKey="startOfAddingProductsToCart" after="endOfBrowsingCatalog"/>
+        <!-- Add Simple Product 1 to cart -->
+        <comment userInput="Add Simple Product 1 to cart" stepKey="commentAddSimpleProduct1ToCart" after="startOfAddingProductsToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory" after="commentAddSimpleProduct1ToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategoryloaded" after="cartClickCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory" after="waitForCartCategoryloaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct1" after="cartAssertCategory">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartGrabSimpleProduct1ImageSrc" after="cartAssertSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabSimpleProduct1ImageSrc" stepKey="cartAssertSimpleProduct1ImageNotDefault" after="cartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="cartClickSimpleProduct1" after="cartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct1loaded" after="cartClickSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertProduct1Page" after="waitForCartSimpleProduct1loaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabSimpleProduct1PageImageSrc" after="cartAssertProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabSimpleProduct1PageImageSrc" stepKey="cartAssertSimpleProduct1PageImageNotDefault" after="cartGrabSimpleProduct1PageImageSrc"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddProduct1ToCart" after="cartAssertSimpleProduct1PageImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.one"/>
+        </actionGroup>
+
+        <!-- Add Simple Product 2 to cart -->
+        <comment userInput="Add Simple Product 2 to cart" stepKey="commentAddSimpleProduct2ToCart" after="cartAddProduct1ToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory1" after="commentAddSimpleProduct2ToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategory1loaded" after="cartClickCategory1"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForSimpleProduct2" after="waitForCartCategory1loaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct2" after="cartAssertCategory1ForSimpleProduct2">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartGrabSimpleProduct2ImageSrc" after="cartAssertSimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabSimpleProduct2ImageSrc" stepKey="cartAssertSimpleProduct2ImageNotDefault" after="cartGrabSimpleProduct2ImageSrc"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCartActionGroup" stepKey="cartAddProduct2ToCart" after="cartAssertSimpleProduct2ImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.two"/>
+        </actionGroup>
+
+        <!-- Check products in minicart -->
+        <!-- Check simple product 1 in minicart -->
+        <comment userInput="Check simple product 1 in minicart" stepKey="commentCheckSimpleProduct1InMinicart" after="cartAddProduct2ToCart"/>
+        <actionGroup ref="StorefrontOpenMinicartAndCheckSimpleProductActionGroup" stepKey="cartOpenMinicartAndCheckSimpleProduct1" after="commentCheckSimpleProduct1InMinicart">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct1ImageSrc" after="cartOpenMinicartAndCheckSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabSimpleProduct1ImageSrc" stepKey="cartMinicartAssertSimpleProduct1ImageNotDefault" after="cartMinicartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createSimpleProduct1.name$$)}}" stepKey="cartMinicartClickSimpleProduct1" after="cartMinicartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartSimpleProduct1loaded" after="cartMinicartClickSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertMinicartProduct1Page" after="waitForMinicartSimpleProduct1loaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct1PageImageSrc" after="cartAssertMinicartProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabSimpleProduct1PageImageSrc" stepKey="cartMinicartAssertSimpleProduct1PageImageNotDefault" after="cartMinicartGrabSimpleProduct1PageImageSrc"/>
+        <actionGroup ref="StorefrontOpenMinicartAndCheckSimpleProductActionGroup" stepKey="cartOpenMinicartAndCheckSimpleProduct2" after="cartMinicartAssertSimpleProduct1PageImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- Check simple product2 in minicart -->
+        <comment userInput="Check simple product 2 in minicart" stepKey="commentCheckSimpleProduct2InMinicart" after="cartOpenMinicartAndCheckSimpleProduct2"/>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct2ImageSrc" after="commentCheckSimpleProduct2InMinicart"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabSimpleProduct2ImageSrc" stepKey="cartMinicartAssertSimpleProduct2ImageNotDefault" after="cartMinicartGrabSimpleProduct2ImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createSimpleProduct2.name$$)}}" stepKey="cartMinicartClickSimpleProduct2" after="cartMinicartAssertSimpleProduct2ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartSimpleProduct2loaded" after="cartMinicartClickSimpleProduct2"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertMinicartProduct2Page" after="waitForMinicartSimpleProduct2loaded">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct2PageImageSrc" after="cartAssertMinicartProduct2Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabSimpleProduct2PageImageSrc" stepKey="cartMinicartAssertSimpleProduct2PageImageNotDefault" after="cartMinicartGrabSimpleProduct2PageImageSrc"/>
+
+        <!-- Check products in cart -->
+        <comment userInput="Check cart information" stepKey="commentCheckCartInformation" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="commentCheckCartInformation"/>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuote.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuote.total"/>
+        </actionGroup>
+
+        <!-- Check simple product 1 in cart -->
+        <comment userInput="Check simple product 1 in cart" stepKey="commentCheckSimpleProduct1InCart" after="cartAssertCart"/>
+        <actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="cartAssertCartSimpleProduct1" after="commentCheckSimpleProduct1InCart">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartCartGrabSimpleProduct1ImageSrc" after="cartAssertCartSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabSimpleProduct1ImageSrc" stepKey="cartCartAssertSimpleProduct1ImageNotDefault" after="cartCartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createSimpleProduct1.name$$)}}" stepKey="cartClickCartSimpleProduct1" after="cartCartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct1loadedAgain" after="cartClickCartSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertCartProduct1Page" after="waitForCartSimpleProduct1loadedAgain">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabSimpleProduct2PageImageSrc1" after="cartAssertCartProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabSimpleProduct2PageImageSrc1" stepKey="cartCartAssertSimpleProduct2PageImageNotDefault1" after="cartCartGrabSimpleProduct2PageImageSrc1"/>
+
+        <!-- Check simple product 2 in cart -->
+        <comment userInput="Check simple product 2 in cart" stepKey="commentCheckSimpleProduct2InCart" after="cartCartAssertSimpleProduct2PageImageNotDefault1"/>
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart1" after="commentCheckSimpleProduct2InCart"/>
+        <actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="cartAssertCartSimpleProduct2" after="cartOpenCart1">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartCartGrabSimpleProduct2ImageSrc" after="cartAssertCartSimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabSimpleProduct2ImageSrc" stepKey="cartCartAssertSimpleProduct2ImageNotDefault" after="cartCartGrabSimpleProduct2ImageSrc"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createSimpleProduct2.name$$)}}" stepKey="cartClickCartSimpleProduct2" after="cartCartAssertSimpleProduct2ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct2loaded" after="cartClickCartSimpleProduct2"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertCartProduct2Page" after="waitForCartSimpleProduct2loaded">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabSimpleProduct2PageImageSrc2" after="cartAssertCartProduct2Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabSimpleProduct2PageImageSrc2" stepKey="cartCartAssertSimpleProduct2PageImageNotDefault2" after="cartCartGrabSimpleProduct2PageImageSrc2"/>
+        <comment userInput="End of adding products to cart" stepKey="endOfAddingProductsToCart" after="cartCartAssertSimpleProduct2PageImageNotDefault2" />
+
+        <!-- Step 6: Check out -->
+        <comment userInput="Start of checking out" stepKey="startOfCheckingOut" after="endOfUsingCouponCode" />
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" after="startOfCheckingOut"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection" after="guestGoToCheckoutFromMinicart">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- Check order summary in checkout -->
+        <comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="guestCheckoutFillingShippingSection" />
+        <actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="guestCheckoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingTotal" value="E2EB2CQuote.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuote.total"/>
+        </actionGroup>
+
+        <!-- Check ship to information in checkout -->
+        <comment userInput="Check ship to information in checkout" stepKey="commentCheckShipToInformationInCheckout" after="guestCheckoutCheckOrderSummary" />
+        <actionGroup ref="CheckShipToInformationInCheckoutActionGroup" stepKey="guestCheckoutCheckShipToInformation" after="commentCheckShipToInformationInCheckout">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- Check shipping method in checkout -->
+        <comment userInput="Check shipping method in checkout" stepKey="commentCheckShippingMethodInCheckout" after="guestCheckoutCheckShipToInformation" />
+        <actionGroup ref="CheckShippingMethodInCheckoutActionGroup" stepKey="guestCheckoutCheckShippingMethod" after="commentCheckShippingMethodInCheckout">
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod" />
+        </actionGroup>
+
+        <!-- Verify Simple Product 1 is in checkout cart items -->
+        <comment userInput="Verify Simple Product 1 is in checkout cart items" stepKey="commentVerifySimpleProduct1IsInCheckoutCartItems" after="guestCheckoutCheckShippingMethod" />
+        <actionGroup ref="CheckProductInCheckoutCartItemsActionGroup" stepKey="guestCheckoutCheckSimpleProduct1InCartItems" after="commentVerifySimpleProduct1IsInCheckoutCartItems">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+
+        <!-- Verify Simple Product 2 is in checkout cart items -->
+        <comment userInput="Verify Simple Product 2 is in checkout cart items" stepKey="commentVerifySimpleProduct2IsInCheckoutCartItems" after="guestCheckoutCheckSimpleProduct1InCartItems" />
+        <actionGroup ref="CheckProductInCheckoutCartItemsActionGroup" stepKey="guestCheckoutCheckSimpleProduct2InCartItems" after="commentVerifySimpleProduct2IsInCheckoutCartItems">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <comment userInput="Place order with check money order payment" stepKey="commentPlaceOrderWithCheckMoneyOrderPayment" after="guestCheckoutCheckSimpleProduct2InCartItems" />
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectCheckMoneyOrderPayment" after="commentPlaceOrderWithCheckMoneyOrderPayment"/>
+        <actionGroup ref="CheckBillingAddressInCheckoutActionGroup" stepKey="guestSeeBillingAddress" after="guestSelectCheckMoneyOrderPayment">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceorder" after="guestSeeBillingAddress">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <comment userInput="End of checking out" stepKey="endOfCheckingOut" after="guestPlaceorder" />
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 00000000000..1cd30954d7f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,210 @@
+<?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="EndToEndB2CLoggedInUserTest">
+        <!-- Step 3: User adds products to cart -->
+        <comment userInput="Start of adding products to cart" stepKey="startOfAddingProductsToCart" after="endOfBrowsingCatalog"/>
+        <!-- Add Simple Product 1 to cart -->
+        <comment userInput="Add Simple Product 1 to cart" stepKey="commentAddSimpleProduct1ToCart" after="startOfAddingProductsToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory" after="commentAddSimpleProduct1ToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategoryloaded" after="cartClickCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory" after="waitForCartCategoryloaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct1" after="cartAssertCategory">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartGrabSimpleProduct1ImageSrc" after="cartAssertSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabSimpleProduct1ImageSrc" stepKey="cartAssertSimpleProduct1ImageNotDefault" after="cartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="cartClickSimpleProduct1" after="cartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct1loaded" after="cartClickSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertProduct1Page" after="waitForCartSimpleProduct1loaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabSimpleProduct1PageImageSrc" after="cartAssertProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabSimpleProduct1PageImageSrc" stepKey="cartAssertSimpleProduct1PageImageNotDefault" after="cartGrabSimpleProduct1PageImageSrc"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddProduct1ToCart" after="cartAssertSimpleProduct1PageImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.one"/>
+        </actionGroup>
+
+        <!-- Add Simple Product 2 to cart -->
+        <comment userInput="Add Simple Product 2 to cart" stepKey="commentAddSimpleProduct2ToCart" after="cartAddProduct1ToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory1" after="commentAddSimpleProduct2ToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategory1loaded" after="cartClickCategory1"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForSimpleProduct2" after="waitForCartCategory1loaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct2" after="cartAssertCategory1ForSimpleProduct2">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartGrabSimpleProduct2ImageSrc" after="cartAssertSimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabSimpleProduct2ImageSrc" stepKey="cartAssertSimpleProduct2ImageNotDefault" after="cartGrabSimpleProduct2ImageSrc"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCartActionGroup" stepKey="cartAddProduct2ToCart" after="cartAssertSimpleProduct2ImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.two"/>
+        </actionGroup>
+
+        <!-- Check products in minicart -->
+        <!-- Check simple product 1 in minicart -->
+        <comment userInput="Check simple product 1 in minicart" stepKey="commentCheckSimpleProduct1InMinicart" after="cartAddProduct2ToCart"/>
+        <actionGroup ref="StorefrontOpenMinicartAndCheckSimpleProductActionGroup" stepKey="cartOpenMinicartAndCheckSimpleProduct1" after="commentCheckSimpleProduct1InMinicart">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct1ImageSrc" after="cartOpenMinicartAndCheckSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabSimpleProduct1ImageSrc" stepKey="cartMinicartAssertSimpleProduct1ImageNotDefault" after="cartMinicartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createSimpleProduct1.name$$)}}" stepKey="cartMinicartClickSimpleProduct1" after="cartMinicartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartSimpleProduct1loaded" after="cartMinicartClickSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertMinicartProduct1Page" after="waitForMinicartSimpleProduct1loaded">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct1PageImageSrc" after="cartAssertMinicartProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabSimpleProduct1PageImageSrc" stepKey="cartMinicartAssertSimpleProduct1PageImageNotDefault" after="cartMinicartGrabSimpleProduct1PageImageSrc"/>
+        <actionGroup ref="StorefrontOpenMinicartAndCheckSimpleProductActionGroup" stepKey="cartOpenMinicartAndCheckSimpleProduct2" after="cartMinicartAssertSimpleProduct1PageImageNotDefault">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- Check simple product2 in minicart -->
+        <comment userInput="Check simple product 2 in minicart" stepKey="commentCheckSimpleProduct2InMinicart" after="cartOpenMinicartAndCheckSimpleProduct2"/>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct2ImageSrc" after="commentCheckSimpleProduct2InMinicart"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabSimpleProduct2ImageSrc" stepKey="cartMinicartAssertSimpleProduct2ImageNotDefault" after="cartMinicartGrabSimpleProduct2ImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createSimpleProduct2.name$$)}}" stepKey="cartMinicartClickSimpleProduct2" after="cartMinicartAssertSimpleProduct2ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartSimpleProduct2loaded" after="cartMinicartClickSimpleProduct2"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertMinicartProduct2Page" after="waitForMinicartSimpleProduct2loaded">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct2PageImageSrc" after="cartAssertMinicartProduct2Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabSimpleProduct2PageImageSrc" stepKey="cartMinicartAssertSimpleProduct2PageImageNotDefault" after="cartMinicartGrabSimpleProduct2PageImageSrc"/>
+
+        <!-- Check products in cart -->
+        <comment userInput="Check cart information" stepKey="commentCheckCartInformation" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="commentCheckCartInformation"/>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuote.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuote.total"/>
+        </actionGroup>
+
+        <!-- Check simple product 1 in cart -->
+        <comment userInput="Check simple product 1 in cart" stepKey="commentCheckSimpleProduct1InCart" after="cartAssertCart"/>
+        <actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="cartAssertCartSimpleProduct1" after="commentCheckSimpleProduct1InCart">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="cartCartGrabSimpleProduct1ImageSrc" after="cartAssertCartSimpleProduct1"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabSimpleProduct1ImageSrc" stepKey="cartCartAssertSimpleProduct1ImageNotDefault" after="cartCartGrabSimpleProduct1ImageSrc"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createSimpleProduct1.name$$)}}" stepKey="cartClickCartSimpleProduct1" after="cartCartAssertSimpleProduct1ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct1loadedAgain" after="cartClickCartSimpleProduct1"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertCartProduct1Page" after="waitForCartSimpleProduct1loadedAgain">
+            <argument name="product" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabSimpleProduct2PageImageSrc1" after="cartAssertCartProduct1Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabSimpleProduct2PageImageSrc1" stepKey="cartCartAssertSimpleProduct2PageImageNotDefault1" after="cartCartGrabSimpleProduct2PageImageSrc1"/>
+
+        <!-- Check simple product 2 in cart -->
+        <comment userInput="Check simple product 2 in cart" stepKey="commentCheckSimpleProduct2InCart" after="cartCartAssertSimpleProduct2PageImageNotDefault1"/>
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart1" after="commentCheckSimpleProduct2InCart"/>
+        <actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="cartAssertCartSimpleProduct2" after="cartOpenCart1">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartCartGrabSimpleProduct2ImageSrc" after="cartAssertCartSimpleProduct2"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabSimpleProduct2ImageSrc" stepKey="cartCartAssertSimpleProduct2ImageNotDefault" after="cartCartGrabSimpleProduct2ImageSrc"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createSimpleProduct2.name$$)}}" stepKey="cartClickCartSimpleProduct2" after="cartCartAssertSimpleProduct2ImageNotDefault"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartSimpleProduct2loaded" after="cartClickCartSimpleProduct2"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="cartAssertCartProduct2Page" after="waitForCartSimpleProduct2loaded">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabSimpleProduct2PageImageSrc2" after="cartAssertCartProduct2Page"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabSimpleProduct2PageImageSrc2" stepKey="cartCartAssertSimpleProduct2PageImageNotDefault2" after="cartCartGrabSimpleProduct2PageImageSrc2"/>
+        <comment userInput="End of adding products to cart" stepKey="endOfAddingProductsToCart" after="cartCartAssertSimpleProduct2PageImageNotDefault2" />
+
+        <!-- Step 7: Check out -->
+        <comment userInput="Start of checking out" stepKey="startOfCheckingOut" after="endOfUsingCouponCode" />
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" after="startOfCheckingOut"/>
+        <actionGroup ref="LoggedInUserCheckoutFillingShippingSectionActionGroup" stepKey="checkoutFillingShippingSection" after="goToCheckoutFromMinicart">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- Check order summary in checkout -->
+        <comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="checkoutFillingShippingSection" />
+        <actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="checkoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingTotal" value="E2EB2CQuote.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuote.total"/>
+        </actionGroup>
+
+        <!-- Check ship to information in checkout -->
+        <comment userInput="Check ship to information in checkout" stepKey="commentCheckShipToInformationInCheckout" after="checkoutCheckOrderSummary" />
+        <actionGroup ref="CheckShipToInformationInCheckoutActionGroup" stepKey="checkoutCheckShipToInformation" after="commentCheckShipToInformationInCheckout">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- Check shipping method in checkout -->
+        <comment userInput="Check shipping method in checkout" stepKey="commentCheckShippingMethodInCheckout" after="checkoutCheckShipToInformation" />
+        <actionGroup ref="CheckShippingMethodInCheckoutActionGroup" stepKey="checkoutCheckShippingMethod" after="commentCheckShippingMethodInCheckout">
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod" />
+        </actionGroup>
+
+        <!-- Verify Simple Product 1 is in checkout cart items -->
+        <comment userInput="Verify Simple Product 1 is in checkout cart items" stepKey="commentVerifySimpleProduct1IsInCheckoutCartItems" after="checkoutCheckShippingMethod" />
+        <actionGroup ref="CheckProductInCheckoutCartItemsActionGroup" stepKey="checkoutCheckSimpleProduct1InCartItems" after="commentVerifySimpleProduct1IsInCheckoutCartItems">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+
+        <!-- Verify Simple Product 2 is in checkout cart items -->
+        <comment userInput="Verify Simple Product 2 is in checkout cart items" stepKey="commentVerifySimpleProduct2IsInCheckoutCartItems" after="checkoutCheckSimpleProduct1InCartItems" />
+        <actionGroup ref="CheckProductInCheckoutCartItemsActionGroup" stepKey="checkoutCheckSimpleProduct2InCartItems" after="commentVerifySimpleProduct2IsInCheckoutCartItems">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+
+        <comment userInput="Place order with check money order payment" stepKey="commentPlaceOrderWithCheckMoneyOrderPayment" after="checkoutCheckSimpleProduct2InCartItems" />
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment" after="commentPlaceOrderWithCheckMoneyOrderPayment"/>
+        <actionGroup ref="CheckBillingAddressInCheckoutActionGroup" stepKey="seeBillingAddress" after="selectCheckMoneyOrderPayment">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeorder" after="seeBillingAddress">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <comment userInput="End of checking out" stepKey="endOfCheckingOut" after="placeorder" />
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontCustomerCheckoutTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontCustomerCheckoutTest.xml
index e5de7083dc8..5acc46be18d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontCustomerCheckoutTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontCustomerCheckoutTest.xml
@@ -32,22 +32,19 @@
             <deleteData createDataKey="simpleuscustomer" stepKey="deleteCustomer"/>
         </after>
 
-        <amOnPage stepKey="s1"  url="customer/account/login/"/>
-        <fillField  stepKey="s3" userInput="$$simpleuscustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-        <fillField  stepKey="s5" userInput="$$simpleuscustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-        <click stepKey="s7" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-        <waitForPageLoad stepKey="s9"/>
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$simpleuscustomer$$" />
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$simplecategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$simpleproduct1.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
 
-        <amOnPage stepKey="s11" url="/$$simplecategory.name$$.html" />
-        <moveMouseOver stepKey="s15" selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" />
-        <click stepKey="s17" selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" />
-        <waitForElementVisible stepKey="s21" selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" />
-        <see stepKey="s23" selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$simpleproduct1.name$$ to your shopping cart."/>
-        <see stepKey="s25" selector="{{StorefrontMiniCartSection.quantity}}" userInput="1" />
-        <click stepKey="s27" selector="{{StorefrontMiniCartSection.show}}" />
-        <click stepKey="s31" selector="{{StorefrontMiniCartSection.goToCheckout}}" />
-        <waitForPageLoad stepKey="s33"/>
-        <waitForLoadingMaskToDisappear stepKey="s34"/>
         <click stepKey="s35" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
         <waitForElement stepKey="s36" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
         <click stepKey="s37" selector="{{CheckoutShippingMethodsSection.next}}" />
@@ -61,19 +58,19 @@
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
-        <amOnPage stepKey="s67" url="{{OrdersPage.url}}"/>
+        <amOnPage stepKey="s67" url="{{AdminOrdersPage.url}}"/>
         <waitForPageLoad stepKey="s75"/>
-        <fillField stepKey="s77" selector="{{OrdersGridSection.search}}" userInput="{$s53}" />
+        <fillField stepKey="s77" selector="{{AdminOrdersGridSection.search}}" userInput="{$s53}" />
         <waitForPageLoad stepKey="s78"/>
 
-        <click stepKey="s81" selector="{{OrdersGridSection.submitSearch22}}" />
+        <click stepKey="s81" selector="{{AdminOrdersGridSection.submitSearch22}}" />
         <waitForPageLoad stepKey="s831"/>
-        <click stepKey="s84" selector="{{OrdersGridSection.firstRow}}" />
-        <see stepKey="s85" selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Pending" />
-        <see stepKey="s87" selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="Customer" />
-        <see stepKey="s89" selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="$$simpleuscustomer.email$$" />
-        <see stepKey="s91" selector="{{OrderDetailsInformationSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
-        <see stepKey="s93" selector="{{OrderDetailsInformationSection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
-        <see stepKey="s95" selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="$$simpleproduct1.name$$" />
+        <click stepKey="s84" selector="{{AdminOrdersGridSection.firstRow}}" />
+        <see stepKey="s85" selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" />
+        <see stepKey="s87" selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="Customer" />
+        <see stepKey="s89" selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="$$simpleuscustomer.email$$" />
+        <see stepKey="s91" selector="{{AdminOrderDetailsInformationSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
+        <see stepKey="s93" selector="{{AdminOrderDetailsInformationSection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
+        <see stepKey="s95" selector="{{AdminOrderDetailsInformationSection.itemsOrdered}}" userInput="$$simpleproduct1.name$$" />
     </test>
 </tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontGuestCheckoutTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontGuestCheckoutTest.xml
index e98657b66c4..02ce7ae57cf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontGuestCheckoutTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontGuestCheckoutTest.xml
@@ -20,7 +20,7 @@
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="_defaultProduct" stepKey="createProduct">
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
         </before>
@@ -36,44 +36,36 @@
         <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
-        <see selector="{{StorefrontMiniCartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
-        <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickCart"/>
-        <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <fillField selector="{{GuestCheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
-        <fillField selector="{{GuestCheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
-        <fillField selector="{{GuestCheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
-        <fillField selector="{{GuestCheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
-        <fillField selector="{{GuestCheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
-        <selectOption selector="{{GuestCheckoutShippingSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
-        <fillField selector="{{GuestCheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
-        <fillField selector="{{GuestCheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-        <click selector="{{GuestCheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-        <waitForElement selector="{{GuestCheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{GuestCheckoutShippingSection.next}}" stepKey="clickNext"/>
-        <waitForElement selector="{{GuestCheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-        <conditionalClick selector="{{GuestCheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{GuestCheckoutPaymentSection.cartItemsAreaActive}}" visible="false" stepKey="exposeMiniCart"/>
-        <see selector="{{GuestCheckoutPaymentSection.cartItems}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductInCart"/>
-        <see selector="{{GuestCheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAddress"/>
-        <click selector="{{GuestCheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectCheckMoneyOrderPayment" />
+        <actionGroup ref="CheckBillingAddressInCheckoutActionGroup" stepKey="guestSeeAddress">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceorder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order # is:" stepKey="seeOrderNumber"/>
-        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeEmailYou"/>
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
-        <amOnPage url="{{OrdersPage.url}}" stepKey="onOrdersPage"/>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
-        <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
-        <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
-        <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-        <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeAdminOrderStatus"/>
-        <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="Guest" stepKey="seeAdminOrderGuest"/>
-        <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAdminOrderEmail"/>
-        <see selector="{{OrderDetailsInformationSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderBillingAddress"/>
-        <see selector="{{OrderDetailsInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderShippingAddress"/>
-        <see selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="{{_defaultProduct.name}}" stepKey="seeAdminOrderProduct"/>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeAdminOrderStatus"/>
+        <see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="Guest" stepKey="seeAdminOrderGuest"/>
+        <see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAdminOrderEmail"/>
+        <see selector="{{AdminOrderDetailsInformationSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderBillingAddress"/>
+        <see selector="{{AdminOrderDetailsInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderShippingAddress"/>
+        <see selector="{{AdminOrderDetailsInformationSection.itemsOrdered}}" userInput="$$createProduct.name$$" stepKey="seeAdminOrderProduct"/>
     </test>
 </tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json
index 2a19649ad52..cec9325d2eb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json
@@ -11,28 +11,28 @@
         "sort-packages": true
     },
     "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-testing-framework": "~2.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
+        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
+        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
+        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
+        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
+        "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
+        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
+        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
+        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.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-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-config": "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-msrp": "100.0.0-dev",
         "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
         "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "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-tax": "100.0.0-dev"
     },
     "autoload": {
         "psr-4": {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CMSActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CMSActionGroup.xml
index c7df21c09c1..40d0833e34b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CMSActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CMSActionGroup.xml
@@ -32,6 +32,8 @@
         </arguments>
         <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
         <conditionalClick selector="{{BlockPageActionsSection.idColumn}}" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
         <waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish" />
         <!-- Conditional Click again in case it goes from default state to ascending on first click  -->
@@ -39,7 +41,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish" />
         <click selector="{{BlockPageActionsSection.select(CMSBlockPage.identifier)}}" stepKey="clickSelectCreatedCMSBlock" />
         <click selector="{{BlockPageActionsSection.edit(CMSBlockPage.identifier)}}" stepKey="navigateToCreatedCMSBlock" />
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection" />
     </actionGroup>
 </actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SearchBlockOnGridPageActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SearchBlockOnGridPageActionGroup.xml
new file mode 100644
index 00000000000..cee15a652d9
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SearchBlockOnGridPageActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="searchBlockOnGridPage">
+        <arguments>
+            <argument name="Block" defaultValue=""/>
+        </arguments>
+        <fillField selector="//input[@name='chooser_identifier']" userInput="{{Block.identifier}}" stepKey="fillEntityIdentifier"/>
+        <click selector="//div[@class='modal-inner-wrap']//button[@title='Search']" stepKey="clickSearchBtn" />
+        <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish2" />
+        <waitForElementVisible selector="{{WidgetSection.BlockPage(Block.identifier)}}" stepKey="waitForBlockTitle" />
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml
index 71071706e96..49a96bdc27e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml
@@ -25,8 +25,8 @@
         <data key="price">1.00</data>
         <data key="file_type">Upload File</data>
         <data key="shareable">Yes</data>
-        <data key="file">magento.jpg</data>
         <data key="value">magento.jpg</data>
+        <data key="fileName">magento</data>
         <data key="content">Image content. Yeah.</data>
         <data key="height">1000</data>
     </entity>
@@ -45,8 +45,20 @@
         <data key="price">1.00</data>
         <data key="file_type">Upload File</data>
         <data key="shareable">Yes</data>
-        <data key="file">magento2.jpg</data>
         <data key="value">magento2.jpg</data>
+        <data key="fileName">magento2</data>
+        <data key="extension">jpg</data>
+        <data key="content">Image content. Yeah.</data>
+        <data key="height">1000</data>
+    </entity>
+    <entity name="ImageUpload3" type="uploadImage">
+        <data key="title" unique="suffix">Image1</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="value">magento3.jpg</data>
+        <data key="fileName">magento3</data>
+        <data key="extension">jpg</data>
         <data key="content">Image content. Yeah.</data>
         <data key="height">1000</data>
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/StorefrontHomePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/StorefrontHomePage.xml
new file mode 100644
index 00000000000..a6cdd6d3339
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/StorefrontHomePage.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="StorefrontHomePage" url="/" module="Magento_Cms" area="storefront">
+        <section name="StorefrontHeaderSection"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml
index 4d69570e599..e5609f55dae 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml
@@ -15,5 +15,8 @@
         <element name="idColumn" type="button" selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]"/>
         <element name="clearAll" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
         <element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
+        <element name="FilterBtn" type="input" selector="//button[text()='Filters']"/>
+        <element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
+        <element name="ApplyFiltersBtn" type="button" selector="//span[text()='Apply Filters']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontBlockSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontBlockSection.xml
index 1f242f4b5de..69d07ba32b9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontBlockSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontBlockSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontBlockSection">
         <element name="mediaDescription" type="text" selector=".widget.block.block-static-block>p>img"/>
+        <element name="ImageSource" type="text" selector="//img[contains(@src,'{{var1}}') and not(contains(@src,'{{var2}}/'))]" parameterized="true"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml
index 7c617d07070..8f70dc8f1f9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCMSPageSection">
         <element name="mediaDescription" type="text" selector=".column.main>p>img"/>
+        <element name="ImageSource" type="text" selector="//img[contains(@src,'{{var1}}') and not(contains(@src,'{{var2}}/'))]" parameterized="true"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontHeaderSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontHeaderSection.xml
new file mode 100644
index 00000000000..0a2fb1179eb
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontHeaderSection.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="StorefrontHeaderSection">
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml
index d03ed796c4b..00673747c7c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml
@@ -16,6 +16,8 @@
             <description value="Admin should be able to add image to WYSIWYG content of Block"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84376"/>
+            <!--Skip because of issue MAGETWO-88266-->
+            <group value="skip"/>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
@@ -37,11 +39,11 @@
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         <actionGroup ref="attachImage" stepKey="attachImage1">
-            <argument name="Image" value="ImageUpload"/>
+            <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
         <actionGroup ref="deleteImage" stepKey="deleteImage"/>
         <actionGroup ref="attachImage" stepKey="attachImage2">
-            <argument name="Image" value="ImageUpload"/>
+            <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
         <actionGroup ref="saveImage" stepKey="insertImage"/>
         <actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup" />
@@ -84,6 +86,7 @@
         <waitForPageLoad stepKey="waitForPageLoad11" />
         <!--see image on Storefront-->
         <seeElement selector="{{StorefrontBlockSection.mediaDescription}}" stepKey="assertMediaDescription"/>
+        <seeElementInDOM selector="{{StorefrontBlockSection.ImageSource(ImageUpload3.fileName,ImageUpload3.extension)}}" stepKey="assertMediaSource"/>
         <after>
             <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
             <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSCest.xml
index 6ef5d561d1d..b82d1836aa6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSCest.xml
@@ -16,6 +16,8 @@
             <description value="Admin should be able to add image to WYSIWYG content of CMS Page"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-85825"/>
+            <!--Skip because of issue MAGETWO-88266-->
+            <group value="skip"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="login"/>
@@ -35,12 +37,12 @@
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         <actionGroup ref="attachImage" stepKey="attachImage1">
-            <argument name="Image" value="ImageUpload"/>
+            <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
         <actionGroup ref="deleteImage" stepKey="deleteImage"/>
 
         <actionGroup ref="attachImage" stepKey="attachImage2">
-            <argument name="Image" value="ImageUpload"/>
+            <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
         <actionGroup ref="saveImage" stepKey="insertImage"/>
         <actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup" />
@@ -51,6 +53,7 @@
         <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
         <waitForPageLoad  stepKey="wait4"/>
         <seeElement selector="{{StorefrontCMSPageSection.mediaDescription}}" stepKey="assertMediaDescription"/>
+        <seeElementInDOM selector="{{StorefrontCMSPageSection.ImageSource(ImageUpload3.fileName,ImageUpload3.extension)}}" stepKey="assertMediaSource"/>
         <after>
             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGBlockCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGBlockCest.xml
index b4cdf6fe448..464a708e0f7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGBlockCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGBlockCest.xml
@@ -12,6 +12,8 @@
             <features value="MAGETWO-36659-[CMS] WYSIWYG update"/>
             <stories value="MAGETWO-42158-Variable with WYSIWYG"/>
             <group value="Cms"/>
+            <group value="skip"/>
+            <!-- Skipped; see MAGETWO-88218 -->
             <title value="Admin should be able to add variable to WYSIWYG content of Block"/>
             <description value="You should be able to add variable to WYSIWYG content Block"/>
             <testCaseId value="MAGETWO-84378"/>
@@ -72,7 +74,7 @@
         <waitForPageLoad stepKey="waitForPageLoad6"/>
         <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save2" />
         <waitForElementNotVisible selector="{{VariableSection.VariableTitle}}" stepKey="waitForSlideOutClose" />
-        <click selector="{{BlockWYSIWYGSection.ShowHideBtn}}" stepKey="clickShow/HideBtn"/>
+        <click selector="{{BlockWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn"/>
         <waitForElementVisible selector="{{TinyMCESection.InsertVariableBtn}}"  stepKey="waitForInsertVariableBtn" />
         <seeElement selector="{{TinyMCESection.InsertVariableBtn}}"  stepKey="InsertVariableBtn" />
         <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGCMSCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGCMSCest.xml
index 32aa574611b..33115159e2f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGCMSCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGCMSCest.xml
@@ -71,7 +71,7 @@
         <waitForPageLoad stepKey="waitForPageLoad6"/>
         <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save2" />
         <waitForElementNotVisible selector="{{VariableSection.VariableTitle}}" stepKey="waitForSlideOutClose" />
-        <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShow/HideBtn"/>
+        <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn"/>
         <waitForElementVisible selector="{{CmsWYSIWYGSection.InsertVariableBtn}}"  stepKey="waitForInsertVariableBtn" />
         <seeElement selector="{{CmsWYSIWYGSection.InsertVariableBtn}}"  stepKey="InsertVariableBtn" />
         <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGBlockCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGBlockCest.xml
index d15bd4bc662..c3c76271597 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGBlockCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGBlockCest.xml
@@ -19,14 +19,14 @@
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
+            <createData entity="_defaultBlock" stepKey="createPreReqBlock" />
             <actionGroup ref="LoginActionGroup" stepKey="login"/>
             <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
-        <amOnPage url="{{CmsNewBlock.url}}" stepKey="amOnNewBlockPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <fillField selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" userInput="{{_defaultBlock.title}}" stepKey="fillFieldTitle"/>
-        <fillField selector="{{BlockNewPageBasicFieldsSection.identifier}}" userInput="{{_defaultBlock.identifier}}" stepKey="fillFieldIdentifier"/>
+        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage">
+            <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
+        </actionGroup>
         <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store View" stepKey="selectAllStoreView" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
         <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon1" />
@@ -44,21 +44,9 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
         <waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses1" />
         <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
-        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad3"/>
-        <conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
-        <waitForPageLoad stepKey="waitForGridReload"/>
-        <click selector="{{CmsPagesPageActionsSection.FilterBtn}}" stepKey="clickFiltersBtn" />
-        <fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="$$createCMSPage.identifier$$" stepKey="fillOutURLKey" />
-        <click selector="{{CmsPagesPageActionsSection.ApplyFiltersBtn}}" stepKey="clickApplyBtn" />
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading1" />
-        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending" />
-        <waitForElementVisible selector="{{CmsPagesPageActionsSection.select('$$createCMSPage.identifier$$')}}" stepKey="waitForCMSPageGrid" />
-        <click selector="{{CmsPagesPageActionsSection.select('$$createCMSPage.identifier$$')}}" stepKey="clickSelect" />
-        <waitForElementVisible selector="{{CmsPagesPageActionsSection.edit('$$createCMSPage.identifier$$')}}" stepKey="waitForEditLink" />
-        <click selector="{{CmsPagesPageActionsSection.edit('$$createCMSPage.identifier$$')}}" stepKey="clickEdit" />
-        <waitForPageLoad stepKey="waitForPageLoad4" />
-        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
         <seeElement selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="seeWidgetIcon" />
         <click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon2" />
@@ -68,8 +56,9 @@
         <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Static Block Default Template" stepKey="selectTemplate2" />
         <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn2" />
         <waitForLoadingMaskToDisappear stepKey="waitForWidgetChooserLoadingMaskToDisappear"/>
-        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending2" />
-        <waitForElementVisible selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="waitForBlockTitle" />
+        <actionGroup ref="searchBlockOnGridPage" stepKey="searchBlockOnGridPage">
+            <argument name="Block" value="_defaultBlock"/>
+        </actionGroup>
         <click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
         <wait time="3" stepKey="wait1" />
         <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidgetBtn" />
@@ -77,6 +66,7 @@
         <waitForPageLoad stepKey="waitForPageLoad6" />
         <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
         <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+        <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache" />
         <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage1"/>
         <waitForPageLoad stepKey="waitForPageLoad7" />
         <see userInput="Home page" stepKey="seeHomePageCMSPage"/>
@@ -86,6 +76,7 @@
             <conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
             <waitForPageLoad stepKey="waitForGridReload"/>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
+            <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeCest.xml
index bbcca1571db..3317b414303 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeCest.xml
@@ -44,13 +44,14 @@
         <see selector="{{WidgetSection.InsertWidgetBtnEnabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetEnabled" />
         <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Page Link Block Template" stepKey="selectTemplate" />
         <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
-        <!--<waitForLoadingMaskToDisappear stepKey="wait3"/>-->
         <waitForElementVisible selector="{{WidgetSection.CMSPage}}" stepKey="waitForPageVisible" />
         <scrollTo selector="{{WidgetSection.CMSPage}}" stepKey="scrollToCMSName" />
         <click selector="{{WidgetSection.CMSPage}}" stepKey="selectPreCreateCMS" />
         <waitForElementNotVisible selector="{{WidgetSection.SelectPageTitle}}" stepKey="waitForSlideOutCloses" />
+        <wait time="3" stepKey="waitForInsertWidgetClickable"/>
         <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoading" />
+        <waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideoutCloses" />
         <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
         <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
         <wait stepKey="waitForPageLoad5" time="10" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeCest.xml
index e21a77b25e6..52dccc139c4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeCest.xml
@@ -54,7 +54,7 @@
         <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible"/>
         <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="Category" stepKey="selectCategoryCondition" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear2" />
-        <click selector="{{WidgetSection.RuleParam}}" stepKey="click ..." />
+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam" />
         <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement" />
         <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml
index 102de9727ad..367d166fe50 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml
@@ -68,7 +68,7 @@
         <waitForPageLoad stepKey="waitForPage2" />
         <waitForElementVisible selector="{{WidgetSection.ClearCompare}}" stepKey="waitForClearBtn" />
         <click selector="{{WidgetSection.ClearCompare}}" stepKey="clickClearCompareBtn" />
-        <waitForElementVisible selector="{{WidgetSection.AcceptClear}}" stepKey=""/>
+        <waitForElementVisible selector="{{WidgetSection.AcceptClear}}" stepKey="waitForAcceptBtn"/>
         <click selector="{{WidgetSection.AcceptClear}}" stepKey="acceptClearCompare" />
         <waitForPageLoad stepKey="waitForPage3" />
         <amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWYSIWYGActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWYSIWYGActionGroup.xml
index d9f8bb2170c..11d7acc61d7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWYSIWYGActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWYSIWYGActionGroup.xml
@@ -13,6 +13,7 @@
         <waitForPageLoad stepKey="wait1"/>
         <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
         <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown1" />
+        <waitForElementVisible  selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="waitForUseSystemValueVisible"/>
         <uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
         <selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Enabled by Default" stepKey="selectOption1"/>
         <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/SwitcherActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/SwitcherActionGroup.xml
index 7e2c4db1532..f127b14931c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/SwitcherActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/SwitcherActionGroup.xml
@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SwitchToVersion4ActionGroup">
         <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
+        <waitForPageLoad stepKey="waitForConfigPageToLoad"/>
         <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
         <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox" />
         <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/ConfigurableProductCheckoutActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
new file mode 100644
index 00000000000..78a7e8e09ad
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
@@ -0,0 +1,27 @@
+<?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">
+    <!-- Check configurable product in checkout cart items -->
+    <actionGroup name="CheckConfigurableProductInCheckoutCartItemsActionGroup">
+        <arguments>
+            <argument name="productVar" />
+            <argument name="optionLabel" />
+            <argument name="optionValue" />
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
+        <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="{{productVar.name}}" stepKey="seeProductInCart"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName(productVar.name)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName(productVar.name)}}" visible="false" stepKey="exposeProductOptions"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName(productVar.name)}}" userInput="{{optionLabel}}" stepKey="seeProductOptionLabel" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName(productVar.name)}}" userInput="{{optionValue}}" stepKey="seeProductOptionValue" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCategoryActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCategoryActionGroup.xml
new file mode 100644
index 00000000000..6baf48fa6de
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!-- Check configurable product on the category page -->
+    <actionGroup name="StorefrontCheckCategoryConfigurableProduct">
+        <arguments>
+            <argument name="product"/>
+            <argument name="optionProduct"/>
+        </arguments>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductTitleByName(product.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{optionProduct.price}}.00" selector="{{StorefrontCategoryProductSection.ProductPriceByName(product.name)}}" stepKey="AssertProductPrice"/>
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCompareActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCompareActionGroup.xml
new file mode 100644
index 00000000000..f11f9cc6801
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCompareActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!-- Check the configurable product in comparison page -->
+    <actionGroup name="StorefrontCheckCompareConfigurableProductActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="optionProduct"/>
+        </arguments>
+        <seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName(product.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{optionProduct.price}}.00" selector="{{StorefrontProductCompareMainSection.ProductPriceByName(product.name)}}" stepKey="assertProductPrice"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName('SKU', product.name)}}" stepKey="assertProductPrice"/>
+        <!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
+        <seeElement selector="{{StorefrontProductCompareMainSection.ProductAddToCartByName(product.name)}}" stepKey="assertProductAddToCart"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductActionGroup.xml
new file mode 100644
index 00000000000..9358faeca46
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductActionGroup.xml
@@ -0,0 +1,27 @@
+<?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">
+    <!-- Check the configurable product on the product page -->
+    <actionGroup name="StorefrontCheckConfigurableProduct">
+        <arguments>
+            <argument name="product"/>
+            <argument name="optionProduct"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{product.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <seeInTitle userInput="{{product.name}}" stepKey="AssertProductNameInTitle"/>
+        <see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
+        <see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
+        <see userInput="${{optionProduct.price}}.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
+        <see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="assertInStock"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="assertAddToCart" />
+        <see userInput="{{product.custom_attributes[description]}}" selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="assertProductDescription"/>
+        <see userInput="{{product.custom_attributes[short_description]}}" selector="{{StorefrontProductInfoMainSection.productShortDescription}}" stepKey="assertProductShortDescription"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductCartActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductCartActionGroup.xml
new file mode 100644
index 00000000000..3d813d4a06e
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -0,0 +1,33 @@
+<?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">
+    <!-- Check Configurable Product in the Cart -->
+    <actionGroup name="StorefrontCheckCartConfigurableProductActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="optionProduct"/>
+            <argument name="productQuantity"/>
+        </arguments>
+        <seeElement selector="{{CheckoutCartProductSection.ProductLinkByName(product.name)}}" stepKey="assertProductName"/>
+        <see userInput="${{optionProduct.price}}.00" selector="{{CheckoutCartProductSection.ProductPriceByName(product.name)}}" stepKey="assertProductPrice"/>
+        <seeInField userInput="{{productQuantity}}" selector="{{CheckoutCartProductSection.ProductQuantityByName(product.name)}}" stepKey="assertProductQuantity"/>
+    </actionGroup>
+
+    <!-- Open the Minicart and check Configurable Product -->
+    <actionGroup name="StorefrontOpenMinicartAndCheckConfigurableProductActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="optionProduct"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontMinicartSection.productLinkByName(product.name)}}" stepKey="waitForMinicartProduct" />
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart" />
+        <see userInput="${{optionProduct.price}}.00" selector="{{StorefrontMinicartSection.productPriceByName(product.name)}}" stepKey="assertProductPrice"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml
index b5f53839438..0a2429fa8f9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml
@@ -22,6 +22,18 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="ApiConfigurableProduct" type="product">
+        <data key="sku" unique="suffix">api-configurable-product</data>
+        <data key="type_id">configurable</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">API Configurable Product</data>
+        <data key="urlKey" unique="suffix">api-configurable-product</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
     <entity name="ConfigurableProductAddChild" type="ConfigurableProductAddChild">
         <var key="sku" entityKey="sku" entityType="product" />
         <var key="childSku" entityKey="sku" entityType="product2"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConstData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConstData.xml
new file mode 100644
index 00000000000..457f59f214f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConstData.xml
@@ -0,0 +1,15 @@
+<?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">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="CONST" type="CONST">
+        <data key="three">3</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml
index 81a9c58c6e8..469afa426bc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml
@@ -13,7 +13,7 @@
         <element name="saveAttribute" type="button" selector="#save"/>
         <element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
         <element name="defaultLabel" type="input" selector="input[name='frontend_label[0]']"/>
-        <element name="inputType" type="select" selector="select[name='frontend_input']" timeout="10"/>
+        <element name="inputType" type="select" selector="select[name='frontend_input']" timeout="30"/>
         <element name="addOption" type="button" selector="#add_new_option_button"/>
         <element name="isDefault" type="radio" selector="[data-role='options-container'] tr:nth-of-type({{row}}) input[name='default[]']" parameterized="true"/>
         <element name="optionAdminValue" type="input" selector="[data-role='options-container'] input[name='option[value][option_{{row}}][0]']" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/StorefrontProductInfoMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 00000000000..c5da83d9ac6
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="optionByAttributeId" type="input" selector="#attribute{{var1}}" parameterized="true"/>
+        <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
+        <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
+        <element name="productAttributeOptionsSelectButton" type="select" selector="#product-options-wrapper .super-attribute-select"/>
+    </section>
+</sections>
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
new file mode 100644
index 00000000000..00d53d7dbad
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRelatedProductsTest.xml
@@ -0,0 +1,205 @@
+<?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="AdminRelatedProductsTest">
+        <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."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-12392"/>
+            <useCaseId value="USECASE-114"/>
+            <group value="configurable"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <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="childProductHandle1"/>
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="configProductHandle2">
+                <requiredEntity createDataKey="childProductHandle2"/>
+                <requiredEntity createDataKey="baseConfigProductHandle"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <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>
+
+        <comment userInput="Filter and edit simple product 1" stepKey="filterAndEditComment1"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimple">
+            <argument name="product" value="$$simple1Handle$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
+        <conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openRelatedProductTab"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
+
+        <!-- TODO: move adding related product to a action group when nested action group is allowed (ref#: MQE-539)-->
+        <comment userInput="Add related simple product to simple product" stepKey="addSimpleToSimpleComment"/>
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimple1">
+            <argument name="product" value="$$simple2Handle$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectSimpleTwo"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="selectClearAll1"/>
+        <click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected1"/>
+
+        <comment userInput="Add related config product to simple product" stepKey="addConfigToSimpleComment"/>
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimpleForRelatedConfig1">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectConfigProduct"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="selectClearAll2"/>
+        <click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected2"/>
+
+        <comment userInput="Save simple product" stepKey="saveSimpleProductComment"/>
+        <actionGroup ref="saveProductForm" stepKey="saveRelatedProduct1"/>
+
+        <comment userInput="Assert related simple products for simple product in Admin Product Form" stepKey="assertRelated1Comment"/>
+        <actionGroup ref="AssertTextInAdminProductRelatedUpSellCrossSellSection" stepKey="assertRelated1">
+            <argument name="element" value="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
+            <argument name="expectedText" value="$$simple2Handle.name$$"/>
+        </actionGroup>
+
+        <comment userInput="Assert related config products for simple product in Admin Product Form" stepKey="assertRelated2Comment"/>
+        <actionGroup ref="AssertTextInAdminProductRelatedUpSellCrossSellSection" stepKey="assertRelated2">
+            <argument name="element" value="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
+            <argument name="expectedText" value="$$baseConfigProductHandle.name$$"/>
+        </actionGroup>
+
+        <comment userInput="Filter and edit config product" stepKey="filterAndEditComment2"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage2"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridConfig">
+            <argument name="product" value="$$baseConfigProductHandle$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit2"/>
+        <conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openRelatedProductTab2"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
+
+        <comment userInput="Add related simple product to config product" stepKey="addSimpleToConfigComment"/>
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton3"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGridForConfig3">
+            <argument name="product" value="$$simple2Handle$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectSimpleTwo2"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="selectClearAll3"/>
+        <click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected3"/>
+
+        <comment userInput="Save config product" stepKey="saveConfigProductComment"/>
+        <actionGroup ref="saveProductForm" stepKey="saveRelatedProduct2"/>
+
+        <comment userInput="Assert related simple product for config product in Admin Product Form" stepKey="assertRelated3Comment"/>
+        <actionGroup ref="AssertTextInAdminProductRelatedUpSellCrossSellSection" stepKey="assertRelated3">
+            <argument name="element" value="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
+            <argument name="expectedText" value="$$simple2Handle.name$$"/>
+        </actionGroup>
+
+        <comment userInput="Check storefront related products on simple product page" stepKey="navigateToSimpleProduct1PageComment"/>
+        <amOnPage url="$$simple1Handle.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProduct1Page"/>
+        <waitForPageLoad stepKey="waitForPageLoad9"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsActionsHeaderText}}" userInput="Check items to add to the cart" stepKey="assertRelatedProductHeaderInStorefront1"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsActionsHeaderText}}" userInput="select all" stepKey="assertRelatedProductHeaderInStorefront2"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsListSectionText}}" userInput="$$simple2Handle.name$$" stepKey="assertRelatedSimpleProductNameInStorefront"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsListSectionText}}" userInput="$$baseConfigProductHandle.name$$" stepKey="assertRelatedConfigProductNameInStorefront"/>
+
+        <comment userInput="Navigate to product page from related product link" stepKey="navigateToConfigProductFromRelatedSectionComment"/>
+        <click selector="{{StorefrontProductRelatedProductsSection.relatedProductName('$$baseConfigProductHandle.custom_attributes[url_key]$$')}}" stepKey="clickRelatedProductByName"/>
+        <waitForPageLoad stepKey="waitForPageLoad11"/>
+        <seeInCurrentUrl url="$$baseConfigProductHandle.custom_attributes[url_key]$$" stepKey="seeInCurrentUrl"/>
+
+        <comment userInput="Select option for configurable product" stepKey="selectOptionConfigProduct"/>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$productAttributeOption1Handle.option[store_labels][0][label]$$" stepKey="configSelectOption"/>
+
+        <comment userInput="Check storefront related products on config product page" stepKey="navigateToConfigProductPageComment"/>
+        <see selector="{{StorefrontProductRelatedProductsSection.relatedProductsListSectionText}}" userInput="$$simple2Handle.name$$" stepKey="assertRelatedSimpleProductNameInStorefront2"/>
+
+        <comment userInput="Check related product in product page" stepKey="checkRelatedProductInProductPageComment"/>
+        <click selector="{{StorefrontProductRelatedProductsSection.relatedProductCheckBoxButton('$$simple2Handle.name$$')}}" stepKey="checkRelatedProcut"/>
+
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$baseConfigProductHandle.name$$"/>
+        </actionGroup>
+
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="2" stepKey="seeItemCounterInMiniCart"/>
+
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertOneProductNameInMiniCart">
+            <argument name="productName" value="$$baseConfigProductHandle.name$$"/>
+        </actionGroup>
+
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertOneProductNameInMiniCart2">
+            <argument name="productName" value="$$simple2Handle.name$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CAdminTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CAdminTest.xml
index 1169bb074c5..fcd6f4fd465 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CAdminTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CAdminTest.xml
@@ -20,28 +20,28 @@
         </actionGroup>
         <!--Create product configurations-->
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations" after="fillConfigurableProductMain"/>
-        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" time="30" stepKey="waitForConfigurationModalOpen" after="clickCreateConfigurations"/>
         <!--Create new attribute-->
         <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickCreateNewAttribute" after="waitForConfigurationModalOpen"/>
         <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="enterAttributePanelIFrame" after="clickCreateNewAttribute"/>
         <wait time="2" stepKey="waitForModalIframeReady" after="enterAttributePanelIFrame"/>
-        <waitForElementVisible selector="{{AdminNewAttributePanel.defaultLabel}}" stepKey="waitForIframeLoad" after="waitForModalIframeReady"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.defaultLabel}}" time="30" stepKey="waitForIframeLoad" after="waitForModalIframeReady"/>
         <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{colorProductAttribute.default_label}}" stepKey="fillDefaultLabel" after="waitForIframeLoad"/>
         <selectOption selector="{{AdminNewAttributePanel.inputType}}" userInput="{{colorProductAttribute.input_type}}" stepKey="selectAttributeInputType" after="fillDefaultLabel"/>
         <!--Add option 1 to attribute-->
         <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption1" after="selectAttributeInputType"/>
-        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('1')}}" stepKey="waitForOptionRow1" after="clickAddOption1"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('1')}}" time="30" stepKey="waitForOptionRow1" after="clickAddOption1"/>
         <fillField selector="{{AdminNewAttributePanel.optionAdminValue('0')}}" userInput="{{colorProductAttribute1.name}}" stepKey="fillAdminLabel1" after="waitForOptionRow1"/>
         <fillField selector="{{AdminNewAttributePanel.optionDefaultStoreValue('0')}}" userInput="{{colorProductAttribute1.name}}" stepKey="fillDefaultLabel1" after="fillAdminLabel1"/>
         <!--Add option 2 to attribute-->
         <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption2" after="fillDefaultLabel1"/>
-        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('2')}}" stepKey="waitForOptionRow2" after="clickAddOption2"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('2')}}" time="30" stepKey="waitForOptionRow2" after="clickAddOption2"/>
         <fillField selector="{{AdminNewAttributePanel.optionAdminValue('1')}}" userInput="{{colorProductAttribute2.name}}" stepKey="fillAdminLabel2" after="waitForOptionRow2"/>
         <fillField selector="{{AdminNewAttributePanel.optionDefaultStoreValue('1')}}" userInput="{{colorProductAttribute2.name}}" stepKey="fillDefaultLabel2" after="fillAdminLabel2"/>
         <!--Save new attribute-->
         <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickSaveAttribute" after="fillDefaultLabel2"/>
         <switchToIFrame stepKey="switchToParentPage" after="clickSaveAttribute"/>
-        <waitForElementNotVisible selector="{{AdminNewAttributePanel.container}}" stepKey="waitForNewAttributePanelClose" after="switchToParentPage"/>
+        <waitForElementNotVisible selector="{{AdminNewAttributePanel.container}}" time="30" stepKey="waitForNewAttributePanelClose" after="switchToParentPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForSaveAttributeLoadingMask" after="waitForNewAttributePanelClose"/>
         <!--Find new attribute in grid and select-->
         <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="openFilterPanel" after="waitForSaveAttributeLoadingMask"/>
@@ -60,15 +60,16 @@
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickGenerateProducts" after="clickNext3"/>
         <!--Save configurable product-->
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveConfigurableProduct" after="clickGenerateProducts"/>
-        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitForAttributeSetConfirmation" after="clickSaveConfigurableProduct"/>
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" time="30" stepKey="waitForAttributeSetConfirmation" after="clickSaveConfigurableProduct"/>
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickConfirmAttributeSet" after="waitForAttributeSetConfirmation"/>
         <see selector="You saved the product" stepKey="seeConfigurableSaveConfirmation" after="clickConfirmAttributeSet"/>
         <actionGroup ref="viewConfigurableProductInAdminGrid" stepKey="viewConfigurableProductInGrid" after="seeConfigurableSaveConfirmation">
             <argument name="product" value="BaseConfigurableProduct"/>
         </actionGroup>
 
-        <!--TODO - Move to 'after' block when MQE-732 is fixed-->
-        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProduct">
+        <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
+        <comment userInput="Clean up configurable product" stepKey="cleanUpConfigurableProduct" after="deleteSimpleProduct"/>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProduct" after="cleanUpConfigurableProduct">
             <argument name="product" value="BaseConfigurableProduct"/>
         </actionGroup>
     </test>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 00000000000..d3791f4d526
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,222 @@
+<?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="EndToEndB2CGuestUserTest">
+        <before>
+            <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="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigChildProduct1Image">
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createConfigChildProduct2Image">
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </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="createConfigChildProduct1"/>
+                <requiredEntity createDataKey="createConfigProduct"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+                <requiredEntity createDataKey="createConfigProduct"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigProductImage">
+                <requiredEntity createDataKey="createConfigProduct"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateConfigProduct" createDataKey="createConfigProduct"/>
+        </before>
+        <after>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigChildProduct1Image" stepKey="deleteConfigChildProduct1Image"/>-->
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigChildProduct2Image" stepKey="deleteConfigChildProduct2Image"/>-->
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigProductImage" stepKey="deleteConfigProductImage"/>-->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- Verify Configurable Product in checkout cart items -->
+        <comment userInput="Verify Configurable Product in checkout cart items" stepKey="commentVerifyConfigurableProductInCheckoutCartItems" after="guestCheckoutCheckSimpleProduct2InCartItems" />
+        <actionGroup ref="CheckConfigurableProductInCheckoutCartItemsActionGroup" stepKey="guestCheckoutCheckConfigurableProductInCartItems" after="commentVerifyConfigurableProductInCheckoutCartItems">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+            <argument name="optionLabel" value="$$createConfigProductAttribute.attribute[frontend_labels][0][label]$$" />
+            <argument name="optionValue" value="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" />
+        </actionGroup>
+
+        <!-- Check configurable product in category -->
+        <comment userInput="Verify Configurable Product in category" stepKey="commentVerifyConfigurableProductInCategory" after="browseAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="browseAssertCategoryConfigProduct" after="commentVerifyConfigurableProductInCategory">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="browseGrabConfigProductImageSrc" after="browseAssertCategoryConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabConfigProductImageSrc" stepKey="browseAssertConfigProductImageNotDefault" after="browseGrabConfigProductImageSrc"/>
+
+        <!-- View Configurable Product -->
+        <comment userInput="View Configurable Product" stepKey="commentViewConfigurableProduct" after="browseAssertSimpleProduct2PageImageNotDefault" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory2" after="commentViewConfigurableProduct"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" stepKey="browseClickCategoryConfigProductView" after="clickCategory2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForConfigurableProductViewloaded" after="browseClickCategoryConfigProductView"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="browseAssertConfigProductPage" after="waitForConfigurableProductViewloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabConfigProductPageImageSrc" after="browseAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabConfigProductPageImageSrc" stepKey="browseAssertConfigProductPageImageNotDefault" after="browseGrabConfigProductPageImageSrc"/>
+
+        <!-- Add Configurable Product to cart -->
+        <comment userInput="Add Configurable Product to cart" stepKey="commentAddConfigurableProductToCart" after="cartAddProduct2ToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory2" after="commentAddConfigurableProductToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategory2loaded" after="cartClickCategory2"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForConfigurableProduct" after="waitForCartCategory2loaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="cartAssertConfigProduct" after="cartAssertCategory1ForConfigurableProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartGrabConfigProductImageSrc" after="cartAssertConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabConfigProductImageSrc" stepKey="cartAssertConfigProductImageNotDefault" after="cartGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName($$createConfigProduct.name$$)}}" stepKey="cartClickCategoryConfigProductAddToCart" after="cartAssertConfigProductImageNotDefault"/>
+        <waitForElement selector="{{StorefrontMessagesSection.message('You need to choose options for your item.')}}" time="30" stepKey="cartWaitForConfigProductPageLoad" after="cartClickCategoryConfigProductAddToCart"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertConfigProductPage" after="cartWaitForConfigProductPageLoad">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabConfigProductPageImageSrc1" after="cartAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabConfigProductPageImageSrc1" stepKey="cartAssertConfigProductPageImageNotDefault1" after="cartGrabConfigProductPageImageSrc1"/>
+        <selectOption userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="cartConfigProductFillOption" after="cartAssertConfigProductPageImageNotDefault1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForConfigurableProductOptionloaded" after="cartConfigProductFillOption"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertConfigProductWithOptionPage" after="waitForConfigurableProductOptionloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabConfigProductPageImageSrc2" after="cartAssertConfigProductWithOptionPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabConfigProductPageImageSrc2" stepKey="cartAssertConfigProductPageImageNotDefault2" after="cartGrabConfigProductPageImageSrc2"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigProductToCart" after="cartAssertConfigProductPageImageNotDefault2">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+
+        <!-- Check configurable product in minicart -->
+        <comment userInput="Check configurable product in minicart" stepKey="commentCheckConfigurableProductInMinicart" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
+        <actionGroup ref="StorefrontOpenMinicartAndCheckConfigurableProductActionGroup" stepKey="cartOpenMinicartAndCheckConfigProduct" after="commentCheckConfigurableProductInMinicart">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartMinicartGrabConfigProductImageSrc" after="cartOpenMinicartAndCheckConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabConfigProductImageSrc" stepKey="cartMinicartAssertConfigProductImageNotDefault" after="cartMinicartGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productOptionsDetailsByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProductDetails" after="cartMinicartAssertConfigProductImageNotDefault"/>
+        <see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{StorefrontMinicartSection.productOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartMinicartCheckConfigProductOption" after="cartMinicartClickConfigProductDetails"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProduct" after="cartMinicartCheckConfigProductOption"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartConfigProductloaded" after="cartMinicartClickConfigProduct"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertMinicartConfigProductPage" after="waitForMinicartConfigProductloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabConfigProductPageImageSrc" after="cartAssertMinicartConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabConfigProductPageImageSrc" stepKey="cartMinicartAssertConfigProductPageImageNotDefault" after="cartMinicartGrabConfigProductPageImageSrc"/>
+
+        <!-- Check configurable product in cart -->
+        <comment userInput="Check configurable product in cart" stepKey="commentCheckConfigurableProductInCart" after="cartCartAssertSimpleProduct2PageImageNotDefault2" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart2" after="commentCheckConfigurableProductInCart"/>
+        <actionGroup ref="StorefrontCheckCartConfigurableProductActionGroup" stepKey="cartAssertCartConfigProduct" after="cartOpenCart2">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartCartGrabConfigProduct2ImageSrc" after="cartAssertCartConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabConfigProduct2ImageSrc" stepKey="cartCartAssertConfigProduct2ImageNotDefault" after="cartCartGrabConfigProduct2ImageSrc"/>
+        <see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartCheckConfigProductOption" after="cartCartAssertConfigProduct2ImageNotDefault"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createConfigProduct.name$$)}}" stepKey="cartClickCartConfigProduct" after="cartCheckConfigProductOption"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartConfigProductloaded" after="cartClickCartConfigProduct"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertCartConfigProductPage" after="waitForCartConfigProductloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabConfigProductPageImageSrc" after="cartAssertCartConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabConfigProductPageImageSrc" stepKey="cartCartAssertConfigProductPageImageNotDefault" after="cartCartGrabConfigProductPageImageSrc"/>
+
+        <!-- Add Configurable Product to comparison -->
+        <comment userInput="Add Configurable Product to comparison" stepKey="commentAddConfigurableProductToComparison" after="compareAddSimpleProduct2ToCompare" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="compareAssertConfigProduct" after="commentAddConfigurableProductToComparison">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="compareGrabConfigProductImageSrc" after="compareAssertConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabConfigProductImageSrc" stepKey="compareAssertConfigProductImageNotDefault" after="compareGrabConfigProductImageSrc"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="compareAddConfigProductToCompare" after="compareAssertConfigProductImageNotDefault">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+
+        <!-- Check configurable product in comparison sidebar -->
+        <comment userInput="Add Configurable Product in comparison sidebar" stepKey="commentAddConfigurableProductInComparisonSidebar" after="compareSimpleProduct2InSidebar" />
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareConfigProductInSidebar" after="commentAddConfigurableProductInComparisonSidebar">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+
+        <!-- Check configurable product on comparison page -->
+        <comment userInput="Add Configurable Product on comparison page" stepKey="commentAddConfigurableProductOnComparisonPage" after="compareAssertSimpleProduct2ImageNotDefaultInComparison" />
+        <actionGroup ref="StorefrontCheckCompareConfigurableProductActionGroup" stepKey="compareAssertConfigProductInComparison" after="commentAddConfigurableProductOnComparisonPage">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="compareGrabConfigProductImageSrcInComparison" after="compareAssertConfigProductInComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabConfigProductImageSrcInComparison" stepKey="compareAssertConfigProductImageNotDefaultInComparison" after="compareGrabConfigProductImageSrcInComparison"/>
+   </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 00000000000..b1b73d40da1
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,222 @@
+<?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="EndToEndB2CLoggedInUserTest">
+        <before>
+            <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="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigChildProduct1Image">
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createConfigChildProduct2Image">
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </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="createConfigChildProduct1"/>
+                <requiredEntity createDataKey="createConfigProduct"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+                <requiredEntity createDataKey="createConfigProduct"/>
+            </createData>
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigProductImage">
+                <requiredEntity createDataKey="createConfigProduct"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateConfigProduct" createDataKey="createConfigProduct"/>
+        </before>
+        <after>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigChildProduct1Image" stepKey="deleteConfigChildProduct1Image"/>-->
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigChildProduct2Image" stepKey="deleteConfigChildProduct2Image"/>-->
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <!-- @TODO: Uncomment once MQE-679 is fixed -->
+            <!--<deleteData createDataKey="createConfigProductImage" stepKey="deleteConfigProductImage"/>-->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- Verify Configurable Product in checkout cart items -->
+        <comment userInput="Verify Configurable Product in checkout cart items" stepKey="commentVerifyConfigurableProductInCheckoutCartItems" after="checkoutCheckSimpleProduct2InCartItems" />
+        <actionGroup ref="CheckConfigurableProductInCheckoutCartItemsActionGroup" stepKey="checkoutCheckConfigurableProductInCartItems" after="commentVerifyConfigurableProductInCheckoutCartItems">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+            <argument name="optionLabel" value="$$createConfigProductAttribute.attribute[frontend_labels][0][label]$$" />
+            <argument name="optionValue" value="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" />
+        </actionGroup>
+
+        <!-- Check configurable product in category -->
+        <comment userInput="Verify Configurable Product in category" stepKey="commentVerifyConfigurableProductInCategory" after="browseAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="browseAssertCategoryConfigProduct" after="commentVerifyConfigurableProductInCategory">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="browseGrabConfigProductImageSrc" after="browseAssertCategoryConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabConfigProductImageSrc" stepKey="browseAssertConfigProductImageNotDefault" after="browseGrabConfigProductImageSrc"/>
+
+        <!-- View Configurable Product -->
+        <comment userInput="View Configurable Product" stepKey="commentViewConfigurableProduct" after="browseAssertSimpleProduct2PageImageNotDefault" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory2" after="commentViewConfigurableProduct"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" stepKey="browseClickCategoryConfigProductView" after="clickCategory2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForConfigurableProductViewloaded" after="browseClickCategoryConfigProductView"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="browseAssertConfigProductPage" after="waitForConfigurableProductViewloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabConfigProductPageImageSrc" after="browseAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabConfigProductPageImageSrc" stepKey="browseAssertConfigProductPageImageNotDefault" after="browseGrabConfigProductPageImageSrc"/>
+
+        <!-- Add Configurable Product to cart -->
+        <comment userInput="Add Configurable Product to cart" stepKey="commentAddConfigurableProductToCart" after="cartAddProduct2ToCart" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="cartClickCategory2" after="commentAddConfigurableProductToCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartCategory2loaded" after="cartClickCategory2"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForConfigurableProduct" after="waitForCartCategory2loaded">
+            <argument name="category" value="$$createCategory$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="cartAssertConfigProduct" after="cartAssertCategory1ForConfigurableProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartGrabConfigProductImageSrc" after="cartAssertConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartGrabConfigProductImageSrc" stepKey="cartAssertConfigProductImageNotDefault" after="cartGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName($$createConfigProduct.name$$)}}" stepKey="cartClickCategoryConfigProductAddToCart" after="cartAssertConfigProductImageNotDefault"/>
+        <waitForElement selector="{{StorefrontMessagesSection.message('You need to choose options for your item.')}}" time="30" stepKey="cartWaitForConfigProductPageLoad" after="cartClickCategoryConfigProductAddToCart"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertConfigProductPage" after="cartWaitForConfigProductPageLoad">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabConfigProductPageImageSrc1" after="cartAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabConfigProductPageImageSrc1" stepKey="cartAssertConfigProductPageImageNotDefault1" after="cartGrabConfigProductPageImageSrc1"/>
+        <selectOption userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.optionByAttributeId($$createConfigProductAttribute.attribute_id$$)}}" stepKey="cartConfigProductFillOption" after="cartAssertConfigProductPageImageNotDefault1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForConfigurableProductOptionloaded" after="cartConfigProductFillOption"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertConfigProductWithOptionPage" after="waitForConfigurableProductOptionloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartGrabConfigProductPageImageSrc2" after="cartAssertConfigProductWithOptionPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartGrabConfigProductPageImageSrc2" stepKey="cartAssertConfigProductPageImageNotDefault2" after="cartGrabConfigProductPageImageSrc2"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigProductToCart" after="cartAssertConfigProductPageImageNotDefault2">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productCount" value="CONST.three"/>
+        </actionGroup>
+
+        <!-- Check configurable product in minicart -->
+        <comment userInput="Check configurable product in minicart" stepKey="commentCheckConfigurableProductInMinicart" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
+        <actionGroup ref="StorefrontOpenMinicartAndCheckConfigurableProductActionGroup" stepKey="cartOpenMinicartAndCheckConfigProduct" after="commentCheckConfigurableProductInMinicart">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartMinicartGrabConfigProductImageSrc" after="cartOpenMinicartAndCheckConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabConfigProductImageSrc" stepKey="cartMinicartAssertConfigProductImageNotDefault" after="cartMinicartGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontMinicartSection.productOptionsDetailsByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProductDetails" after="cartMinicartAssertConfigProductImageNotDefault"/>
+        <see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{StorefrontMinicartSection.productOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartMinicartCheckConfigProductOption" after="cartMinicartClickConfigProductDetails"/>
+        <click selector="{{StorefrontMinicartSection.productLinkByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProduct" after="cartMinicartCheckConfigProductOption"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMinicartConfigProductloaded" after="cartMinicartClickConfigProduct"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertMinicartConfigProductPage" after="waitForMinicartConfigProductloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabConfigProductPageImageSrc" after="cartAssertMinicartConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabConfigProductPageImageSrc" stepKey="cartMinicartAssertConfigProductPageImageNotDefault" after="cartMinicartGrabConfigProductPageImageSrc"/>
+
+        <!-- Check configurable product in cart -->
+        <comment userInput="Check configurable product in cart" stepKey="commentCheckConfigurableProductInCart" after="cartCartAssertSimpleProduct2PageImageNotDefault2" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart2" after="commentCheckConfigurableProductInCart"/>
+        <actionGroup ref="StorefrontCheckCartConfigurableProductActionGroup" stepKey="cartAssertCartConfigProduct" after="cartOpenCart2">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="productQuantity" value="CONST.one"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartCartGrabConfigProduct2ImageSrc" after="cartAssertCartConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabConfigProduct2ImageSrc" stepKey="cartCartAssertConfigProduct2ImageNotDefault" after="cartCartGrabConfigProduct2ImageSrc"/>
+        <see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartCheckConfigProductOption" after="cartCartAssertConfigProduct2ImageNotDefault"/>
+        <click selector="{{CheckoutCartProductSection.ProductLinkByName($$createConfigProduct.name$$)}}" stepKey="cartClickCartConfigProduct" after="cartCheckConfigProductOption"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCartConfigProductloaded" after="cartClickCartConfigProduct"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertCartConfigProductPage" after="waitForCartConfigProductloaded">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabConfigProductPageImageSrc" after="cartAssertCartConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabConfigProductPageImageSrc" stepKey="cartCartAssertConfigProductPageImageNotDefault" after="cartCartGrabConfigProductPageImageSrc"/>
+
+        <!-- Add Configurable Product to comparison -->
+        <comment userInput="Add Configurable Product to comparison" stepKey="commentAddConfigurableProductToComparison" after="compareAddSimpleProduct2ToCompare" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="compareAssertConfigProduct" after="commentAddConfigurableProductToComparison">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="compareGrabConfigProductImageSrc" after="compareAssertConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabConfigProductImageSrc" stepKey="compareAssertConfigProductImageNotDefault" after="compareGrabConfigProductImageSrc"/>
+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="compareAddConfigProductToCompare" after="compareAssertConfigProductImageNotDefault">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+
+        <!-- Check configurable product in comparison sidebar -->
+        <comment userInput="Add Configurable Product in comparison sidebar" stepKey="commentAddConfigurableProductInComparisonSidebar" after="compareSimpleProduct2InSidebar" />
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareConfigProductInSidebar" after="commentAddConfigurableProductInComparisonSidebar">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+
+        <!-- Check configurable product on comparison page -->
+        <comment userInput="Add Configurable Product on comparison page" stepKey="commentAddConfigurableProductOnComparisonPage" after="compareAssertSimpleProduct2ImageNotDefaultInComparison" />
+        <actionGroup ref="StorefrontCheckCompareConfigurableProductActionGroup" stepKey="compareAssertConfigProductInComparison" after="commentAddConfigurableProductOnComparisonPage">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="compareGrabConfigProductImageSrcInComparison" after="compareAssertConfigProductInComparison"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabConfigProductImageSrcInComparison" stepKey="compareAssertConfigProductImageNotDefaultInComparison" after="compareGrabConfigProductImageSrcInComparison"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json
index 93144b56d2f..60dc9a490fd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json
@@ -12,20 +12,20 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
+        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
+        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
+        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.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-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
         "magento/magento2-functional-test-module-customer": "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-msrp": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
+        "magento/magento2-functional-test-module-store": "100.0.0-dev"
     },
     "autoload": {
         "psr-4": {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE.txt
new file mode 100644
index 00000000000..49525fd99da
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE.txt
@@ -0,0 +1,48 @@
+
+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.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE_AFL.txt
new file mode 100644
index 00000000000..f39d641b18a
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+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/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/README.md
new file mode 100644
index 00000000000..bacebfd2691
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/README.md
@@ -0,0 +1,3 @@
+# Magento 2 Functional Tests
+
+The Functional Tests Module for **Magento_ConfigurableProductCatalogSearch** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 00000000000..f5cd41bda74
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,30 @@
+<?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="EndToEndB2CGuestUserTest">
+        <!-- Search configurable product -->
+        <comment userInput="Search configurable product" stepKey="commentSearchConfigurableProduct" after="searchAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="searchAssertFilterCategoryConfigProduct" after="commentSearchConfigurableProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="searchGrabConfigProductImageSrc" after="searchAssertFilterCategoryConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabConfigProductImageSrc" stepKey="searchAssertConfigProductImageNotDefault" after="searchGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" stepKey="searchClickConfigProductView" after="searchAssertConfigProductImageNotDefault"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="searchAssertConfigProductPage" after="searchClickConfigProductView">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchGrabConfigProductPageImageSrc" after="searchAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchGrabConfigProductPageImageSrc" stepKey="searchAssertConfigProductPageImageNotDefault" after="searchGrabConfigProductPageImageSrc"/>
+   </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 00000000000..3e386a034ee
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,30 @@
+<?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="EndToEndB2CLoggedInUserTest">
+        <!-- Search configurable product -->
+        <comment userInput="Search configurable product" stepKey="commentSearchConfigurableProduct" after="searchAssertSimpleProduct2ImageNotDefault" />
+        <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="searchAssertFilterCategoryConfigProduct" after="commentSearchConfigurableProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="searchGrabConfigProductImageSrc" after="searchAssertFilterCategoryConfigProduct"/>
+        <assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabConfigProductImageSrc" stepKey="searchAssertConfigProductImageNotDefault" after="searchGrabConfigProductImageSrc"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" stepKey="searchClickConfigProductView" after="searchAssertConfigProductImageNotDefault"/>
+        <actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="searchAssertConfigProductPage" after="searchClickConfigProductView">
+            <argument name="product" value="$$createConfigProduct$$"/>
+            <argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchGrabConfigProductPageImageSrc" after="searchAssertConfigProductPage"/>
+        <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchGrabConfigProductPageImageSrc" stepKey="searchAssertConfigProductPageImageNotDefault" after="searchGrabConfigProductPageImageSrc"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/composer.json
new file mode 100644
index 00000000000..cbe5f173a38
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "magento/magento2-functional-test-module-configurable-product-catalog-search",
+    "description": "Magento 2 Functional Test Module Configurable Product Catalog Search",
+    "type": "magento2-test-module",
+    "version": "100.0.0-dev",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
+        "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev",
+        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\FunctionalTest\\ConfigurableProductCatalogSearch\\": ""
+        }
+    },
+    "extra": {
+        "map": [
+            [
+                "*",
+                "tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
new file mode 100644
index 00000000000..48b5bd23083
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
@@ -0,0 +1,35 @@
+<?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">
+    <!-- Check configurable product in wishlist -->
+    <actionGroup name="StorefrontCustomerCheckConfigurableProductInWishlist">
+        <arguments>
+            <argument name="productVar"/>
+            <argument name="optionProductVar" />
+        </arguments>
+        <waitForElement selector="{{StorefrontCustomerWishlistProductSection.ProductTitleByName(productVar.name)}}" time="30" stepKey="assertWishlistProductName"/>
+        <see userInput="${{optionProductVar.price}}.00" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName(productVar.name)}}" stepKey="AssertWishlistProductPrice"/>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName(productVar.name)}}" stepKey="wishlistMoveMouseOverProduct" />
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductAddToCartByName(productVar.name)}}" stepKey="AssertWishlistAddToCart" />
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByName(productVar.name)}}" stepKey="AssertWishlistProductImage" />
+    </actionGroup>
+
+    <!-- Check configurable product in wishlist sidebar -->
+    <actionGroup name="StorefrontCustomerCheckConfigurableProductInWishlistSidebar">
+        <arguments>
+            <argument name="productVar"/>
+            <argument name="optionProductVar" />
+        </arguments>
+        <waitForElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductTitleByName(productVar.name)}}" time="30" stepKey="assertWishlistSidebarProductName"/>
+        <see userInput="${{optionProductVar.price}}.00" selector="{{StorefrontCustomerWishlistSidebarSection.ProductPriceByName(productVar.name)}}" stepKey="AssertWishlistSidebarProductPrice"/>
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductAddToCartByName(productVar.name)}}" stepKey="AssertWishlistSidebarAddToCart" />
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductImageByName(productVar.name)}}" stepKey="AssertWishlistSidebarProductImage" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE.txt
new file mode 100644
index 00000000000..49525fd99da
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE.txt
@@ -0,0 +1,48 @@
+
+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.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE_AFL.txt
new file mode 100644
index 00000000000..f39d641b18a
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+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/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/README.md
new file mode 100644
index 00000000000..96b277513a4
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/README.md
@@ -0,0 +1,3 @@
+# Magento 2 Functional Tests
+
+The Functional Tests Module for **Magento_ConfigurableProduct** and **Magento_Wishlist** Modules.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 00000000000..d3b009eecf8
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,29 @@
+<?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="EndToEndB2CLoggedInUserTest">
+        <!-- Step 5: Add products to wishlist -->
+        <!-- Add Configurable Product to wishlist -->
+        <comment userInput="Add Configurable Product to wishlist" stepKey="commentAddConfigurableProductToWishlist" before="endOfAddingProductsToWishlist" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" after="commentAddConfigurableProductToWishlist" stepKey="wishlistGotoCategory3"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" after="wishlistGotoCategory3" stepKey="wishlistClickConfigurableProduct"/>
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" after="wishlistClickConfigurableProduct" stepKey="wishlistAddConfigurableProductToWishlist">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckConfigurableProductInWishlist" after="wishlistAddConfigurableProductToWishlist" stepKey="wishlistCheckConfigurableProductInWishlist">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+            <argument name="optionProductVar" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckConfigurableProductInWishlistSidebar" after="wishlistCheckConfigurableProductInWishlist" stepKey="wishlistCheckConfigurableProductInWishlistSidebar">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+            <argument name="optionProductVar" value="$$createConfigChildProduct1$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/composer.json
new file mode 100644
index 00000000000..5da136f9542
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "magento/magento2-functional-test-module-configurable-product-wishlist",
+    "description": "Magento 2 Functional Test Module Configurable Product Wishlist",
+    "type": "magento2-test-module",
+    "version": "100.0.0-dev",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
+        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
+        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\FunctionalTest\\ConfigurableProductWishlist\\": ""
+        }
+    },
+    "extra": {
+        "map": [
+            [
+                "*",
+                "tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
new file mode 100644
index 00000000000..ef00e2d72f1
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
@@ -0,0 +1,27 @@
+<?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">
+    <actionGroup name="SignUpNewUserFromStorefrontActionGroup">
+        <arguments>
+            <argument name="Customer"/>
+        </arguments>
+        <amOnPage stepKey="amOnStorefrontPage"  url="/"/>
+        <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
+        <fillField  stepKey="fillFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
+        <fillField  stepKey="fillLastName" userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
+        <fillField  stepKey="fillEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
+        <fillField  stepKey="fillPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
+        <fillField  stepKey="fillConfirmPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
+        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
+        <see stepKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>
+        <see stepKey="seeFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+        <see stepKey="seeLastName" userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+        <see stepKey="seeEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml
index 04f42d9a6f4..5f89a3ce9aa 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml
@@ -41,6 +41,7 @@
             <item>7700 West Parmer Lane</item>
         </array>
         <data key="city">Austin</data>
+        <data key="state">Texas</data>
         <data key="country_id">US</data>
         <data key="postcode">78729</data>
         <data key="telephone">512-345-6789</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerData.xml
index fad2748a120..9dee9a1c245 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerData.xml
@@ -39,6 +39,7 @@
         <data key="email" unique="prefix">John.Doe@example.com</data>
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
         <data key="password">pwdTest123!</data>
         <data key="store_id">0</data>
         <data key="website_id">0</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerGroupData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerGroupData.xml
new file mode 100644
index 00000000000..61e0c05ea82
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerGroupData.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="GeneralCustomerGroup" type="customerGroup">
+        <data key="code">General</data>
+        <data key="tax_class_id">3</data>
+        <data key="tax_class_name">Retail Customer</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml
index 9d1477f1c6e..f3efca32c32 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.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="StorefrontPanelHeaderSection">
+        <element name="WelcomeMessage" type="text" selector=".greet.welcome span"/>
         <element name="createAnAccountLink" type="select" selector=".panel.header li:nth-child(3)"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 00000000000..cc1fc78ca69
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,34 @@
+<?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="EndToEndB2CLoggedInUserTest">
+        <annotations>
+            <features value="End to End scenarios"/>
+            <stories value="B2C logged in user - MAGETWO-72524"/>
+            <group value="e2e"/>
+            <title value="You should be able to pass End to End B2C Logged In User scenario"/>
+            <description value="New user signup and browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-87653"/>
+        </annotations>
+        <before>
+            <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <!-- Step 0: User signs up an account -->
+        <comment userInput="Start of signing up user account" stepKey="startOfSigningUpUserAccount" />
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+            <argument name="Customer" value="CustomerEntityOne"/>
+        </actionGroup>
+        <comment userInput="End of signing up user account" stepKey="endOfSigningUpUserAccount" />
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/StorefrontCreateCustomerTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/StorefrontCreateCustomerTest.xml
index c5c5ff201d2..6c155f8c1db 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/StorefrontCreateCustomerTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/StorefrontCreateCustomerTest.xml
@@ -23,17 +23,8 @@
             <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
         </after>
 
-        <amOnPage stepKey="amOnStorefrontPage"  url="/"/>
-        <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
-        <fillField  stepKey="fillFirstName" userInput="{{CustomerEntityOne.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
-        <fillField  stepKey="fillLastName" userInput="{{CustomerEntityOne.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
-        <fillField  stepKey="fillEmail" userInput="{{CustomerEntityOne.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="{{CustomerEntityOne.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
-        <fillField  stepKey="fillConfirmPassword" userInput="{{CustomerEntityOne.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
-        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
-        <see stepKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>
-        <see stepKey="seeFirstName" userInput="{{CustomerEntityOne.firstname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-        <see stepKey="seeLastName" userInput="{{CustomerEntityOne.lastname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-        <see stepKey="seeEmail" userInput="{{CustomerEntityOne.email}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+            <argument name="Customer" value="CustomerEntityOne"/>
+        </actionGroup>
     </test>
 </tests>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/EndToEndB2CAdminTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/EndToEndB2CAdminTest.xml
index 4dd2a5aca75..1dab233132e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/EndToEndB2CAdminTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/EndToEndB2CAdminTest.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CAdminTest">
         <!--Create Downloadable Product-->
-        <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitProductPageDownloadable" after="viewBundleProductInGrid"/>
+        <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitProductPageDownloadable" after="seeSimpleProductInGrid"/>
         <waitForPageLoad stepKey="waitForProductPageLoadDownloadable" after="visitProductPageDownloadable"/>
         <actionGroup ref="goToCreateProductPage" stepKey="goToCreateDownloadableProduct" after="waitForProductPageLoadDownloadable">
             <argument name="product" value="DownloadableProduct"/>
@@ -50,8 +50,9 @@
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
 
-        <!--TODO - Move to 'after' block when MQE-732 is fixed-->
-        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteDownloadableProduct">
+        <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
+        <comment userInput="Clean up downloadable product" stepKey="cleanUpDownloadableProduct" after="deleteSimpleProduct"/>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteDownloadableProduct" after="cleanUpDownloadableProduct">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
     </test>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json
index 400738980fd..cb97370b3d7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/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.0.2|7.0.4|~7.0.6|~7.1.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-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
         "magento/magento2-functional-test-module-config": "100.0.0-dev",
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/LICENSE.txt
new file mode 100644
index 00000000000..49525fd99da
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/LICENSE.txt
@@ -0,0 +1,48 @@
+
+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.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/LICENSE_AFL.txt
new file mode 100644
index 00000000000..f39d641b18a
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+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/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/Metadata/image_content-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/Metadata/image_content-meta.xml
new file mode 100644
index 00000000000..8b12a2fbbbc
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/Metadata/image_content-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="CreateImageContent" dataType="ImageContent" type="create">
+        <field key="base64_encoded_data" required="true">string</field>
+        <field key="type" required="true">string</field>
+        <field key="name" required="true">string</field>
+    </operation>
+    <operation name="UpdateImageContent" dataType="ImageContent" type="update">
+        <field key="base64_encoded_data" required="true">string</field>
+        <field key="type" required="true">string</field>
+        <field key="name" required="true">string</field>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/README.md
new file mode 100644
index 00000000000..7fbe454f709
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/README.md
@@ -0,0 +1,3 @@
+# Magento 2 Functional Tests
+
+The Functional Tests Module for **Magento_Framework**.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/composer.json
new file mode 100644
index 00000000000..e5a2f7fbe9e
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "magento/magento2-functional-test-framework",
+    "description": "Magento 2 Functional Test Framework",
+    "type": "magento2-test-module",
+    "version": "100.0.0-dev",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "~2.0.0",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\FunctionalTest\\Framework\\": ""
+        }
+    },
+    "extra": {
+        "map": [
+            [
+                "*",
+                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Framework"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/EndToEndB2CAdminTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/EndToEndB2CAdminTest.xml
index 40aee930c8b..dc88f99af5d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/EndToEndB2CAdminTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/EndToEndB2CAdminTest.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CAdminTest">
         <!--Create Grouped Product-->
-        <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageGrouped" after="viewConfigurableProductInGrid"/>
+        <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageGrouped" after="seeSimpleProductInGrid"/>
         <waitForPageLoad stepKey="waitForProductPageLoadGrouped" after="visitAdminProductPageGrouped"/>
         <actionGroup ref="goToCreateProductPage" stepKey="goToCreateGroupedProduct" after="waitForProductPageLoadGrouped">
             <argument name="product" value="GroupedProduct"/>
@@ -33,8 +33,9 @@
             <argument name="product" value="GroupedProduct"/>
         </actionGroup>
 
-        <!--TODO - Move to 'after' block when MQE-732 is fixed-->
-        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteGroupedProduct">
+        <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
+        <comment userInput="Clean up grouped product" stepKey="cleanUpGroupedProduct" after="deleteSimpleProduct"/>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteGroupedProduct" after="cleanUpGroupedProduct">
             <argument name="product" value="GroupedProduct"/>
         </actionGroup>
     </test>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json
index 4f4638a6e31..1e484a6d484 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/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.0.2|7.0.4|~7.0.6|~7.1.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-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
         "magento/magento2-functional-test-module-customer": "100.0.0-dev",
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/README.md
new file mode 100644
index 00000000000..900e1366845
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/README.md
@@ -0,0 +1,3 @@
+# Magento 2 Functional Tests
+
+The Functional Tests Module for **Magento_MessageQueue** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json
new file mode 100644
index 00000000000..6b9d8196a58
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "magento/magento2-functional-test-module-message-queue",
+    "description": "Magento 2 Functional Test Module Message Queue",
+    "type": "magento2-test-module",
+    "version": "100.0.0-dev",
+    "license": [
+        "proprietary"
+    ],
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "1.0.0",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\FunctionalTest\\MessageQueue\\": ""
+        }
+    },
+    "extra": {
+        "map": [
+            [
+                "*",
+                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/README.md
new file mode 100644
index 00000000000..a20eb001035
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/README.md
@@ -0,0 +1,3 @@
+# Magento 2 Functional Tests
+
+The Functional Tests Module for **Magento_MysqlMq** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json
new file mode 100644
index 00000000000..0b741f776ab
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json
@@ -0,0 +1,32 @@
+{
+    "name": "magento/magento2-functional-test-module-mysql-mq",
+    "description": "Magento 2 Functional Test Module Mysql Mq",
+    "type": "magento2-test-module",
+    "version": "100.0.0-dev",
+    "license": [
+        "proprietary"
+    ],
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "1.0.0",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "suggest": {
+        "magento/magento2-functional-test-module-store": "100.0.0-dev"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\FunctionalTest\\MysqlMq\\": ""
+        }
+    },
+    "extra": {
+        "map": [
+            [
+                "*",
+                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/StorefrontNewsletterSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/StorefrontNewsletterSection.xml
index d9bd1b55b84..f8cff8986a8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/StorefrontNewsletterSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/StorefrontNewsletterSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontNewsletterSection">
         <element name="mediaDescription" type="text" selector="body>p>img" />
+        <element name="ImageSource" type="text" selector="//img[contains(@src,'{{var1}}') and not(contains(@src,'{{var2}}/'))]" parameterized="true"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml
index 11d5155c8de..dcc9c798dc4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml
@@ -11,11 +11,13 @@
         <annotations>
             <features value="MAGETWO-36659-[CMS] WYSIWYG update"/>
             <stories value="MAGETWO-47309-Apply new WYSIWYG in Newsletter"/>
-            <group value="skip"/>
+            <group value="Newsletter"/>
             <title value="Admin should be able to add image to WYSIWYG content of Newsletter"/>
             <description value="Admin should be able to add image to WYSIWYG content Newsletter"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84377"/>
+            <!--Skip because of issue MAGETWO-88266-->
+            <group value="skip"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="login"/>
@@ -28,6 +30,7 @@
         <fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
         <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
         <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
+        <conditionalClick selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" dependentSelector="{{NewsletterWYSIWYGSection.TinyMCE4}}" visible="false" stepKey="toggleEditorIfHidden"/>
         <waitForElementVisible selector="{{NewsletterWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
         <click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
         <waitForPageLoad stepKey="waitForPageLoad" />
@@ -37,12 +40,12 @@
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         <actionGroup ref="attachImage" stepKey="attachImage1">
-            <argument name="Image" value="ImageUpload"/>
+            <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
         <actionGroup ref="deleteImage" stepKey="deleteImage"/>
 
         <actionGroup ref="attachImage" stepKey="attachImage2">
-            <argument name="Image" value="ImageUpload"/>
+            <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
         <actionGroup ref="saveImage" stepKey="insertImage"/>
         <actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup" />
@@ -52,10 +55,12 @@
         <click selector="{{NewsletterWYSIWYGSection.Preview(_defaultNewsletter.name)}}" stepKey="clickPreview" />
         <switchToWindow stepKey="switchToWindow" userInput="action_window"/>
         <switchToIFrame  userInput="preview_iframe" stepKey="switchToIframe" />
-        <waitForElementVisible selector="{{StorefrontNewsletterSection.mediaDescription}}" stepKey="waitForPageLoad9"/>
+        <waitForPageLoad stepKey="waitForPageLoad9"/>
         <seeElement selector="{{StorefrontNewsletterSection.mediaDescription}}" stepKey="assertMediaDescription"/>
+        <seeElementInDOM selector="{{StorefrontNewsletterSection.ImageSource(ImageUpload3.fileName,ImageUpload3.extension)}}" stepKey="assertMediaSource"/>
         <closeTab stepKey="closeTab"/>
         <after>
+            <closeTab stepKey="closeTab"/>
             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddVariableToWYSIWYGNewsletterCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddVariableToWYSIWYGNewsletterCest.xml
index a2831623d10..fe0f0670392 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddVariableToWYSIWYGNewsletterCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddVariableToWYSIWYGNewsletterCest.xml
@@ -10,8 +10,9 @@
     <test name="AddVariableToNewsletter">
         <annotations>
             <features value="MAGETWO-36659-[CMS] WYSIWYG update"/>
-            <stories value="MAGETWO-42158-Variables with WYSIWYG"/>
+            <stories value="MAGETWO-42158-Variable with WYSIWYG"/>
             <group value="Newsletter"/>
+            <group value="skip"/>
             <title value="Admin should be able to add variable to WYSIWYG Editor of Newsletter"/>
             <description value="Admin should be able to add variable to WYSIWYG Editor Newsletter"/>
             <testCaseId value="MAGETWO-84379"/>
@@ -37,6 +38,9 @@
         <fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
         <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
         <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
+        <conditionalClick selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" dependentSelector="{{NewsletterWYSIWYGSection.TinyMCE4}}" visible="false" stepKey="toggleEditorIfHidden"/>
+        <waitForPageLoad time="10" stepKey="waitForPageLoad21"/>
+        <conditionalClick selector="#toggletext" dependentSelector=".mce-tinymce" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
         <waitForElementVisible selector="{{NewsletterWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
         <executeJS function="tinyMCE.get('text').setContent('Hello World From Newsletter Template!');" stepKey="executeJSFillContent"/>
         <seeElement selector="{{NewsletterWYSIWYGSection.InsertVariableIcon}}" stepKey="seeInsertVariableIcon" />
@@ -72,7 +76,7 @@
         <waitForPageLoad stepKey="waitForPageLoad6"/>
         <click selector="{{VariableSection.InsertVariableBtnEnabled}}" stepKey="save2" />
         <waitForElementNotVisible selector="{{VariableSection.VariableTitle}}" stepKey="waitForSlideOutClose" />
-        <click selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" stepKey="clickShow/HideBtn"/>
+        <click selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn"/>
         <waitForElementVisible selector="{{NewsletterWYSIWYGSection.InsertVariableBtn}}"  stepKey="waitForInsertVariableBtn" />
         <seeElement selector="{{NewsletterWYSIWYGSection.InsertVariableBtn}}"  stepKey="InsertVariableBtn" />
         <click selector="{{BasicFieldNewsletterSection.save}}" stepKey="clickSaveTemplate"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddWidgetToWYSIWYGNewsletterCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddWidgetToWYSIWYGNewsletterCest.xml
index b21879ff175..4df702f478c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddWidgetToWYSIWYGNewsletterCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddWidgetToWYSIWYGNewsletterCest.xml
@@ -28,6 +28,7 @@
         <fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
         <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
         <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
+        <conditionalClick selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" dependentSelector="{{NewsletterWYSIWYGSection.TinyMCE4}}" visible="false" stepKey="toggleEditorIfHidden"/>
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
         <click selector="{{NewsletterWYSIWYGSection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
         <wait time="10" stepKey="waitForPageLoad" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/SalesData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Data/PaymentMethodData.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/SalesData.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Data/PaymentMethodData.xml
index 429fc331c65..5b14d8b5e3f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/SalesData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Data/PaymentMethodData.xml
@@ -8,7 +8,7 @@
 
 <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="salesRecordOne" type="sales">
-        <data key="salesId">data</data>
+    <entity name="PaymentMethodCheckMoneyOrder" type="payment_method">
+        <data key="method">checkmo</data>
     </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest-cart-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Metadata/payment_method-meta.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest-cart-meta.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Metadata/payment_method-meta.xml
index c4a290e4315..a091800bac0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest-cart-meta.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Metadata/payment_method-meta.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  /**
   * Copyright © Magento, Inc. All rights reserved.
@@ -9,7 +8,7 @@
 
 <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="CreateGuestCart" dataType="guestCart" type="create" auth="anonymous" url="/V1/guest-carts" method="POST">
-        <contentType>application/json</contentType>
+    <operation name="CreatePaymentMethod" dataType="payment_method" type="create">
+        <field key="method">string</field>
     </operation>
 </operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/CartItemData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/CartItemData.xml
new file mode 100644
index 00000000000..c1ffe00468a
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/CartItemData.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="SimpleCartItem" type="CartItem">
+        <data key="qty">1</data>
+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/GuestCartData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/GuestCartData.xml
index 197fad0fab2..bb65c1ade2e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/GuestCartData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/GuestCartData.xml
@@ -9,6 +9,20 @@
 
 <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="guestCart" type="guestCart">
+
+    <entity name="GuestCart" type="GuestCart">
+    </entity>
+
+    <entity name="GuestAddressInformation" type="AddressInformation">
+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
+        <requiredEntity type="shipping_address">ShippingAddressTX</requiredEntity>
+        <requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
+        <data key="shipping_method_code">flatrate</data>
+        <data key="shipping_carrier_code">flatrate</data>
+    </entity>
+
+    <entity name="GuestOrderPaymentMethod" type="PaymentInformation">
+        <requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity>
+        <requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
     </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/billing_address-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/billing_address-meta.xml
new file mode 100644
index 00000000000..488f8ba49e2
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/billing_address-meta.xml
@@ -0,0 +1,26 @@
+<?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="CreateBillingAddress" dataType="billing_address" type="create">
+        <field key="city">string</field>
+        <field key="region">string</field>
+        <field key="region_code">string</field>
+        <field key="region_id">int</field>
+        <field key="country_id">string</field>
+        <array key="street">
+            <value>string</value>
+        </array>
+        <field key="postcode">string</field>
+        <field key="firstname">string</field>
+        <field key="lastname">string</field>
+        <field key="email">string</field>
+        <field key="telephone">string</field>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest_cart-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest_cart-meta.xml
new file mode 100644
index 00000000000..29d6266342f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest_cart-meta.xml
@@ -0,0 +1,68 @@
+<?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="CreateGuestCart" dataType="GuestCart" type="create" auth="anonymous" url="/V1/guest-carts" method="POST">
+        <contentType>application/json</contentType>
+    </operation>
+
+    <operation name="AddProductToGuestCart" dataType="CartItem" type="create" auth="anonymous" url="V1/guest-carts/{return}/items" method="POST">
+        <contentType>application/json</contentType>
+        <object key="cartItem" dataType="CartItem">
+            <field key="quote_id">string</field>
+            <field key="sku" type="string">string</field>
+            <field key="qty">integer</field>
+        </object>
+    </operation>
+
+    <operation name="AddAddressInfoToGuestCart" dataType="AddressInformation" type="create" auth="anonymous" url="/V1/guest-carts/{return}/shipping-information" method="POST">
+        <contentType>application/json</contentType>
+        <object key="addressInformation" dataType="AddressInformation">
+            <object key="shipping_address" dataType="shipping_address">
+                <field key="city">string</field>
+                <field key="region">string</field>
+                <field key="region_code">string</field>
+                <field key="region_id">integer</field>
+                <field key="country_id">string</field>
+                <array key="street">
+                    <value>string</value>
+                </array>
+                <field key="postcode">string</field>
+                <field key="firstname">string</field>
+                <field key="lastname">string</field>
+                <field key="email">string</field>
+                <field key="telephone">string</field>
+            </object>
+            <object key="billing_address" dataType="billing_address">
+                <field key="city">string</field>
+                <field key="region">string</field>
+                <field key="region_code">string</field>
+                <field key="region_id">integer</field>
+                <field key="country_id">string</field>
+                <array key="street">
+                    <value>string</value>
+                </array>
+                <field key="postcode">string</field>
+                <field key="firstname">string</field>
+                <field key="lastname">string</field>
+                <field key="email">string</field>
+                <field key="telephone">string</field>
+            </object>
+            <field key="shipping_method_code">string</field>
+            <field key="shipping_carrier_code">string</field>
+        </object>
+    </operation>
+
+    <operation name="SendGuestPaymentInformation" dataType="PaymentInformation" type="update" auth="anonymous" url="/V1/guest-carts/{return}/order" method="PUT">
+        <contentType>application/json</contentType>
+        <object key="paymentMethod" dataType="payment_method">
+            <field key="method">string</field>
+        </object>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/shipping_address-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/shipping_address-meta.xml
new file mode 100644
index 00000000000..e75f49537da
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/shipping_address-meta.xml
@@ -0,0 +1,26 @@
+<?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="CreateShippingAddress" dataType="shipping_address" type="create">
+        <field key="city">string</field>
+        <field key="region">string</field>
+        <field key="region_code">string</field>
+        <field key="region_id">int</field>
+        <field key="country_id">string</field>
+        <array key="street">
+            <value>string</value>
+        </array>
+        <field key="postcode">string</field>
+        <field key="firstname">string</field>
+        <field key="lastname">string</field>
+        <field key="email">string</field>
+        <field key="telephone">string</field>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminCreditMemoActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminCreditMemoActionGroup.xml
new file mode 100644
index 00000000000..e83f061f562
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminCreditMemoActionGroup.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!--Check customer information is correct in credit memo-->
+    <actionGroup name="verifyBasicCreditMemoInformation">
+        <arguments>
+            <argument name="customer" defaultValue=""/>
+            <argument name="shippingAddress" defaultValue=""/>
+            <argument name="billingAddress" defaultValue=""/>
+            <argument name="customerGroup" defaultValue="GeneralCustomerGroup"/>
+        </arguments>
+        <see selector="{{AdminCreditMemoOrderInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
+        <see selector="{{AdminCreditMemoOrderInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
+        <see selector="{{AdminCreditMemoOrderInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
+
+        <see selector="{{AdminCreditMemoAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country_id}}" stepKey="seeBillingAddressCountry"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
+
+        <see selector="{{AdminCreditMemoAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country_id}}" stepKey="seeShippingAddressCountry"/>
+        <see selector="{{AdminCreditMemoAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </actionGroup>
+
+    <actionGroup name="seeProductInItemsRefunded">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <see selector="{{AdminCreditMemoItemsSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminInvoiceActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminInvoiceActionGroup.xml
new file mode 100644
index 00000000000..29d7a2773aa
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminInvoiceActionGroup.xml
@@ -0,0 +1,41 @@
+<?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">
+    <!--Check customer information is correct in invoice-->
+    <actionGroup name="verifyBasicInvoiceInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="shippingAddress"/>
+            <argument name="billingAddress"/>
+            <argument name="customerGroup" defaultValue="GeneralCustomerGroup"/>
+        </arguments>
+        <see selector="{{AdminInvoiceOrderInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
+        <see selector="{{AdminInvoiceOrderInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
+        <see selector="{{AdminInvoiceOrderInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
+
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country_id}}" stepKey="seeBillingAddressCountry"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
+
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country_id}}" stepKey="seeShippingAddressCountry"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </actionGroup>
+
+    <!--Check that product is in invoice items-->
+    <actionGroup name="seeProductInInvoiceItems">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <see selector="{{AdminInvoiceItemsSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
new file mode 100644
index 00000000000..e975a1c2cb9
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
@@ -0,0 +1,137 @@
+<?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">
+    <!--Navigate to create order page (New Order -> Create New Customer)-->
+    <actionGroup name="navigateToNewOrderPageNewCustomer">
+        <arguments>
+            <argument name="storeView" defaultValue="_defaultStore"/>
+        </arguments>
+        <amOnPage url="{{AdminOrdersPage}}" stepKey="navigateToOrderIndexPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <click selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectDefaultStoreView"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+    </actionGroup>
+
+    <!--Check the required fields are actually required-->
+    <actionGroup name="checkRequiredFieldsNewOrderForm">
+        <seeElement selector="{{AdminOrderFormAccountSection.requiredGroup}}" stepKey="seeCustomerGroupRequired"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.FirstName}}" stepKey="clearFirstNameField"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.LastName}}" stepKey="clearLastNameField"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.StreetLine1}}" stepKey="clearStreetField"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.City}}" stepKey="clearCityField"/>
+        <selectOption selector="{{AdminOrderFormBillingAddressSection.Country}}" userInput="United States" stepKey="selectUSCountry"/>
+        <selectOption selector="{{AdminOrderFormBillingAddressSection.State}}" userInput="Please select" stepKey="selectNoState"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.PostalCode}}" stepKey="clearPostalCodeField"/>
+        <clearField selector="{{AdminOrderFormBillingAddressSection.Phone}}" stepKey="clearPhoneField"/>
+        <seeElement selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="seeShippingMethodNotSelected"/>
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="trySubmitOrder"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.firstNameError}}" userInput="This is a required field." stepKey="seeFirstNameRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.lastNameError}}" userInput="This is a required field." stepKey="seeLastNameRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.streetAddressError}}" userInput="This is a required field." stepKey="seeStreetRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.cityError}}" userInput="This is a required field." stepKey="seeCityRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.stateError}}" userInput="This is a required field." stepKey="seeStateRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.postalCodeError}}" userInput="This is a required field." stepKey="seePostalCodeRequired"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.phoneError}}" userInput="This is a required field." stepKey="seePhoneRequired"/>
+        <see selector="{{AdminOrderFormPaymentSection.shippingError}}" userInput="This is a required field." stepKey="seeShippingMethodRequired"/>
+    </actionGroup>
+
+    <!--Add a simple product to order-->
+    <actionGroup name="addSimpleProductToOrder">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
+        <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilter"/>
+        <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearch"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/>
+        <fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="1" stepKey="fillProductQty"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
+    </actionGroup>
+
+    <!--Add configurable product to order -->
+    <actionGroup name="addConfigurableProductToOrder">
+        <arguments>
+            <argument name="product"/>
+            <argument name="attribute"/>
+            <argument name="option"/>
+        </arguments>
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
+        <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilterConfigurable"/>
+        <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchConfigurable"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectConfigurableProduct"/>
+        <waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_label)}}" stepKey="waitForConfigurablePopover"/>
+        <wait time="2" stepKey="waitForOptionsToLoad"/>
+        <selectOption selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_label)}}"
+                      userInput="{{option.name}}" stepKey="selectionConfigurableOption"/>
+        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOkConfigurablePopover"/>
+        <scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
+    </actionGroup>
+
+    <!--Fill customer billing address-->
+    <actionGroup name="fillOrderCustomerInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="address"/>
+        </arguments>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.FirstName}}" userInput="{{customer.firstname}}" stepKey="fillFirstName"/>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.LastName}}" userInput="{{customer.lastname}}" stepKey="fillLastName"/>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.StreetLine1}}" userInput="{{address.street[0]}}" stepKey="fillStreetLine1"/>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.City}}" userInput="{{address.city}}" stepKey="fillCity"/>
+        <selectOption selector="{{AdminOrderFormBillingAddressSection.Country}}" userInput="{{address.country_id}}" stepKey="fillCountry"/>
+        <selectOption selector="{{AdminOrderFormBillingAddressSection.State}}" userInput="{{address.state}}" stepKey="fillState"/>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.PostalCode}}" userInput="{{address.postcode}}" stepKey="fillPostalCode"/>
+        <fillField selector="{{AdminOrderFormBillingAddressSection.Phone}}" userInput="{{address.telephone}}" stepKey="fillPhone"/>
+    </actionGroup>
+
+    <!--Select flat rate shipping method-->
+    <actionGroup name="orderSelectFlatRateShipping">
+        <click selector="{{AdminOrderFormPaymentSection.header}}" stepKey="unfocus"/>
+        <waitForPageLoad stepKey="waitForJavascriptToFinish"/>
+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickShippingMethods"/>
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.flatRateOption}}" stepKey="waitForShippingOptions"/>
+        <selectOption selector="{{AdminOrderFormPaymentSection.flatRateOption}}" userInput="flatrate_flatrate" stepKey="checkFlatRate"/>
+    </actionGroup>
+
+    <!--Check that customer information is correct in order-->
+    <actionGroup name="verifyBasicOrderInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="shippingAddress"/>
+            <argument name="billingAddress"/>
+            <argument name="customerGroup" defaultValue="GeneralCustomerGroup"/>
+        </arguments>
+        <see selector="{{AdminOrderDetailsInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
+        <see selector="{{AdminOrderDetailsInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
+        <see selector="{{AdminOrderDetailsInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
+        <see selector="{{AdminOrderAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminOrderAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminOrderAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country_id}}" stepKey="seeBillingAddressCountry"/>
+        <see selector="{{AdminOrderAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
+        <see selector="{{AdminOrderAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminOrderAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminOrderAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country_id}}" stepKey="seeShippingAddressCountry"/>
+        <see selector="{{AdminOrderAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </actionGroup>
+
+    <!--Check for product in order items list-->
+    <actionGroup name="seeProductInItemsOrdered">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <see selector="{{AdminOrderItemsOrderedSection.productSkuColumn}}" userInput="{{product.sku}}" stepKey="seeSkuInItemsOrdered"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderGridActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderGridActionGroup.xml
new file mode 100644
index 00000000000..b65d32670bb
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderGridActionGroup.xml
@@ -0,0 +1,68 @@
+<?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">
+    <!--Filter order grid by order id field-->
+    <actionGroup name="filterOrderGridById">
+        <amOnPage url="{{AdminOrdersPage}}" stepKey="navigateToOrderGridPage"/>
+        <waitForPageLoad stepKey="waitForOrderGridLoad"/>
+        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
+        <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="$getOrderId" stepKey="fillOrderIdFilter"/>
+        <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
+    </actionGroup>
+
+    <!--Filter order grid by the billing name field-->
+    <actionGroup name="filterOrderGridByBillingName">
+        <arguments>
+            <argument name="customer"/>
+        </arguments>
+        <amOnPage url="{{AdminOrdersPage}}" stepKey="navigateToOrderGridPage"/>
+        <waitForPageLoad stepKey="waitForOrderGridLoad"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderGridFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('billing_name')}}" userInput="{{customer.fullname}}" stepKey="fillBillToNameFilter"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
+    </actionGroup>
+
+    <!--Filter order grid by order total range-->
+    <actionGroup name="filterOrderGridByBaseTotalRange">
+        <arguments>
+            <argument name="from"/>
+            <argument name="to"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderGridFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('base_grand_total[from]')}}" userInput="{{from}}" stepKey="fillOrderTotalFrom"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('base_grand_total[to]')}}" userInput="{{to}}" stepKey="fillOrderTotalTo"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+    
+    <actionGroup name="filterOrderGridByPurchaseDate">
+        <arguments>
+            <argument name="from"/>
+            <argument name="to"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderGridFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('created_at[from]')}}" userInput="{{from}}" stepKey="fillOrderPurchaseDateFrom"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('created_at[to]')}}" userInput="{{to}}" stepKey="fillOrderPurchaseDateTo"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+
+    <actionGroup name="filterOrderGridByStatus">
+        <arguments>
+            <argument name="status"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderGridFilters"/>
+        <selectOption selector="{{AdminDataGridHeaderSection.filterFieldSelect('status')}}" userInput="{{status}}" stepKey="fillOrderStatusFilter"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/AddressData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/AddressData.xml
new file mode 100644
index 00000000000..4c3bd6d7f7e
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/AddressData.xml
@@ -0,0 +1,45 @@
+<?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="ShippingAddressTX" type="shipping_address">
+        <data key="firstname">Joe</data>
+        <data key="lastname">Buyer</data>
+        <data key="fullname">Joe Buyer</data>
+        <array key="street">
+            <item>11501 Domain Dr</item>
+            <item>#150</item>
+        </array>
+        <data key="city">Austin</data>
+        <data key="region">Texas</data>
+        <data key="region_code">TX</data>
+        <data key="region_id">1</data>
+        <data key="country_id">US</data>
+        <data key="postcode">78758</data>
+        <data key="email" unique="prefix">joe.buyer@email.com</data>
+        <data key="telephone">512-345-6789</data>
+    </entity>
+    <entity name="BillingAddressTX" type="billing_address">
+        <data key="firstname">Joe</data>
+        <data key="lastname">Buyer</data>
+        <data key="fullname">Joe Buyer</data>
+        <array key="street">
+            <item>11501 Domain Dr</item>
+            <item>#150</item>
+        </array>
+        <data key="city">Austin</data>
+        <data key="region">Texas</data>
+        <data key="region_code">TX</data>
+        <data key="region_id">1</data>
+        <data key="country_id">US</data>
+        <data key="postcode">78758</data>
+        <data key="email" unique="prefix">joe.buyer@email.com</data>
+        <data key="telephone">512-345-6789</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/ConstData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/ConstData.xml
new file mode 100644
index 00000000000..a91f31a88c2
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/ConstData.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="Const" type="constant">
+        <data key="one">1</data>
+        <data key="two">2</data>
+        <data key="fifty">50</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/OrderData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/OrderData.xml
new file mode 100644
index 00000000000..39772e4c5da
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/OrderData.xml
@@ -0,0 +1,38 @@
+<?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">
+    <!--Data for order created through UI with simple and configurable order-->
+    <entity name="AdminOrderSimpleConfigurableProduct" type="order">
+        <data key="subtotal">246.00</data>
+        <data key="shipping">10.00</data>
+        <data key="grandTotal">256.00</data>
+    </entity>
+    <entity name="AdminOrderSimpleProduct" type="order">
+        <data key="subtotal">123.00</data>
+        <data key="shipping">5.00</data>
+        <data key="grandTotal">128.00</data>
+    </entity>
+    <entity name="OrderGrandTotalFilterRange" type="filter">
+        <data key="from">200</data>
+        <data key="to">400</data>
+    </entity>
+
+    <entity name="OrderStatus" type="status">
+        <data key="canceled">Canceled</data>
+        <data key="closed">Closed</data>
+        <data key="complete">Complete</data>
+        <data key="suspected">Suspected</data>
+        <data key="onHold">On Hold</data>
+        <data key="paymentReview">Payment Review</data>
+        <data key="pending">Pending</data>
+        <data key="pendingPayment">Pending Payment</data>
+        <data key="processing">Processing</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminCreditMemoNewPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminCreditMemoNewPage.xml
new file mode 100644
index 00000000000..79312e75a64
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminCreditMemoNewPage.xml
@@ -0,0 +1,18 @@
+<?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="AdminCreditMemoNewPage" url="sales/order_creditmemo/new/order_id/" area="admin" module="Magento_Sales">
+        <section name="AdminCreditMemoOrderInformationSection"/>
+        <section name="AdminCreditMemoAddressInformationSection"/>
+        <section name="AdminCreditMemoPaymentShippingSection"/>
+        <section name="AdminCreditMemoItemsSection"/>
+        <section name="AdminCreditMemoTotalSection"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoicesPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceDetailsPage.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoicesPage.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceDetailsPage.xml
index c3bcdb3eb12..9322a5779d2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoicesPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceDetailsPage.xml
@@ -8,8 +8,7 @@
 
 <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="InvoicesPage" url="/sales/invoice/" area="admin" module="Sales">
-        <section name="InvoicesGridSection"/>
-        <section name="InvoicesFiltersSection"/>
+    <page name="AdminInvoiceDetailsPage" url="sales/invoice/view/invoice_id/" area="admin" module="Magento_Sales">
+        <section name="AdminInvoiceDetailsInformationSection"/>
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceNewPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceNewPage.xml
new file mode 100644
index 00000000000..6c603f58273
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceNewPage.xml
@@ -0,0 +1,19 @@
+<?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="AdminInvoiceNewPage" url="sales/order_invoice/new/order_id/" area="admin" module="Magento_Sales">
+        <section name="AdminInvoiceMainActionsSection"/>
+        <section name="AdminInvoiceOrderInformationSection"/>
+        <section name="AdminInvoiceAddressInformationSection"/>
+        <section name="AdminInvoicePaymentShippingSection"/>
+        <section name="AdminInvoiceItemsSection"/>
+        <section name="AdminInvoiceTotalSection"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceDetailsPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoicesPage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceDetailsPage.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoicesPage.xml
index 4b827bd3459..d29844da5a8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/InvoiceDetailsPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoicesPage.xml
@@ -8,7 +8,8 @@
 
 <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="InvoiceDetailsPage" url="/sales/invoice/view/invoice_id/" area="admin" module="Sales">
-        <section name="InvoiceDetailsInformationSection"/>
+    <page name="AdminInvoicesPage" url="sales/invoice/" area="admin" module="Magento_Sales">
+        <section name="AdminInvoicesGridSection"/>
+        <section name="AdminInvoicesFiltersSection"/>
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderCreatePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderCreatePage.xml
new file mode 100644
index 00000000000..4eba7f02302
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderCreatePage.xml
@@ -0,0 +1,21 @@
+<?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="AdminOrderCreatePage" url="sales/order_create/index" area="admin" module="Magento_Sales">
+        <section name="AdminOrderFormActionSection"/>
+        <section name="AdminOrderFormItemsSection"/>
+        <section name="AdminOrderFormConfigureProductSection"/>
+        <section name="AdminOrderFormAccountSection"/>
+        <section name="AdminOrderFormBillingAddressSection"/>
+        <section name="AdminOrderFormShippingAddressSection"/>
+        <section name="AdminOrderFormPaymentSection"/>
+        <section name="AdminOrderFormTotalSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml
new file mode 100644
index 00000000000..4755c074a03
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml
@@ -0,0 +1,25 @@
+<?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="AdminOrderDetailsPage" url="sales/order/view/order_id/" area="admin" module="Magento_Sales">
+        <section name="AdminOrderDetailsMainActionsSection"/>
+        <section name="AdminOrderDetailsOrderViewSection"/>
+        <section name="AdminOrderDetailsInformationSection"/>
+        <section name="AdminOrderAddressInformationSection"/>
+        <section name="AdminOrderPaymentInformationSection"/>
+        <section name="AdminOrderShippingInformationSection"/>
+        <section name="AdminOrderItemsOrderedSection"/>
+        <section name="AdminOrderDetailsMessagesSection"/>
+        <section name="AdminOrderInvoicesTabSection"/>
+        <section name="AdminOrderCreditMemosTabSection"/>
+        <section name="AdminOrderShipmentsTabSection"/>
+        <section name="AdminOrderCommentsTabSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrdersPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrdersPage.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrdersPage.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrdersPage.xml
index e2d61468869..b3620c1935a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrdersPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrdersPage.xml
@@ -8,7 +8,7 @@
 
 <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="OrdersPage" url="/sales/order/" area="admin" module="Sales">
-        <section name="OrdersGridSection"/>
+    <page name="AdminOrdersPage" url="sales/order/" area="admin" module="Magento_Sales">
+        <section name="AdminOrdersGridSection"/>
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrderDetailsPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrderDetailsPage.xml
deleted file mode 100644
index 285a0e2f61c..00000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/OrderDetailsPage.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="OrderDetailsPage" url="/sales/order/view/order_id/" area="admin" module="Sales">
-        <section name="OrderDetailsMainActionsSection"/>
-        <section name="OrderDetailsInformationSection"/>
-        <section name="OrderDetailsMessagesSection"/>
-    </page>
-</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoAddressInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoAddressInformationSection.xml
new file mode 100644
index 00000000000..68baf82796f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoAddressInformationSection.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="AdminCreditMemoAddressInformationSection">
+        <element name="billingAddress" type="text" selector=".order-billing-address address"/>
+        <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+        <element name="shippingAddressEdit" type="button" selector=".order-shipping-address .actions a"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoItemsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoItemsSection.xml
new file mode 100644
index 00000000000..024a2c55bef
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoItemsSection.xml
@@ -0,0 +1,27 @@
+<?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="AdminCreditMemoItemsSection">
+        <element name="header" type="text" selector="#creditmemo_item_container span.title"/>
+        <element name="itemName" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
+        <element name="itemSku" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-product .product-sku-block" parameterized="true"/>
+        <element name="itemPrice" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-price .price" parameterized="true"/>
+        <element name="itemQty" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-ordered-qty .qty-table" parameterized="true"/>
+        <element name="itemReturnToStock" type="checkbox" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-return-to-stock input" parameterized="true"/>
+        <element name="itemQtyToRefund" type="input" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-refund .qty-input" parameterized="true"/>
+        <element name="itemSubtotal" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-subtotal .price" parameterized="true"/>
+        <element name="itemTaxAmount" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-tax-amount .price" parameterized="true"/>
+        <element name="itemDiscountAmount" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-discont .price" parameterized="true"/>
+        <element name="itemTotal" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-total .price" parameterized="true"/>
+        <element name="updateQty" type="button" selector=".order-creditmemo-tables tfoot button[data-ui-id='order-items-update-button']" timeout="30"/>
+        <element name="nameColumn" type="text" selector=".order-creditmemo-tables .product-title"/>
+        <element name="skuColumn" type="text" selector=".order-creditmemo-tables .product-sku-block"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoOrderInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoOrderInformationSection.xml
new file mode 100644
index 00000000000..6ffaa51c2d4
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoOrderInformationSection.xml
@@ -0,0 +1,20 @@
+<?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="AdminCreditMemoOrderInformationSection">
+        <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="60"/>
+        <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
+        <element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
+        <element name="purchasedFrom" type="text" selector=".order-information table.order-information-table tr:last-of-type > td"/>
+        <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
+        <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
+        <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoPaymentShippingSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoPaymentShippingSection.xml
new file mode 100644
index 00000000000..1411ee23970
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoPaymentShippingSection.xml
@@ -0,0 +1,19 @@
+<?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="AdminCreditMemoPaymentShippingSection">
+        <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
+        <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
+        <element name="PaymentAdditional" type="text" selector=".order-payment-method .order-payment-additional"/>
+        <element name="ShippingMethod" type="text" selector=".order-shipping-address .shipping-description-title"/>
+        <element name="ShippingPrice" type="text" selector=".order-shipping-address .shipping-description-content .price"/>
+        <element name="CreateShipment" type="checkbox" selector=".order-shipping-address input[name='invoice[do_shipment]']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoTotalSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoTotalSection.xml
new file mode 100644
index 00000000000..529d86dc203
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoTotalSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminCreditMemoTotalSection">
+        <element name="subtotalRow" type="text" selector=".order-subtotal-table tbody > tr:nth-of-type({{row}}) td span.price" parameterized="true"/>
+        <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
+        <element name="refundShipping" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[shipping_amount]']"/>
+        <element name="adjustmentRefund" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[adjustment_positive]'"/>
+        <element name="adjustmentFee" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[adjustment_negative]']"/>
+        <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
+        <element name="appendComments" type="checkbox" selector=".order-totals-actions #notify_customer"/>
+        <element name="emailCopy" type="checkbox" selector=".order-totals-actions #send_email"/>
+        <element name="refundStoreCredit" type="checkbox" selector=".order-totals-actions .field-refund-store-credit input[type='checkbox']"/>
+        <element name="submitRefundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button']" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceAddressInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceAddressInformationSection.xml
new file mode 100644
index 00000000000..f8b0e3dd284
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceAddressInformationSection.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="AdminInvoiceAddressInformationSection">
+        <element name="billingAddress" type="text" selector=".order-billing-address address"/>
+        <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+        <element name="shippingAddressEdit" type="button" selector=".order-shipping-address .actions a"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceDetailsInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceDetailsInformationSection.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceDetailsInformationSection.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceDetailsInformationSection.xml
index b8a7f6bd1ec..d45a0245c00 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceDetailsInformationSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceDetailsInformationSection.xml
@@ -8,7 +8,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="InvoiceDetailsInformationSection">
+    <section name="AdminInvoiceDetailsInformationSection">
         <element name="orderStatus" type="text" selector="#order_status"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceItemsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceItemsSection.xml
new file mode 100644
index 00000000000..da2a7e10ae1
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceItemsSection.xml
@@ -0,0 +1,32 @@
+<?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="AdminInvoiceItemsSection">
+        <element name="itemName" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .product-title" parameterized="true"/>
+        <element name="itemSku" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .product-sku-block" parameterized="true"/>
+        <element name="itemPrice" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-price .price" parameterized="true"/>
+        <element name="itemQty" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-qty .qty-table" parameterized="true"/>
+        <element name="itemQtyToInvoice" type="input" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-qty-invoice .qty-input" parameterized="true"/>
+        <element name="itemSubtotal" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-subtotal .price" parameterized="true"/>
+        <element name="itemTaxAmount" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-tax .price" parameterized="true"/>
+        <element name="itemDiscountAmount" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-discount .price" parameterized="true"/>
+        <element name="itemTotal" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-total .price" parameterized="true"/>
+        <element name="nameColumn" type="text" selector=".order-invoice-tables .product-title"/>
+        <element name="skuColumn" type="text" selector=".order-invoice-tables .product-sku-block"/>
+        <element name="priceColumn" type="text" selector=".order-invoice-tables .col-price .price"/>
+        <element name="qtyColumn" type="text" selector=".order-invoice-tables .col-qty .qty-table"/>
+        <element name="qtyToInvoiceColumn" type="input" selector=".order-invoice-tables .col-qty-invoice .qty-input"/>
+        <element name="subtotalColumn" type="text" selector=".order-invoice-tables .col-subtotal .price"/>
+        <element name="taxAmountColumn" type="text" selector=".order-invoice-tables .col-tax .price"/>
+        <element name="discountAmountColumn" type="text" selector=".order-invoice-tables .col-discount .price"/>
+        <element name="totalColumn" type="text" selector=".order-invoice-tables .col-total .price"/>
+        <element name="updateQty" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceNewSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceMainActionsSection.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceNewSection.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceMainActionsSection.xml
index 6dbcdbe2810..dff6a0d84ca 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceNewSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceMainActionsSection.xml
@@ -8,7 +8,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="InvoiceNewSection">
+    <section name="AdminInvoiceMainActionsSection">
         <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceOrderInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceOrderInformationSection.xml
new file mode 100644
index 00000000000..ad1d3052158
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceOrderInformationSection.xml
@@ -0,0 +1,20 @@
+<?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="AdminInvoiceOrderInformationSection">
+        <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="30"/>
+        <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
+        <element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
+        <element name="purchasedFrom" type="text" selector=".order-information table.order-information-table tr:last-of-type > td"/>
+        <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
+        <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
+        <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicePaymentShippingSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicePaymentShippingSection.xml
new file mode 100644
index 00000000000..d3ca09c1811
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicePaymentShippingSection.xml
@@ -0,0 +1,19 @@
+<?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="AdminInvoicePaymentShippingSection">
+        <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
+        <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
+        <element name="PaymentAdditional" type="text" selector=".order-payment-method .order-payment-additional"/>
+        <element name="ShippingMethod" type="text" selector=".order-shipping-address .shipping-description-title"/>
+        <element name="ShippingPrice" type="text" selector=".order-shipping-address .shipping-description-content .price"/>
+        <element name="CreateShipment" type="checkbox" selector=".order-shipping-address input[name='invoice[do_shipment]']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceTotalSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceTotalSection.xml
new file mode 100644
index 00000000000..49b734320a7
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceTotalSection.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="AdminInvoiceTotalSection">
+        <element name="subtotalRow" type="text" selector=".order-subtotal-table tbody > tr:nth-of-type({{row}}) td span.price" parameterized="true"/>
+        <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
+        <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesFiltersSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesFiltersSection.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesFiltersSection.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesFiltersSection.xml
index 774dbda9bb5..1fad379d231 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesFiltersSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesFiltersSection.xml
@@ -8,7 +8,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="InvoicesFiltersSection">
+    <section name="AdminInvoicesFiltersSection">
         <element name="orderNum" type="input" selector="input[name='order_increment_id']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesGridSection.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesGridSection.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesGridSection.xml
index 6f2bcc36387..3b7bbd6fd14 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesGridSection.xml
@@ -8,7 +8,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="InvoicesGridSection">
+    <section name="AdminInvoicesGridSection">
         <element name="spinner" type="button" selector=".spinner"/>
         <element name="filter" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
         <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderAddressInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderAddressInformationSection.xml
new file mode 100644
index 00000000000..90887c13f52
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderAddressInformationSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminOrderAddressInformationSection">
+        <element name="billingAddress" type="text" selector=".order-billing-address address"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCommentsTabSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCommentsTabSection.xml
new file mode 100644
index 00000000000..18f10f5c8ba
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCommentsTabSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminOrderCommentsTabSection">
+        <element name="orderNotesList" type="text" selector="#Order_History .edit-order-comments .note-list"/>
+        <element name="orderComments" type="text" selector="#Order_History .edit-order-comments-block"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCreditMemosTabSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCreditMemosTabSection.xml
new file mode 100644
index 00000000000..98b34bda914
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCreditMemosTabSection.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="AdminOrderCreditMemosTabSection">
+        <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_creditmemo']"/>
+        <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_creditmemos_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="viewGridRow" type="button" selector="#sales_order_view_tabs_order_creditmemos_content .data-grid tbody > tr:nth-of-type({{row}}) a[href*='order_creditmemo/view']" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInformationSection.xml
new file mode 100644
index 00000000000..2ba11746694
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInformationSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminOrderDetailsInformationSection">
+        <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
+        <element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
+        <element name="purchasedFrom" type="text" selector=".order-information table.order-information-table tr:last-of-type > td"/>
+        <element name="accountInformation" type="text" selector=".order-account-information-table"/>
+        <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
+        <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
+        <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
+        <element name="billingAddress" type="text" selector=".order-billing-address"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address"/>
+        <element name="itemsOrdered" type="text" selector=".edit-order-table"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInvoicesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInvoicesSection.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInvoicesSection.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInvoicesSection.xml
index c7b4a64f96c..5831e07f41e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInvoicesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInvoicesSection.xml
@@ -8,7 +8,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="OrderDetailsInvoicesSection">
+    <section name="AdminOrderDetailsInvoicesSection">
         <element name="spinner" type="button" selector=".spinner"/>
         <element name="content" type="text" selector="#sales_order_view_tabs_order_invoices_content"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMainActionsSection.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMainActionsSection.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMainActionsSection.xml
index 61ed91d3662..4c08980bf7d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMainActionsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMainActionsSection.xml
@@ -8,14 +8,15 @@
 
 <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="OrderDetailsMainActionsSection">
-        <element name="back" type="button" selector="#back"/>
-        <element name="cancel" type="button" selector="#order-view-cancel-button"/>
-        <element name="sendEmail" type="button" selector="#send_notification"/>
-        <element name="hold" type="button" selector="#order-view-hold-button"/>
-        <element name="invoice" type="button" selector="#order_invoice"/>
-        <element name="ship" type="button" selector="#order_ship"/>
-        <element name="reorder" type="button" selector="#order_reorder"/>
-        <element name="edit" type="button" selector="#order_edit"/>
+    <section name="AdminOrderDetailsMainActionsSection">
+        <element name="back" type="button" selector="#back" timeout="30"/>
+        <element name="cancel" type="button" selector="#order-view-cancel-button" timeout="30"/>
+        <element name="sendEmail" type="button" selector="#send_notification" timeout="30"/>
+        <element name="creditMemo" type="button" selector="#order_creditmemo" timeout="30"/>
+        <element name="hold" type="button" selector="#order-view-hold-button" timeout="30"/>
+        <element name="invoice" type="button" selector="#order_invoice" timeout="30"/>
+        <element name="ship" type="button" selector="#order_ship" timeout="30"/>
+        <element name="reorder" type="button" selector="#order_reorder" timeout="30"/>
+        <element name="edit" type="button" selector="#order_edit" timeout="30"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMessagesSection.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMessagesSection.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMessagesSection.xml
index 399a4e43860..0311d5cf75c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMessagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMessagesSection.xml
@@ -8,7 +8,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="OrderDetailsMessagesSection">
+    <section name="AdminOrderDetailsMessagesSection">
         <element name="successMessage" type="text" selector="div.message-success"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsOrderViewSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsOrderViewSection.xml
similarity index 62%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsOrderViewSection.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsOrderViewSection.xml
index e79434e1b08..1a83aa0eb62 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsOrderViewSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsOrderViewSection.xml
@@ -8,8 +8,11 @@
 
 <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="OrderDetailsOrderViewSection">
+    <section name="AdminOrderDetailsOrderViewSection">
         <element name="information" type="button" selector="#sales_order_view_tabs_order_info"/>
         <element name="invoices" type="button" selector="#sales_order_view_tabs_order_invoices"/>
+        <element name="creditMemos" type="button" selector="#sales_order_view_tabs_order_creditmemos"/>
+        <element name="shipments" type="button" selector="#sales_order_view_tabs_order_shipments"/>
+        <element name="commentsHistory" type="button" selector="#sales_order_view_tabs_order_history"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml
new file mode 100644
index 00000000000..df3efc481a4
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.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="AdminOrderFormAccountSection">
+        <element name="group" type="select" selector="#group_id"/>
+        <element name="email" type="input" selector="#email"/>
+        <element name="requiredGroup" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-group-id']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormActionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormActionSection.xml
new file mode 100644
index 00000000000..302e0badb45
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormActionSection.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="AdminOrderFormActionSection">
+        <element name="SubmitOrder" type="button" selector="#submit_order_top_button" timeout="30"/>
+        <element name="Cancel" type="button" selector="#reset_order_top_button" timeout="30"/>
+        <element name="CreateNewCustomer" type="button" selector="#order-customer-selector .actions button.primary" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml
new file mode 100644
index 00000000000..f1000476d50
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml
@@ -0,0 +1,40 @@
+<?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="AdminOrderFormBillingAddressSection">
+        <element name="NamePrefix" type="input" selector="#order-billing_address_prefix" timeout="30"/>
+        <element name="FirstName" type="input" selector="#order-billing_address_firstname" timeout="30"/>
+        <element name="MiddleName" type="input" selector="#order-billing_address_middlename" timeout="30"/>
+        <element name="LastName" type="input" selector="#order-billing_address_lastname" timeout="30"/>
+        <element name="NameSuffix" type="input" selector="#order-billing_address_suffix" timeout="30"/>
+        <element name="Company" type="input" selector="#order-billing_address_company" timeout="30"/>
+        <element name="StreetLine1" type="input" selector="#order-billing_address_street0" timeout="30"/>
+        <element name="StreetLine2" type="input" selector="#order-billing_address_street1" timeout="30"/>
+        <element name="City" type="input" selector="#order-billing_address_city" timeout="30"/>
+        <element name="Country" type="select" selector="#order-billing_address_country_id" timeout="30"/>
+        <element name="State" type="select" selector="#order-billing_address_region_id" timeout="30"/>
+        <element name="Province" type="input" selector="#order-billing_address_region" timeout="30"/>
+        <element name="PostalCode" type="input" selector="#order-billing_address_postcode" timeout="30"/>
+        <element name="Phone" type="input" selector="#order-billing_address_telephone" timeout="30"/>
+        <element name="Fax" type="input" selector="#order-billing_address_fax" timeout="30"/>
+        <element name="VatNumber" type="input" selector="#order-billing_address_vat_id" timeout="30"/>
+        <element name="ValidateVatNumber" type="button" selector="#order-billing_address_vat_id + .actions>button.action-default" timeout="30"/>
+        <element name="SaveAddress" type="checkbox" selector="#order-billing_address_save_in_address_book"/>
+
+        <element name="firstNameError" type="text" selector="#order-billing_address_firstname-error"/>
+        <element name="lastNameError" type="text" selector="#order-billing_address_lastname-error"/>
+        <element name="streetAddressError" type="text" selector="#order-billing_address_street0-error"/>
+        <element name="cityError" type="text" selector="#order-billing_address_city-error"/>
+        <element name="countryError" type="text" selector="#order-billing_address_country_id-error"/>
+        <element name="stateError" type="text" selector="#order-billing_address_region_id-error"/>
+        <element name="postalCodeError" type="text" selector="#order-billing_address_postcode-error"/>
+        <element name="phoneError" type="text" selector="#order-billing_address_telephone-error"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormConfigureProductSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormConfigureProductSection.xml
new file mode 100644
index 00000000000..1d1ff664eb7
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormConfigureProductSection.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="AdminOrderFormConfigureProductSection">
+        <element name="optionSelect" type="select" selector="//div[@class='product-options']/div/div/select[../../label[text() = '{{option}}']]" parameterized="true"/>
+        <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
+        <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormItemsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormItemsSection.xml
new file mode 100644
index 00000000000..c3486e1af5a
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormItemsSection.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormItemsSection">
+        <element name="skuNumber" type="input" selector="#sku_{{row}}" parameterized="true"/>
+        <element name="qty" type="input" selector="#sku_qty_{{row}}" parameterized="true"/>
+        <element name="addAnother" type="button" selector="#sku_container .col-actions > button.add"/>
+        <element name="deleteRow" type="button" selector="#sku_container tr:nth_of_type({{row}}) .col-actions button.action-delete" parameterized="true"/>
+        <element name="addToOrder" type="button" selector="#order-additional_area .admin__page-section-title .actions button.action-add"/>
+        <element name="addProducts" type="button" selector="//section[@id='order-items']/div/div/button/span[text() = 'Add Products']" timeout="30"/>
+        <element name="search" type="button" selector="#sales_order_create_search_grid [data-action='grid-filter-apply']" timeout="30"/>
+        <element name="resetFilter" type="button" selector="#sales_order_create_search_grid [data-action='grid-filter-reset']" timeout="30"/>
+        <element name="idFilter" type="input" selector="#sales_order_create_search_grid_filter_entity_id"/>
+        <element name="nameFilter" type="input" selector="#sales_order_create_search_grid_filter_name"/>
+        <element name="skuFilter" type="input" selector="#sales_order_create_search_grid_filter_sku"/>
+        <element name="priceFromFilter" type="input" selector="#sales_order_create_search_grid_filter_price_from"/>
+        <element name="priceToFilter" type="input" selector="#sales_order_create_search_grid_filter_price_to"/>
+        <element name="selectedFilter" type="select" selector="#sales_order_create_search_grid_filter_in_products"/>
+        <element name="row" type="text" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="rowCheck" type="checkbox" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.col-select [type=checkbox]" parameterized="true"/>
+        <element name="rowQty" type="input" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.col-qty [name='qty']" parameterized="true"/>
+        <element name="addSelected" type="button" selector="#order-search .admin__page-section-title .actions button.action-add" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormPaymentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormPaymentSection.xml
new file mode 100644
index 00000000000..ff0d91a2b0d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormPaymentSection.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="AdminOrderFormPaymentSection">
+        <element name="header" type="text" selector="#order-methods span.title"/>
+        <element name="getShippingMethods" type="text" selector="#order-shipping_method a.action-default" timeout="30"/>
+        <element name="flatRateOption" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
+        <element name="shippingError" type="text" selector="#order[has_shipping]-error"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormShippingAddressSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormShippingAddressSection.xml
new file mode 100644
index 00000000000..c7fc616eac6
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormShippingAddressSection.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="AdminOrderFormShippingAddressSection">
+        <element name="SameAsBilling" type="checkbox" selector="#order-shipping_same_as_billing"/>
+        <element name="NamePrefix" type="input" selector="#order-shipping_address_prefix"/>
+        <element name="FirstName" type="input" selector="#order-shipping_address_firstname"/>
+        <element name="MiddleName" type="input" selector="#order-shipping_address_middlename"/>
+        <element name="LastName" type="input" selector="#order-shipping_address_lastname"/>
+        <element name="NameSuffix" type="input" selector="#order-shipping_address_suffix"/>
+        <element name="Company" type="input" selector="#order-shipping_address_company"/>
+        <element name="StreetLine1" type="input" selector="#order-shipping_address_street0"/>
+        <element name="StreetLine2" type="input" selector="#order-shipping_address_street1"/>
+        <element name="City" type="input" selector="#order-shipping_address_city"/>
+        <element name="Country" type="select" selector="#order-shipping_address_country_id"/>
+        <element name="State" type="select" selector="#order-shipping_address_region_id"/>
+        <element name="Province" type="input" selector="#order-shipping_address_region"/>
+        <element name="PostalCode" type="input" selector="#order-shipping_address_postcode"/>
+        <element name="Phone" type="input" selector="#order-shipping_address_telephone"/>
+        <element name="Fax" type="input" selector="#order-shipping_address_fax"/>
+        <element name="VatNumber" type="input" selector="#order-shipping_address_vat_id"/>
+        <element name="ValidateVatNumber" type="button" selector="#order-shipping_address_vat_id + .actions>button.action-default"/>
+        <element name="SaveAddress" type="checkbox" selector="#order-shipping_address_save_in_address_book"/>
+        
+        <element name="firstNameError" type="text" selector="#order-shipping_address_firstname-error"/>
+        <element name="lastNameError" type="text" selector="#order-shipping_address_lastname-error"/>
+        <element name="streetAddressError" type="text" selector="#order-shipping_address_street0-error"/>
+        <element name="cityError" type="text" selector="#order-shipping_address_city-error"/>
+        <element name="countryError" type="text" selector="#order-shipping_address_country_id-error"/>
+        <element name="stateError" type="text" selector="#order-shipping_address_region_id-error"/>
+        <element name="postalCodeError" type="text" selector="#order-shipping_address_postcode-error"/>
+        <element name="phoneError" type="text" selector="#order-shipping_address_telephone-error"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormTotalSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormTotalSection.xml
new file mode 100644
index 00000000000..d558ecb3dfb
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormTotalSection.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="AdminOrderFormTotalSection">
+        <element name="subtotalRow" type="text" selector="#order-totals>table tr.row-totals:nth-of-type({{row}}) span.price" parameterized="true"/>
+        <element name="total" type="text" selector="//tr[contains(@class,'row-totals')]/td[contains(text(), '{{total}}')]/following-sibling::td/span[contains(@class, 'price')]" parameterized="true"/>
+        <element name="grandTotal" type="text" selector="#order-totals>table tr.row-totals:nth-of-type(3) span.price"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderInvoicesTabSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderInvoicesTabSection.xml
new file mode 100644
index 00000000000..985c070933b
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderInvoicesTabSection.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="AdminOrderInvoicesTabSection">
+        <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_invoice']"/>
+        <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_invoices_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="viewGridRow" type="button" selector="#sales_order_view_tabs_order_invoices_content .data-grid tbody > tr:nth-of-type({{row}}) a[href*='order_invoice/view']" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderItemsOrderedSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderItemsOrderedSection.xml
new file mode 100644
index 00000000000..5f7c9ea73e0
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderItemsOrderedSection.xml
@@ -0,0 +1,36 @@
+<?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="AdminOrderItemsOrderedSection">
+        <element name="itemProductName" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
+        <element name="itemProductSku" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-product .product-sku-block" parameterized="true"/>
+        <element name="itemStatus" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-status" parameterized="true"/>
+        <element name="itemOriginalPrice" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-original-price .price" parameterized="true"/>
+        <element name="itemPrice" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-price .price" parameterized="true"/>
+        <element name="itemQty" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-ordered-qty .qty-table" parameterized="true"/>
+        <element name="itemSubtotal" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-subtotal .price" parameterized="true"/>
+        <element name="itemTaxAmount" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-tax-amount .price" parameterized="true"/>
+        <element name="itemTaxPercent" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-tax-percent" parameterized="true"/>
+        <element name="itemDiscountAmount" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-discont .price" parameterized="true"/>
+        <element name="itemTotal" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-total .price" parameterized="true"/>
+
+        <element name="productNameColumn" type="text" selector=".edit-order-table .col-product .product-title"/>
+        <element name="productSkuColumn" type="text" selector=".edit-order-table .col-product .product-sku-block"/>
+        <element name="statusColumn" type="text" selector=".edit-order-table .col-status"/>
+        <element name="originalPriceColumn" type="text" selector=".edit-order-table .col-original-price .price"/>
+        <element name="priceColumn" type="text" selector=".edit-order-table .col-price .price"/>
+        <element name="qtyColumn" type="text" selector=".edit-order-table .col-ordered-qty .qty-table"/>
+        <element name="subtotalColumn" type="text" selector=".edit-order-table .col-subtotal .price"/>
+        <element name="taxAmountColumn" type="text" selector=".edit-order-table .col-tax-amount .price"/>
+        <element name="taxPercentColumn" type="text" selector=".edit-order-table .col-tax-percent"/>
+        <element name="discountAmountColumn" type="text" selector=".edit-order-table .col-discont .price"/>
+        <element name="totalColumn" type="text" selector=".edit-order-table .col-total .price"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderPaymentInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderPaymentInformationSection.xml
new file mode 100644
index 00000000000..a750f2fa062
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderPaymentInformationSection.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="AdminOrderPaymentInformationSection">
+        <element name="paymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
+        <element name="paymentCurrency" type="text" selector=".order-payment-method .order-payment-currency"/>
+        <element name="paymentAdditional" type="text" selector=".order-payment-method .order-payment-additional"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShipmentsTabSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShipmentsTabSection.xml
new file mode 100644
index 00000000000..9ed9d852b4b
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShipmentsTabSection.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="AdminOrderShipmentsTabSection">
+        <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_shipment']"/>
+        <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_shipments_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="viewGridRow" type="button" selector="#sales_order_view_tabs_order_shipments_content .data-grid tbody > tr:nth-of-type({{row}}) a[href*='order_shipment/view']" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMiniCartSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShippingInformationSection.xml
similarity index 56%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMiniCartSection.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShippingInformationSection.xml
index 9751251b67c..0c1bd475959 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMiniCartSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShippingInformationSection.xml
@@ -8,9 +8,8 @@
 
 <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="StorefrontMiniCartSection">
-        <element name="quantity" type="button" selector="span.counter-number"/>
-        <element name="show" type="button" selector="a.showcart"/>
-        <element name="goToCheckout" type="button" selector="#top-cart-btn-checkout"/>
+    <section name="AdminOrderShippingInformationSection">
+        <element name="shippingMethod" type="text" selector=".order-shipping-method .admin__page-section-item-content"/>
+        <element name="shippingPrice" type="text" selector=".order-shipping-method .admin__page-section-item-content .price"/>
     </section>
-</sections>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderStoreScopeTreeSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderStoreScopeTreeSection.xml
new file mode 100644
index 00000000000..31617e2ff9d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderStoreScopeTreeSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminOrderStoreScopeTreeSection">
+        <element name="storeTree" type="text" selector="div.tree-store-scope"/>
+        <element name="storeOption" type="radio" selector="//div[contains(@class, 'tree-store-scope')]//label[contains(text(), '{{name}}')]/preceding-sibling::input" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrdersGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrdersGridSection.xml
new file mode 100644
index 00000000000..ccf477b1e52
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrdersGridSection.xml
@@ -0,0 +1,32 @@
+<?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="AdminOrdersGridSection">
+        <element name="spinner" type="button" selector=".spinner"/>
+        <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
+        <element name="search" type="input" selector="#fulltext"/>
+        <element name="submitSearch" type="button" selector=".//*[@id='container']/div/div[2]/div[1]/div[2]/button"/>
+        <element name="submitSearch22" type="button" selector=".//*[@class=&quot;admin__data-grid-filters-wrap&quot;]/parent::*/div[@class=&quot;data-grid-search-control-wrap&quot;]/button"/>
+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
+        <element name="idFilter" type="input" selector=".admin__data-grid-filters input[name='increment_id']"/>
+        <element name="billToNameFilter" type="input" selector=".admin__data-grid-filters input[name='billing_name']"/>
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
+        <element name="createNewOrder" type="button" selector=".page-actions-buttons button#add" timeout="30"/>
+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
+        <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
+        <element name="viewBookmarkDropdown" type="button" selector="div.admin__data-grid-action-bookmarks button" timeout="30"/>
+        <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="columnsDropdown" type="button" selector="div.admin__data-grid-action-columns button" timeout="30"/>
+        <element name="viewColumnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml
index c926e4044d7..763f1e20a8d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml
@@ -14,7 +14,7 @@
         <element name="search" type="input" selector="#fulltext"/>
         <element name="submitSearch" type="button" selector=".//*[@id='container']/div/div[2]/div[1]/div[2]/button"/>
         <element name="submitSearch22" type="button" selector=".//*[@class=&quot;admin__data-grid-filters-wrap&quot;]/parent::*/div[@class=&quot;data-grid-search-control-wrap&quot;]/button"/>
-        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
+        <element name="firstRow" type="button" selector="//*[@id='container']//tr[@class='data-row']//a[@class='action-menu-item']"/>
         <element name="createNewOrder" type="button" selector="button[title='Create New Order'"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceTest.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceCest.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceTest.xml
index fca63184291..2e7af33aa25 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceTest.xml
@@ -14,7 +14,7 @@
             <stories value="Create an Invoice via the Admin"/>
             <title value="Create Invoice"/>
             <description value="Should be able to create an invoice via the admin."/>
-            <severity value="NORMAL"/>
+            <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-72096"/>
             <group value="sales"/>
         </annotations>
@@ -36,8 +36,8 @@
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
         <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
-        <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickCart"/>
-        <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
         <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
         <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
@@ -59,27 +59,28 @@
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
-        <amOnPage url="{{OrdersPage.url}}" stepKey="onOrdersPage"/>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
-        <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
-        <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
+        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
+        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
 
-        <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-        <click selector="{{OrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
-        <click selector="{{InvoiceNewSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <see selector="{{OrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
-        <click selector="{{OrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
+        <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
-        <see selector="{{OrderDetailsInvoicesSection.content}}" userInput="{$grabOrderNumber}" stepKey="seeInvoice1"/>
-        <see selector="{{OrderDetailsInvoicesSection.content}}" userInput="John Doe" stepKey="seeInvoice2"/>
-        <click selector="{{OrderDetailsOrderViewSection.information}}" stepKey="clickInformation"/>
-        <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
-        <amOnPage url="{{InvoicesPage.url}}" stepKey="goToInvoices"/>
+        <see selector="{{AdminOrderDetailsInvoicesSection.content}}" userInput="{$grabOrderNumber}" stepKey="seeInvoice1"/>
+        <see selector="{{AdminOrderDetailsInvoicesSection.content}}" userInput="John Doe" stepKey="seeInvoice2"/>
+        <click selector="{{AdminOrderDetailsOrderViewSection.information}}" stepKey="clickInformation"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForOrderInformationTabLoadingMask"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
+        <amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask6" />
-        <click selector="{{InvoicesGridSection.filter}}" stepKey="clickFilters"/>
-        <fillField selector="{{InvoicesFiltersSection.orderNum}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum2"/>
-        <click selector="{{InvoicesGridSection.firstRow}}" stepKey="clickInvoice2"/>
-        <see selector="{{InvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus2"/>
+        <click selector="{{AdminInvoicesGridSection.filter}}" stepKey="clickFilters"/>
+        <fillField selector="{{AdminInvoicesFiltersSection.orderNum}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum2"/>
+        <click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="clickInvoice2"/>
+        <see selector="{{AdminInvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus2"/>
     </test>
 </tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/EndToEndB2CAdminTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/EndToEndB2CAdminTest.xml
new file mode 100644
index 00000000000..4aa8e12ece8
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/EndToEndB2CAdminTest.xml
@@ -0,0 +1,281 @@
+<?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="EndToEndB2CAdminTest">
+        <before>
+            <!--Create order via API-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProductApi">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="GuestCart" stepKey="createGuestCart"/>
+            <createData entity="SimpleCartItem" stepKey="addCartItem">
+                <requiredEntity createDataKey="createGuestCart"/>
+                <requiredEntity createDataKey="createSimpleProductApi"/>
+            </createData>
+            <createData entity="GuestAddressInformation" stepKey="addGuestOrderAddress">
+                <requiredEntity createDataKey="createGuestCart"/>
+            </createData>
+            <updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation">
+                <requiredEntity createDataKey="createGuestCart"/>
+            </updateData>
+            <!--END Create order via API-->
+        </before>
+
+        <!--Prerequisites-->
+        <!--Create store view to ensure multiple store views-->
+        <comment userInput="Create prerequisite store view" stepKey="createStoreViewComment" before="createStoreView"/>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" before="navigateToNewOrderPage"/>
+
+        <!--Admin creates order-->
+        <comment userInput="Admin creates order" stepKey="adminCreateOrderComment" before="navigateToNewOrderPage"/>
+        <actionGroup ref="navigateToNewOrderPageNewCustomer" stepKey="navigateToNewOrderPage" after="deleteCategory"/>
+
+        <actionGroup ref="checkRequiredFieldsNewOrderForm" stepKey="checkRequiredFieldsNewOrder" after="navigateToNewOrderPage"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="checkRequiredFieldsNewOrder"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder" after="scrollToTopOfOrderFormPage">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="addConfigurableProductToOrder" stepKey="addConfigurableProductToOrder" after="addSimpleProductToOrder">
+            <argument name="product" value="BaseConfigurableProduct"/>
+            <argument name="attribute" value="colorProductAttribute"/>
+            <argument name="option" value="colorProductAttribute1"/>
+        </actionGroup>
+
+        <!--Fill customer group information-->
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectGroup" after="addConfigurableProductToOrder"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillEmail" after="selectGroup"/>
+
+        <!--Fill customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillEmail">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
+
+        <!--Verify totals on Order page-->
+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleConfigurableProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleConfigurableProduct.shipping}}" stepKey="seeOrderShipping" after="seeOrderSubTotal"/>
+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleConfigurableProduct.grandTotal}}" stepKey="seeCorrectGrandTotal" after="seeOrderShipping"/>
+
+        <!--Submit Order and verify information-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="seeCorrectGrandTotal"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
+
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderPendingStatus" after="seeSuccessMessage"/>
+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId" after="seeOrderPendingStatus"/>
+        <assertNotEmpty actual="$getOrderId" stepKey="assertOrderIdIsNotEmpty" after="getOrderId"/>
+        <actionGroup ref="verifyBasicOrderInformation" stepKey="verifyOrderInformation" after="assertOrderIdIsNotEmpty">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInItemsOrdered" stepKey="seeSimpleProductInItemsOrdered" after="verifyOrderInformation">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInItemsOrdered" stepKey="seeConfigurableProductInItemsOrdered" after="seeSimpleProductInItemsOrdered">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+
+        <!--Create order invoice-->
+        <comment userInput="Admin creates invoice for order" stepKey="adminCreateInvoiceComment" before="closeAdminNotificationInvoice"/>
+        <closeAdminNotification stepKey="closeAdminNotificationInvoice" after="seeConfigurableProductInItemsOrdered"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction" after="closeAdminNotificationInvoice"/>
+        <seeInCurrentUrl url="{{AdminInvoiceNewPage}}" stepKey="seeOrderInvoiceUrl" after="clickInvoiceAction"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage" after="seeOrderInvoiceUrl"/>
+
+        <!--Check Invoice Data-->
+        <see selector="{{AdminInvoiceOrderInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderPendingInvoice" after="seePageNameNewInvoicePage"/>
+        <actionGroup ref="verifyBasicInvoiceInformation" stepKey="verifyOrderInvoiceInformation" after="seeOrderPendingInvoice">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <see selector="{{AdminInvoicePaymentShippingSection.ShippingMethod}}" userInput="{{DefaultFlatRateMethod.title}}" stepKey="seeShippingMethod" after="verifyOrderInvoiceInformation"/>
+        <see selector="{{AdminInvoicePaymentShippingSection.ShippingPrice}}" userInput="${{AdminOrderSimpleConfigurableProduct.shipping}}" stepKey="seeShippingCost" after="seeShippingMethod"/>
+        <!--Submit Invoice-->
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice" after="seeShippingCost"/>
+        <!--Invoice created successfully-->
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage}}" stepKey="seeViewOrderPageInvoice" after="clickSubmitInvoice"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess" after="seeViewOrderPageInvoice"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="$getOrderId" stepKey="seePageNameMatchesOrderIdAfterInvoice" after="seeInvoiceCreateSuccess"/>
+
+        <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickOrderInvoicesTab" after="seePageNameMatchesOrderIdAfterInvoice"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask" after="clickOrderInvoicesTab"/>
+        <see selector="{{AdminOrderInvoicesTabSection.gridRow('1')}}" userInput="{{Simple_US_Customer.firstname}}" stepKey="seeOrderInvoiceInTabGrid" after="waitForInvoiceGridLoadingMask"/>
+        <click selector="{{AdminOrderInvoicesTabSection.viewGridRow('1')}}" stepKey="clickToViewInvoiceRow" after="seeOrderInvoiceInTabGrid"/>
+        <see selector="{{AdminInvoiceOrderInformationSection.orderId}}" userInput="$getOrderId" stepKey="seeOrderIdOnInvoice" after="clickToViewInvoiceRow"/>
+        <actionGroup ref="verifyBasicInvoiceInformation" stepKey="verifyBasicInvoiceInformation" after="seeOrderIdOnInvoice">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInInvoiceItems" stepKey="seeSimpleProductInInvoice" after="verifyBasicInvoiceInformation">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInInvoiceItems" stepKey="seeConfigurableProductInInvoice" after="seeSimpleProductInInvoice">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <click selector="{{AdminInvoiceOrderInformationSection.orderId}}" stepKey="clickOrderIdLinkOnInvoice" after="seeConfigurableProductInInvoice"/>
+
+        <!--Create Credit Memo-->
+        <comment userInput="Admin creates credit memo" stepKey="createCreditMemoComment" after="clickOrderIdOnShipment"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreateCreditMemo" after="createCreditMemoComment"/>
+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage}}" stepKey="seeNewCreditMemoPage" after="clickCreateCreditMemo"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoInPageTitle" after="seeNewCreditMemoPage"/>
+        <!--Check Credit Memo Order Data-->
+        <actionGroup ref="verifyBasicCreditMemoInformation" stepKey="verifyOrderCreditMemoInformation" after="seeNewMemoInPageTitle">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <!--Submit credit memo-->
+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline" after="verifyOrderCreditMemoInformation"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the credit memo." stepKey="seeCreditMemoSuccess" after="clickRefundOffline"/>
+        <click selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" stepKey="clickOrderCreditMemosTab" after="seeCreditMemoSuccess"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCreditMemoTabLoadingMask" after="clickOrderCreditMemosTab"/>
+        <see selector="{{AdminOrderCreditMemosTabSection.gridRow('1')}}" userInput="{{Simple_US_Customer.firstname}}" stepKey="seeOrderCreditMemoInTabGrid" after="waitForCreditMemoTabLoadingMask"/>
+        <click selector="{{AdminOrderCreditMemosTabSection.viewGridRow('1')}}" stepKey="clickToViewCreditMemoRow" after="seeOrderCreditMemoInTabGrid"/>
+        <waitForPageLoad stepKey="waitForCreditMemoPageLoad" after="clickToViewCreditMemoRow"/>
+        <see selector="{{AdminCreditMemoOrderInformationSection.orderId}}" userInput="$getOrderId" stepKey="seeOrderIdOnCreditMemo" after="waitForCreditMemoPageLoad"/>
+        <actionGroup ref="verifyBasicCreditMemoInformation" stepKey="verifyBasicCreditMemoInformation" after="seeOrderIdOnCreditMemo">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInItemsRefunded" stepKey="seeSimpleProductInItemsRefunded" after="verifyBasicCreditMemoInformation">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInItemsRefunded" stepKey="seeConfigurableProductInItemsRefunded" after="seeSimpleProductInItemsRefunded">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfCreditMemo" after="seeConfigurableProductInItemsRefunded"/>
+        <click selector="{{AdminCreditMemoOrderInformationSection.orderId}}" stepKey="clickOrderIdLinkOnCreditMemo" after="scrollToTopOfCreditMemo"/>
+
+        <!--Admin uses order grid-->
+        <comment userInput="Admin uses order grid" stepKey="adminUseOrderGridComment" before="navigateToOrderGridPage"/>
+        <amOnPage url="{{AdminOrdersPage}}" stepKey="navigateToOrderGridPage" after="clickOrderIdLinkOnCreditMemo"/>
+        <waitForPageLoad time="60" stepKey="waitForLoadUseOrderGrid" after="navigateToOrderGridPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForOrderGridPageLoad" after="waitForLoadUseOrderGrid"/>
+
+        <!--Search order grid by name-->
+        <comment userInput="Admin searches order grid by name" stepKey="searchOrderGridComment" after="waitForOrderGridPageLoad"/>
+        <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="setOrderGridToDefaultViewForSearch" after="searchOrderGridComment"/>
+        <!--@TODO use "Ship-to Name" when MQE-794 is fixed-->
+        <see selector="{{AdminDataGridTableSection.column('Ship')}}" userInput="{{Simple_US_Customer.fullname}}" stepKey="seeNonFilterNameInShipNameColumn" after="setOrderGridToDefaultViewForSearch"/>
+        <actionGroup ref="searchAdminDataGridByKeyword" stepKey="searchOrderGridByNameKeyword" after="seeNonFilterNameInShipNameColumn">
+            <argument name="keyword" value="BillingAddressTX.fullname"/>
+        </actionGroup>
+        <dontSee selector="{{AdminDataGridTableSection.column('Ship')}}" userInput="{{Simple_US_Customer.fullname}}" stepKey="dontSeeNonFilterNameInShipNameColumn" after="searchOrderGridByNameKeyword"/>
+        <see selector="{{AdminDataGridTableSection.column('Ship')}}" userInput="{{BillingAddressTX.fullname}}" stepKey="seeFilterNameInShipNameColumn" after="dontSeeNonFilterNameInShipNameColumn"/>
+
+        <!--Filter order grid-->
+        <comment userInput="Admin filters order grid by 'Bill-to Name'" stepKey="filterOrderGridByNameComment" after="seeFilterNameInShipNameColumn"/>
+        <!--Filter order grid by "Bill-to Name"-->
+        <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetOrderGridForNameFilter" after="filterOrderGridByNameComment"/>
+        <!--@TODO use "Bill-to Name" when MQE-794 is fixed-->
+        <see selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{BillingAddressTX.fullname}}" stepKey="seeNonFilterNameInColumn" after="resetOrderGridForNameFilter"/>
+        <actionGroup ref="filterOrderGridByBillingName" stepKey="filterOrderGridByBillingName" after="seeNonFilterNameInColumn">
+            <argument name="customer" value="Simple_US_Customer"/>
+        </actionGroup>
+        <dontSee selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{BillingAddressTX.fullname}}" stepKey="dontSeeNonFilterNameInColumn" after="filterOrderGridByBillingName"/>
+        <see selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{Simple_US_Customer.fullname}}" stepKey="seeFilterNameInColumn" after="dontSeeNonFilterNameInColumn"/>
+        <!--Filter order grid by Grand Total (Base)-->
+        <comment userInput="Admin filters order grid by 'Grand Total'" stepKey="filterOrderGridByTotalComment" after="seeFilterNameInColumn"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilterBeforeTotalFilter" after="filterOrderGridByTotalComment"/>
+        <see selector="{{AdminDataGridTableSection.column('Grand Total')}}" userInput="{{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeLowerTotalInGrid" after="clearFilterBeforeTotalFilter"/>
+        <actionGroup ref="filterOrderGridByBaseTotalRange" stepKey="filterOrderGridByTotal" after="seeLowerTotalInGrid">
+            <argument name="from" value="OrderGrandTotalFilterRange.from"/>
+            <argument name="to" value="OrderGrandTotalFilterRange.to"/>
+        </actionGroup>
+        <dontSee selector="{{AdminDataGridTableSection.column('Grand Total')}}" userInput="{{AdminOrderSimpleProduct.grandTotal}}" stepKey="dontSeeLowerTotalInGrid" after="filterOrderGridByTotal"/>
+        <see selector="{{AdminDataGridTableSection.column('Grand Total')}}" userInput="{{AdminOrderSimpleConfigurableProduct.grandTotal}}" stepKey="seeExpectedTotalInGrid" after="dontSeeLowerTotalInGrid"/>
+        <!--Filter order grid by purchase date-->
+        <comment userInput="Admin filters order grid by 'Purchase Date'" stepKey="filterOrderGridByDateComment" after="seeExpectedTotalInGrid"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilterBeforeOrderDateFilter" after="filterOrderGridByDateComment"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderFilterForOrderDateFrom" after="clearFilterBeforeOrderDateFilter"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('created_at[from]')}}" userInput="01/01/2018" stepKey="fillOrderDateFromFilter" after="openOrderFilterForOrderDateFrom"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="applyFilterOrderDateFrom" after="fillOrderDateFromFilter"/>
+        <!--Both of our orders should be in grid-->
+        <see selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{Simple_US_Customer.fullname}}" stepKey="seeFirstOrderInGrid" after="applyFilterOrderDateFrom"/>
+        <see selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{BillingAddressTX.fullname}}" stepKey="seeSecondOrderInGrid" after="seeFirstOrderInGrid"/>
+        <!--Add end date to date range filter (past date)-->
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openOrderFilterForOrderDateTo" after="seeSecondOrderInGrid"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('created_at[to]')}}" userInput="01/10/2018" stepKey="fillOrderDateToFilter" after="openOrderFilterForOrderDateTo"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="applyFilterOrderDateTo" after="fillOrderDateToFilter"/>
+        <!--Dont see our orders in the grid-->
+        <dontSee selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{Simple_US_Customer.fullname}}" stepKey="dontSeeFirstOrderInGrid" after="applyFilterOrderDateTo"/>
+        <dontSee selector="{{AdminDataGridTableSection.column('Bill')}}" userInput="{{BillingAddressTX.fullname}}" stepKey="dontSeeSecondOrderInGrid" after="dontSeeFirstOrderInGrid"/>
+        <!--Filter order grid by status-->
+        <comment userInput="Admin filters order grid by 'Status'" stepKey="filterOrderGridByStatusComment" after="dontSeeSecondOrderInGrid"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilterBeforeStatusFilter" after="filterOrderGridByStatusComment"/>
+        <actionGroup ref="filterOrderGridByStatus" stepKey="filterOrderGridByPendingStatus" after="clearFilterBeforeStatusFilter">
+            <argument name="status" value="OrderStatus.pending"/>
+        </actionGroup>
+        <dontSee selector="{{AdminDataGridTableSection.column('Status')}}" userInput="{{OrderStatus.closed}}" stepKey="dontSeeClosedStatusInOrderGrid" after="filterOrderGridByPendingStatus"/>
+        <see selector="{{AdminDataGridTableSection.column('Status')}}" userInput="{{OrderStatus.pending}}" stepKey="seePendingStatusInOrderGrid" after="dontSeeClosedStatusInOrderGrid"/>
+        <actionGroup ref="filterOrderGridByStatus" stepKey="filterOrderGridByClosedStatus" after="seePendingStatusInOrderGrid">
+            <argument name="status" value="OrderStatus.closed"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.column('Status')}}" userInput="{{OrderStatus.closed}}" stepKey="seeClosedStatusInOrderGrid" after="filterOrderGridByClosedStatus"/>
+        <dontSee selector="{{AdminDataGridTableSection.column('Status')}}" userInput="{{OrderStatus.pending}}" stepKey="dontSeePendingStatusInOrderGrid" after="seeClosedStatusInOrderGrid"/>
+
+        <!--Sort order grid-->
+        <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetOrderGridForSorting" after="dontSeePendingStatusInOrderGrid"/>
+        <!--Sort order grid by status-->
+        <comment userInput="Admin sorts order grid by status" stepKey="sortOrderGridByStatusComment" after="resetOrderGridForSorting"/>
+        <click selector="{{AdminDataGridTableSection.columnHeader('Status')}}" stepKey="clickStatusToSortAsc" after="sortOrderGridByStatusComment"/>
+        <grabTextFrom selector="{{AdminDataGridTableSection.gridCell('1', 'Status')}}" stepKey="getOrderStatusFirstRow" after="clickStatusToSortAsc"/>
+        <grabTextFrom selector="{{AdminDataGridTableSection.gridCell('2', 'Status')}}" stepKey="getOrderStatusSecondRow" after="getOrderStatusFirstRow"/>
+        <assertGreaterThanOrEqual expected="$getOrderStatusFirstRow" actual="$getOrderStatusSecondRow" stepKey="checkStatusSortOrderAsc" after="getOrderStatusSecondRow"/>
+        <!--@TODO improve sort assertion and check price and date column when MQE-690 is resolved-->
+
+        <!--Use paging on order grid-->
+        <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetAdminGridBeforePaging" after="checkStatusSortOrderAsc"/>
+        <comment userInput="Admin uses paging on order grid" stepKey="usePagingOrderGridComment" after="resetAdminGridBeforePaging"/>
+        <actionGroup ref="adminDataGridSelectCustomPerPage" stepKey="select1OrderPerPage" after="usePagingOrderGridComment">
+            <!--@TODO Change this to scalar when MQE-498 is implemented-->
+            <argument name="perPage" value="Const.one"/>
+        </actionGroup>
+        <seeNumberOfElements selector="{{AdminDataGridTableSection.rows}}" userInput="1" stepKey="see1RowOnFirstPage" after="select1OrderPerPage"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="1" stepKey="seeOnFirstPageOrderGrid" after="see1RowOnFirstPage"/>
+        <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPageOrderGrid" after="seeOnFirstPageOrderGrid"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondPageOrderGrid" after="clickNextPageOrderGrid"/>
+        <seeNumberOfElements selector="{{AdminDataGridTableSection.rows}}" userInput="1" stepKey="see1RowOnSecondPage" after="seeOnSecondPageOrderGrid"/>
+        <actionGroup ref="adminDataGridSelectPerPage" stepKey="select50OrdersPerPage" after="see1RowOnSecondPage">
+            <!--@TODO Change this to scalar when MQE-498 is implemented-->
+            <argument name="perPage" value="Const.fifty"/>
+        </actionGroup>
+        <seeNumberOfElements selector="{{AdminDataGridTableSection.rows}}" parameterArray="[2,50]" stepKey="seeCorrectNumberOfRowsPerPage" after="select50OrdersPerPage"/>
+
+        <!--Add column to order grid-->
+        <!--@TODO Change to action group when MQE-498 is implemented-->
+        <comment userInput="Admin adds column to order grid" stepKey="adminAddsColumnOrderGrid" after="seeCorrectNumberOfRowsPerPage"/>
+        <dontSeeElement selector="{{AdminDataGridTableSection.columnHeader('Customer Email')}}" stepKey="dontSeeCustomerEmailColumnInGrid" after="adminAddsColumnOrderGrid"/>
+        <click selector="{{AdminDataGridHeaderSection.columnsToggle}}" stepKey="openOrderGridColumnOptions" after="dontSeeCustomerEmailColumnInGrid"/>
+        <checkOption selector="{{AdminDataGridHeaderSection.columnCheckbox('Customer Email')}}" stepKey="addCustomerEmailColumnToOrderGrid" after="openOrderGridColumnOptions"/>
+        <click selector="{{AdminDataGridHeaderSection.columnsToggle}}" stepKey="closeOrderGridColumnOptions" after="addCustomerEmailColumnToOrderGrid"/>
+        <seeElement selector="{{AdminDataGridTableSection.columnHeader('Customer Email')}}" stepKey="seeCustomerEmailColumnInGrid" after="closeOrderGridColumnOptions"/>
+        <!--Remove column from order grid-->
+        <!--@TODO Change to action group when MQE-498 is implemented-->
+        <comment userInput="Admin removes column from order grid" stepKey="adminRemovesColumnOrderGrid" after="seeCustomerEmailColumnInGrid"/>
+        <seeElement selector="{{AdminDataGridTableSection.columnHeader('Purchase Point')}}" stepKey="seePurchasePointColumnInGrid" after="adminRemovesColumnOrderGrid"/>
+        <click selector="{{AdminDataGridHeaderSection.columnsToggle}}" stepKey="openOrderGridColumnOptionsPurchasePoint" after="seePurchasePointColumnInGrid"/>
+        <uncheckOption selector="{{AdminDataGridHeaderSection.columnCheckbox('Purchase Point')}}" stepKey="removePurchasePointColumnFromGrid" after="openOrderGridColumnOptionsPurchasePoint"/>
+        <click selector="{{AdminDataGridHeaderSection.columnsToggle}}" stepKey="closeOrderGridColumnOptionsPurchasePoint" after="removePurchasePointColumnFromGrid"/>
+        <dontSeeElement selector="{{AdminDataGridTableSection.columnHeader('Purchase Point')}}" stepKey="dontSeePurchasePointColumnInGrid" after="closeOrderGridColumnOptionsPurchasePoint"/>
+        <!--END admin uses order grid-->
+
+        <!--Delete store view created as prerequisites-->
+        <comment userInput="Clean up store view" stepKey="cleanUpStoreView" before="deleteStoreView"/>
+        <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json
index 9c1805b3df1..cd4c0fde668 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json
@@ -12,12 +12,15 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "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-ui": "100.0.0-dev",
+        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
+        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
         "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "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-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
         "magento/magento2-functional-test-module-config": "100.0.0-dev",
@@ -26,8 +29,6 @@
         "magento/magento2-functional-test-module-eav": "100.0.0-dev",
         "magento/magento2-functional-test-module-gift-message": "100.0.0-dev",
         "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
         "magento/magento2-functional-test-module-reports": "100.0.0-dev",
         "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
         "magento/magento2-functional-test-module-sales-sequence": "100.0.0-dev",
@@ -35,7 +36,6 @@
         "magento/magento2-functional-test-module-store": "100.0.0-dev",
         "magento/magento2-functional-test-module-tax": "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-widget": "100.0.0-dev",
         "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
     },
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml
new file mode 100644
index 00000000000..65b40abb72f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml
@@ -0,0 +1,41 @@
+<?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">
+    <!-- Apply Sales Rule Coupon to the cart -->
+    <actionGroup name="StorefrontApplyCouponActionGroup">
+        <arguments>
+            <argument name="coupon"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" time="30" stepKey="waitForCouponHeader" />
+        <conditionalClick selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" dependentSelector="{{StorefrontSalesRuleCartCouponSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader" />
+        <waitForElementVisible selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="waitForCouponField" />
+        <fillField userInput="{{coupon.code}}" selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="fillCouponField"/>
+        <click selector="{{StorefrontSalesRuleCartCouponSection.applyButton}}" stepKey="clickApplyButton"/>
+    </actionGroup>
+
+    <!-- Cancel Sales Rule Coupon applied to the cart -->
+    <actionGroup name="StorefrontCancelCouponActionGroup">
+        <waitForElement selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" time="30" stepKey="waitForCouponHeader" />
+        <conditionalClick selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" dependentSelector="{{StorefrontSalesRuleCartCouponSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader" />
+        <waitForElementVisible selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="waitForCouponField" />
+        <click selector="{{StorefrontSalesRuleCartCouponSection.cancelButton}}" stepKey="clickCancelButton"/>
+    </actionGroup>
+
+    <!-- Check applied discount in cart summary -->
+    <actionGroup name="StorefrontCheckCouponAppliedActionGroup">
+        <arguments>
+            <argument name="rule"/>
+            <argument name="discount"/>
+        </arguments>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountTotal}}" stepKey="waitForDiscountTotal" />
+        <see userInput="{{rule.store_labels[1][store_label]}}" selector="{{CheckoutCartSummarySection.discountLabel}}" stepKey="assertDiscountLabel" />
+        <see userInput="-${{discount}}" selector="{{CheckoutCartSummarySection.discountTotal}}" stepKey="assertDiscountTotal" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/QuoteData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/QuoteData.xml
new file mode 100644
index 00000000000..389cda03235
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/QuoteData.xml
@@ -0,0 +1,19 @@
+<?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">
+    <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
+    <entity name="E2EB2CQuoteWith10PercentDiscount" type="Quote">
+        <data key="subtotal">480.00</data>
+        <data key="shipping">15.00</data>
+        <data key="discount">48.00</data>
+        <data key="total">447.00</data>
+        <data key="shippingMethod">Flat Rate - Fixed</data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesCouponData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesCouponData.xml
new file mode 100644
index 00000000000..c216bb10242
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesCouponData.xml
@@ -0,0 +1,18 @@
+<?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="ApiSalesRuleCoupon" type="SalesRuleCoupon">
+        <data key="code" unique="suffix">salesCoupon</data>
+        <data key="times_used">0</data>
+        <data key="is_primary">1</data>
+        <data key="type">0</data>
+        <var key="rule_id" entityType="SalesRule" entityKey="rule_id"/>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml
index f26ce7dea1e..d89d3f44776 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml
@@ -5,8 +5,40 @@
   * 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">
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ApiSalesRule" type="SalesRule">
+        <data key="name" unique="suffix">salesRule</data>
+        <data key="description">Sales Rule Descritpion</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>0</item>
+            <item>1</item>
+            <item>3</item>
+        </array>
+        <data key="uses_per_customer">2</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">true</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">2</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">10</data>
+        <data key="discount_qty">2</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">1</data>
+        <data key="is_rss">true</data>
+        <data key="coupon_type">SPECIFIC_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">0</data>
+        <data key="simple_free_shipping">0</data>
+        <requiredEntity type="SalesRuleLabel">SalesRuleLabelDefault</requiredEntity>
+        <requiredEntity type="SalesRuleLabel">SalesRuleLabelStore1</requiredEntity>
+    </entity>
+
     <entity name="SimpleSalesRule" type="SalesRule">
         <data key="name" unique="suffix">SimpleSalesRule</data>
         <data key="is_active">true</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleLabelData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleLabelData.xml
new file mode 100644
index 00000000000..6798b34a755
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleLabelData.xml
@@ -0,0 +1,19 @@
+<?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="SalesRuleLabelDefault" type="SalesRuleLabel">
+        <data key="store_id">0</data>
+        <data key="store_label" unique="suffix">Sales Rule (Default) </data>
+    </entity>
+    <entity name="SalesRuleLabelStore1" type="SalesRuleLabel">
+        <data key="store_id">1</data>
+        <data key="store_label" unique="suffix">Sales Rule (Store 1) </data>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-condition-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-condition-meta.xml
new file mode 100644
index 00000000000..82b3e3de28f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-condition-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateSalesRuleCondition" dataType="SalesRuleCondition" type="create">
+        <field key="condition_type" required="true">string</field>
+        <array key="conditions" required="true">
+            <value>SalesRuleCondition</value>
+        </array>
+        <field key="aggregator_type" required="true">string</field>
+        <field key="operator" required="true">string</field>
+        <field key="attribute_name" required="true">string</field>
+        <field key="value" required="true">mixed</field>
+        <field key="extension_attributes">empty_extension_attribute</field>
+    </operation>
+
+    <operation name="UpdateSalesRuleCondition" dataType="SalesRuleCondition" type="update">
+        <field key="condition_type">string</field>
+        <array key="conditions">
+            <value>SalesRuleCondition</value>
+        </array>
+        <field key="aggregator_type">string</field>
+        <field key="operator">string</field>
+        <field key="attribute_name">string</field>
+        <field key="value">mixed</field>
+        <field key="extension_attributes">empty_extension_attribute</field>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-coupon-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-coupon-meta.xml
new file mode 100644
index 00000000000..6b5e4a1a6ca
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-coupon-meta.xml
@@ -0,0 +1,47 @@
+<?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="CreateSalesRuleCoupon" dataType="SalesRuleCoupon" type="create" auth="adminOauth" url="/V1/coupons" method="POST">
+        <contentType>application/json</contentType>
+        <object key="coupon" dataType="SalesRuleCoupon">
+            <field key="coupon_id">integer</field>
+            <field key="rule_id" required="true">integer</field>
+            <field key="code" required="true">string</field>
+            <field key="usage_limit">integer</field>
+            <field key="usage_per_customer">integer</field>
+            <field key="times_used" required="true">integer</field>
+            <field key="expiration_date">string</field>
+            <field key="is_primary">boolean</field>
+            <field key="created_at">string</field>
+            <field key="type">integer</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+
+    <operation name="UpdateSalesRuleCoupon" dataType="SalesRuleCoupon" type="update" auth="adminOauth" url="/V1/coupons" method="PUT">
+        <contentType>application/json</contentType>
+        <object key="coupon" dataType="SalesRuleCoupon">
+            <field key="coupon_id" required="true">integer</field>
+            <field key="rule_id" required="true">integer</field>
+            <field key="code" required="true">string</field>
+            <field key="usage_limit">integer</field>
+            <field key="usage_per_customer">integer</field>
+            <field key="times_used" required="true">integer</field>
+            <field key="expiration_date">string</field>
+            <field key="is_primary">boolean</field>
+            <field key="created_at">string</field>
+            <field key="type">integer</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+        </object>
+    </operation>
+
+    <operation name="DeleteSalesRuleCoupon" dataType="SalesRuleCoupon" type="delete" auth="adminOauth" url="/V1/coupons/{coupon_id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-label-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-label-meta.xml
new file mode 100644
index 00000000000..17429d38a32
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-label-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="CreateSalesRuleLabel" dataType="SalesRuleLabel" type="create">
+        <field key="store_id" required="true">integer</field>
+        <field key="store_label" required="true">string</field>
+        <field key="extension_attributes">empty_extension_attribute</field>
+    </operation>
+
+    <operation name="UpdateSalesRuleLabel" dataType="SalesRuleLabel" type="update">
+        <field key="store_id">integer</field>
+        <field key="store_label">string</field>
+        <field key="extension_attributes">empty_extension_attribute</field>
+    </operation>
+</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-meta.xml
index 63795e3e6b2..f71431ff97d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-meta.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-meta.xml
@@ -10,68 +10,85 @@
     <operation name="CreateSalesRule" dataType="SalesRule" type="create" auth="adminOauth" url="/V1/salesRules" method="POST">
         <contentType>application/json</contentType>
         <object key="rule" dataType="SalesRule">
+            <field key="rule_id">integer</field>
             <field key="name" required="true">string</field>
-            <field key="description">string</field>
-            <field key="is_active">boolean</field>
+            <array key="store_labels">
+                <value>SalesRuleLabel</value>
+            </array>
             <field key="from_date">string</field>
             <field key="to_date">string</field>
-            <field key="uses_per_customer">integer</field>
-            <field key="sort_order">integer</field>
-            <field key="simple_action">string</field>
-            <field key="discount_amount">integer</field>
-            <field key="discount_qty">integer</field>
-            <field key="discount_step">integer</field>
-            <field key="times_used">integer</field>
-            <field key="uses_per_coupon">integer</field>
-            <field key="apply_to_shipping">boolean</field>
-            <field key="is_rss">boolean</field>
-            <field key="use_auto_generation">boolean</field>
-            <field key="coupon_type">string</field>
-            <field key="simple_free_shipping">string</field>
-            <field key="stop_rules_processing">boolean</field>
-            <field key="is_advanced">boolean</field>
+            <field key="uses_per_customer" required="true">integer</field>
+            <field key="is_active" required="true">boolean</field>
+            <field key="condition">SalesRuleCondition</field>
+            <field key="action_condition">SalesRuleCondition</field>
+            <field key="stop_rules_processing" required="true">boolean</field>
+            <array key="product_ids">
+                <value>integer</value>
+            </array>
+            <field key="sort_order" required="true">integer</field>
+            <field key="simple_action" required="true">string</field>
+            <field key="discount_amount" required="true">number</field>
+            <field key="discount_qty" required="true">number</field>
+            <field key="discount_step" required="true">integer</field>
+            <field key="apply_to_shipping" required="true">boolean</field>
+            <field key="times_used" required="true">integer</field>
+            <field key="is_rss" required="true">boolean</field>
+            <field key="coupon_type" required="true">string</field>
+            <field key="use_auto_generation" required="true">boolean</field>
+            <field key="uses_per_coupon" required="true">integer</field>
+            <field key="simple_free_shipping" required="true">string</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
+            <field key="description" required="true">string</field>
+            <array key="customer_group_ids" required="true">
+                <value>integer</value>
+            </array>
+            <array key="website_ids" required="true">
+                <value>integer</value>
+            </array>
+        </object>
+    </operation>
+
+    <operation name="UpdateSalesRule" dataType="SalesRule" type="update" auth="adminOauth" url="/V1/salesRules" method="PUT">
+        <contentType>application/json</contentType>
+        <object key="rule" dataType="SalesRule">
+            <field key="rule_id" required="true">integer</field>
+            <field key="name" required="true">string</field>
             <array key="store_labels">
-                <!-- specify object name as array value -->
-                <value>SalesRuleStoreLabel</value>
-                <!-- alternatively, define object embedded in array directly -->
-                <!--object dataType="SalesRuleStoreLabel" key="store_labels">
-                    <field key="store_id">integer</field>
-                    <field key="store_label">string</field>
-                </object-->
+                <value>SalesRuleLabel</value>
             </array>
-            <array key="product_ids">
+            <field key="description" required="true">string</field>
+            <array key="website_ids" required="true">
                 <value>integer</value>
             </array>
-            <array key="customer_group_ids">
+            <array key="customer_group_ids" required="true">
                 <value>integer</value>
             </array>
-            <array key="website_ids">
+            <field key="from_date">string</field>
+            <field key="to_date">string</field>
+            <field key="uses_per_customer" required="true">integer</field>
+            <field key="is_active" required="true">boolean</field>
+            <field key="condition">SalesRuleCondition</field>
+            <field key="action_condition">SalesRuleCondition</field>
+            <field key="stop_rules_processing" required="true">boolean</field>
+            <array key="product_ids">
                 <value>integer</value>
             </array>
-            <object dataType="RuleCondition" key="condition">
-                <field key="condition_type">string</field>
-                <array key="conditions">
-                    <value>integer</value>
-                </array>
-                <field key="aggregator_type">string</field>
-                <field key="operator">string</field>
-                <field key="attribute_name">string</field>
-                <field key="value">string</field>
-                <field key="extension_attributes">empty_extension_attribute</field>
-            </object>
-            <object dataType="ActionCondition" key="action_condition">
-                <field key="condition_type">string</field>
-                <field key="aggregator_type">string</field>
-                <field key="operator">string</field>
-                <field key="attribute_name">string</field>
-                <field key="value">string</field>
-                <field key="extension_attributes">empty_extension_attribute</field>
-            </object>
-            <object dataType="ExtensionAttribute" key="extension_attributes">
-                <field key="reward_points_delta">integer</field>
-            </object>
+            <field key="sort_order" required="true">integer</field>
+            <field key="simple_action" required="true">string</field>
+            <field key="discount_amount" required="true">number</field>
+            <field key="discount_qty" required="true">number</field>
+            <field key="discount_step" required="true">integer</field>
+            <field key="apply_to_shipping" required="true">boolean</field>
+            <field key="times_used" required="true">integer</field>
+            <field key="is_rss" required="true">boolean</field>
+            <field key="coupon_type" required="true">string</field>
+            <field key="use_auto_generation" required="true">boolean</field>
+            <field key="uses_per_coupon" required="true">integer</field>
+            <field key="simple_free_shipping" required="true">string</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
         </object>
     </operation>
+
     <operation name="DeleteSalesRule" dataType="SalesRule" type="delete" auth="adminOauth" url="/V1/salesRules/{rule_id}" method="DELETE">
         <contentType>application/json</contentType>
     </operation>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule_coupon-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule_coupon-meta.xml
deleted file mode 100644
index 4debb7b2e4a..00000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule_coupon-meta.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="CreateSalesRuleCoupon" dataType="SalesRuleCoupon" type="create" auth="adminOauth" url="/V1/coupons" method="POST">
-        <contentType>application/json</contentType>
-        <object key="coupon" dataType="SalesRuleCoupon">
-            <field key="rule_id" required="true">integer</field>
-            <field key="code">string</field>
-            <field key="usage_limit">integer</field>
-            <field key="usage_per_customer">integer</field>
-            <field key="times_used">integer</field>
-            <field key="expiration_date">string</field>
-            <field key="is_primary">boolean</field>
-            <field key="created_at">string</field>
-            <field key="type">integer</field>
-        </object>
-    </operation>
-    <operation name="DeleteSalesRuleCoupon" dataType="SalesRuleCoupon" type="delete" auth="adminOauth" url="/V1/coupons/{coupon_id}" method="DELETE">
-        <contentType>application/json</contentType>
-    </operation>
-</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule_store_label-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule_store_label-meta.xml
deleted file mode 100644
index 2661a6519ac..00000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule_store_label-meta.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.
-  */
--->
-
-<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="CreateSalesRuleStoreLabel" dataType="SalesRuleStoreLabel" type="create">
-        <field key="store_id">integer</field>
-        <field key="store_label">string</field>
-    </operation>
-</operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/CheckoutCartSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/CheckoutCartSummarySection.xml
new file mode 100644
index 00000000000..68dee0de523
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/CheckoutCartSummarySection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CheckoutCartSummarySection">
+        <element name="discountLabel" type="text" selector="//*[@id='cart-totals']//tr[.//th//span[contains(@class, 'discount coupon')]]"/>
+        <element name="discountTotal" type="text" selector="//*[@id='cart-totals']//tr[.//th//span[contains(@class, 'discount coupon')]]//td//span//span[@class='price']"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/StorefrontSalesRuleCartCouponSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/StorefrontSalesRuleCartCouponSection.xml
new file mode 100644
index 00000000000..7c0b918864d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/StorefrontSalesRuleCartCouponSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontSalesRuleCartCouponSection">
+        <element name="couponHeader" type="button" selector="//*[@id='block-discount-heading']"/>
+        <element name="couponField" type="text" selector="//*[@id='coupon_code']"/>
+        <element name="discountBlockActive" type="text" selector="//*[@class='block discount active']" />
+        <element name="applyButton" type="text" selector="//*[@id='discount-coupon-form']//button[contains(@class, 'apply')]"/>
+        <element name="cancelButton" type="text" selector="//*[@id='discount-coupon-form']//button[contains(@class, 'cancel')]"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CGuestUserTest.xml
new file mode 100644
index 00000000000..6e1ba5ad164
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CGuestUserTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CGuestUserTest">
+        <before>
+            <createData entity="ApiSalesRule" stepKey="createSalesRule"/>
+            <createData entity="ApiSalesRuleCoupon" stepKey="createSalesRuleCoupon">
+                <requiredEntity createDataKey="createSalesRule"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
+        </after>
+
+        <!-- Step 5: User uses coupon codes -->
+        <comment userInput="Start of using coupon code" stepKey="startOfUsingCouponCode" after="endOfComparingProducts" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="couponOpenCart" after="startOfUsingCouponCode"/>
+
+        <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="couponApplyCoupon" after="couponOpenCart">
+            <argument name="coupon" value="$$createSalesRuleCoupon$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCheckCouponAppliedActionGroup" stepKey="couponCheckAppliedDiscount" after="couponApplyCoupon">
+            <argument name="rule" value="$$createSalesRule$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="discount" value="E2EB2CQuoteWith10PercentDiscount.discount"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuoteWith10PercentDiscount.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuoteWith10PercentDiscount.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuoteWith10PercentDiscount.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuoteWith10PercentDiscount.total"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuote.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuote.total"/>
+        </actionGroup>
+        <comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon" />
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 00000000000..fcb8028220c
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="EndToEndB2CLoggedInUserTest">
+        <before>
+            <createData entity="ApiSalesRule" stepKey="createSalesRule"/>
+            <createData entity="ApiSalesRuleCoupon" stepKey="createSalesRuleCoupon">
+                <requiredEntity createDataKey="createSalesRule"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
+        </after>
+
+        <!-- Step 6: User uses coupon codes -->
+        <comment userInput="Start of using coupon code" stepKey="startOfUsingCouponCode" after="endOfComparingProducts" />
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="couponOpenCart" after="startOfUsingCouponCode"/>
+
+        <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="couponApplyCoupon" after="couponOpenCart">
+            <argument name="coupon" value="$$createSalesRuleCoupon$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCheckCouponAppliedActionGroup" stepKey="couponCheckAppliedDiscount" after="couponApplyCoupon">
+            <argument name="rule" value="$$createSalesRule$$"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="discount" value="E2EB2CQuoteWith10PercentDiscount.discount"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuoteWith10PercentDiscount.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuoteWith10PercentDiscount.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuoteWith10PercentDiscount.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuoteWith10PercentDiscount.total"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shipping" value="E2EB2CQuote.shipping"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
+            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
+            <argument name="total" value="E2EB2CQuote.total"/>
+        </actionGroup>
+        <comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json
index f53960051cd..9b914c5df71 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json
@@ -11,25 +11,25 @@
         "sort-packages": true
     },
     "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-testing-framework": "~2.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
+        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
+        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.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-catalog-rule": "100.0.0-dev",
         "magento/magento2-functional-test-module-config": "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-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
         "magento/magento2-functional-test-module-reports": "100.0.0-dev",
         "magento/magento2-functional-test-module-rule": "100.0.0-dev",
         "magento/magento2-functional-test-module-sales": "100.0.0-dev",
         "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
         "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
         "magento/magento2-functional-test-module-widget": "100.0.0-dev"
     },
     "autoload": {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml
index d805bd6a609..1808424b8a4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/AssertsTest.xml
@@ -13,12 +13,6 @@
             <features value="Test Asserts"/>
             <group value="skip"/>
         </annotations>
-        <before>
-            <createData entity="Simple_US_Customer" stepKey="createData1"/>
-        </before>
-        <after>
-            <deleteData createDataKey="createData1" stepKey="deleteData1"/>
-        </after>
 
         <createData entity="Simple_US_Customer" stepKey="createData2"/>
         <amOnUrl url="https://www.yahoo.com" stepKey="amOnPage"/>
@@ -26,70 +20,58 @@
         <grabTextFrom selector="#uh-logo" stepKey="grabTextFrom1"/>
 
         <!-- asserts without variable replacement -->
-        <comment stepKey="c1" userInput="asserts without variable replacement"/>
-        <assertArrayHasKey stepKey="assertArrayHasKey" expected="apple" expectedType="string" actual="['orange' => 2, 'apple' => 1]" actualType="const" message="pass"/>
-        <assertArrayNotHasKey stepKey="assertArrayNotHasKey" expected="kiwi" expectedType="string" actual="['orange' => 2, 'apple' => 1]" message="pass"/>
-        <assertArraySubset stepKey="assertArraySubset" expected="[1, 2]" actual="[1, 2, 3, 5]" message="pass"/>
-        <assertContains stepKey="assertContains" expected="ab" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
-        <assertCount stepKey="assertCount" expected="2" expectedType="int" actual="['a', 'b']" message="pass"/>
-        <assertEmpty stepKey="assertEmpty" actual="[]" message="pass"/>
-        <assertEquals stepKey="assertEquals1" expected="text" expectedType="variable" actual="Yahoo" actualType="string" message="pass"/>
-        <assertEquals stepKey="assertEquals2" expected="Yahoo" expectedType="string" actual="text" actualType="variable" message="pass"/>
-        <assertFalse stepKey="assertFalse1" actual="0" actualType="bool" message="pass"/>
-        <assertFileNotExists stepKey="assertFileNotExists1" actual="/out.txt" actualType="string" message="pass"/>
-        <assertFileNotExists stepKey="assertFileNotExists2" actual="text" actualType="variable" message="pass"/>
-        <assertGreaterOrEquals stepKey="assertGreaterOrEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
-        <assertGreaterThan stepKey="assertGreaterThan" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
-        <assertGreaterThanOrEqual stepKey="assertGreaterThanOrEqual" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
-        <assertInternalType stepKey="assertInternalType1" expected="string" expectedType="string" actual="xyz" actualType="string" message="pass"/>
-        <assertInternalType stepKey="assertInternalType2" expected="int" expectedType="string" actual="21" actualType="int" message="pass"/>
-        <assertInternalType stepKey="assertInternalType3" expected="string" expectedType="string" actual="text" actualType="variable" message="pass"/>
-        <assertLessOrEquals stepKey="assertLessOrEquals" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
-        <assertLessThan stepKey="assertLessThan" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
-        <assertLessThanOrEqual stepKey="assertLessThanOrEqual" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
-        <assertNotContains stepKey="assertNotContains1" expected="bc" expectedType="string" actual="['item1' => 'a', 'item2' => 'ab']" message="pass"/>
-        <assertNotContains stepKey="assertNotContains2" expected="bc" expectedType="string" actual="text" actualType="variable" message="pass"/>
-        <assertNotEmpty stepKey="assertNotEmpty1" actual="[1, 2]" message="pass"/>
-        <assertNotEmpty stepKey="assertNotEmpty2" actual="text" actualType="variable" message="pass"/>
-        <assertNotEquals stepKey="assertNotEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass" delta=""/>
-        <assertNotNull stepKey="assertNotNull1" actual="abc" actualType="string" message="pass"/>
-        <assertNotNull stepKey="assertNotNull2" actual="text" actualType="variable" message="pass"/>
-        <assertNotRegExp stepKey="assertNotRegExp" expected="/foo/" expectedType="string" actual="bar" actualType="string" message="pass"/>
-        <assertNotSame stepKey="assertNotSame" expected="log" expectedType="string" actual="tag" actualType="string" message="pass"/>
-        <assertRegExp stepKey="assertRegExp" expected="/foo/" expectedType="string" actual="foo" actualType="string" message="pass"/>
-        <assertSame stepKey="assertSame" expected="bar" expectedType="string" actual="bar" actualType="string" message="pass"/>
-        <assertStringStartsNotWith stepKey="assertStringStartsNotWith" expected="a" expectedType="string" actual="banana" actualType="string" message="pass"/>
-        <assertStringStartsWith stepKey="assertStringStartsWith" expected="a" expectedType="string" actual="apple" actualType="string" message="pass"/>
-        <assertTrue stepKey="assertTrue" actual="1" actualType="bool" message="pass"/>
+        <assertArrayHasKey stepKey="assertArrayHasKey" message="pass">
+            <expectedResult type="string">apple</expectedResult>
+            <actualResult type="const">['orange' => 2, 'apple' => 1]</actualResult>
+        </assertArrayHasKey>
+        <assertEquals stepKey="assertEquals1" message="pass">
+            <expectedResult type="variable">grabTextFrom1</expectedResult>
+            <actualResult type="string">Copyright © 2013-2017 Magento, Inc. All rights reserved.</actualResult>
+        </assertEquals>
+        <assertFalse stepKey="assertFalse1" message="pass">
+            <actualResult type="bool">0</actualResult>
+        </assertFalse>
+        <assertGreaterOrEquals stepKey="assertGreaterOrEquals" message="pass">
+            <expectedResult type="int">2</expectedResult>
+            <actualResult type="int">5</actualResult>
+        </assertGreaterOrEquals>
+        <assertElementContainsAttribute stepKey="assertElementContainsAttribute1" selector="#username" attribute="class">
+            <expectedResult type="string">admin__control-text</expectedResult>
+        </assertElementContainsAttribute>
 
         <!-- string type that use created data -->
-        <comment stepKey="c2" userInput="string type that use created data"/>
-        <assertStringStartsWith stepKey="assert1" expected="D" expectedType="string" actual="$$createData1.lastname$$, $$createData1.firstname$$" actualType="string" message="fail"/>
-        <assertStringStartsNotWith stepKey="assert2" expected="W" expectedType="string" actual="$createData2.firstname$ $createData2.lastname$" actualType="string" message="pass"/>
-        <assertEquals stepKey="assert5" expected="$$createData1.lastname$$" expectedType="string" actual="$$createData1.lastname$$" actualType="string" message="pass"/>
+        <assertStringStartsWith stepKey="assert1" message="fail">
+            <expectedResult type="string">D</expectedResult>
+            <actualResult type="string">$$createData1.lastname$$, $$createData1.firstname$$</actualResult>
+        </assertStringStartsWith>
+        <assertStringStartsNotWith stepKey="assert2" message="pass">
+            <expectedResult type="string">W</expectedResult>
+            <actualResult type="string">$createData2.firstname$, $createData2.lastname$</actualResult>
+        </assertStringStartsNotWith>
+        <assertEquals stepKey="assert5" message="pass">
+            <expectedResult type="string">$$createData1.lastname$$</expectedResult>
+            <actualResult type="string">$$createData1.lastname$$</actualResult>
+        </assertEquals>
+        <assertElementContainsAttribute stepKey="assertElementContainsAttribute7" selector="#username" attribute="value">
+            <expectedResult type="const">$createData2.firstname$</expectedResult>
+        </assertElementContainsAttribute>
 
         <!-- array type that use created data -->
-        <comment stepKey="c3" userInput="array type that use created data"/>
-        <assertArraySubset stepKey="assert9" expected="[$$createData1.lastname$$, $$createData1.firstname$$]" expectedType="array" actual="[$$createData1.lastname$$, $$createData1.firstname$$, 1]" actualType="array" message="pass"/>
-        <assertArraySubset stepKey="assert10" expected="[$createData2.firstname$, $createData2.lastname$]" expectedType="array" actual="[$createData2.firstname$, $createData2.lastname$, 1]" actualType="array" message="pass"/>
-        <assertArrayHasKey stepKey="assert3" expected="lastname" expectedType="string" actual="['lastname' => $$createData1.lastname$$, 'firstname' => $$createData1.firstname$$]" actualType="array" message="pass"/>
-        <assertArrayHasKey stepKey="assert4" expected="lastname" expectedType="string" actual="['lastname' => $createData2.lastname$, 'firstname' => $createData2.firstname$]" actualType="array" message="pass"/>
-
-        <!-- comment this section before running this test -->
-        <comment stepKey="c4" userInput="comment this section before running this test"/>
-        <assertInstanceOf stepKey="assertInstanceOf" expected="User::class" actual="text" actualType="variable" message="pass"/>
-        <assertNotInstanceOf stepKey="assertNotInstanceOf" expected="User::class" actual="21" actualType="int" message="pass"/>
-        <assertFileExists stepKey="assertFileExists2" actual="text" actualType="variable" message="pass"/>
-        <assertFileExists stepKey="assert6" actual="AssertCest.php" actualType="string" message="pass"/>
-        <assertIsEmpty stepKey="assertIsEmpty" actual="text" actualType="variable" message="pass"/>
-        <assertNull stepKey="assertNull" actual="text" actualType="variable" message="pass"/>
-        <expectException stepKey="expectException" expected="new MyException('exception msg')" actual="function() {$this->doSomethingBad();}"/>
-        <fail stepKey="fail" message="fail"/>
-        <fail stepKey="assert7" message="$createData2.firstname$ $createData2.lastname$"/>
-        <fail stepKey="assert8" message="$$createData1.firstname$$ $$createData1.lastname$$"/>
-        <!-- comment end -->
-        <comment stepKey="c5" userInput="comment end"/>
-
-        <deleteData createDataKey="createData2" stepKey="deleteData2"/>
+        <assertArraySubset stepKey="assert9" message="pass">
+            <expectedResult type="array">[$$createData1.lastname$$, $$createData1.firstname$$]</expectedResult>
+            <actualResult type="array">[$$createData1.lastname$$, $$createData1.firstname$$, 1]</actualResult>
+        </assertArraySubset>
+        <assertArraySubset stepKey="assert10" message="pass">
+            <expectedResult type="array">[$createData2.firstname$, $createData2.lastname$]</expectedResult>
+            <actualResult type="array">[$createData2.firstname$, $createData2.lastname$, 1]</actualResult>
+        </assertArraySubset>
+        <assertArrayHasKey stepKey="assert3" message="pass">
+            <expectedResult type="string">lastname</expectedResult>
+            <actualResult type="array">['lastname' => $$createData1.lastname$$, 'firstname' => $$createData1.firstname$$]</actualResult>
+        </assertArrayHasKey>
+        <assertArrayHasKey stepKey="assert4" message="pass">
+            <expectedResult type="string">lastname</expectedResult>
+            <actualResult type="array">['lastname' => $createData2.lastname$, 'firstname' => $createData2.firstname$]</actualResult>
+        </assertArrayHasKey>
     </test>
 </tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml
index 1c2d9a54bef..a96f4566550 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/CreateConfigurableProductByApiTest.xml
@@ -19,7 +19,7 @@
             <createData stepKey="baseConfigProductHandle" entity="BaseConfigurableProduct" >
                 <requiredEntity createDataKey="categoryHandle"/>
             </createData>
-            <createData stepKey="productAttributeHandle" entity="productAttributeWithTwoOptions"/>
+            <createData stepKey="productAttributeHandle" entity="productDropDownAttribute"/>
 
             <createData stepKey="productAttributeOption1Handle" entity="productAttributeOption1">
                 <requiredEntity createDataKey="productAttributeHandle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/Section/StorefrontQuickSearchSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/Section/StorefrontQuickSearchSection.xml
new file mode 100644
index 00000000000..5770b43901e
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/Section/StorefrontQuickSearchSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontQuickSearchSection">
+        <element name="searchPhrase" type="input" selector="#search"/>
+        <element name="searchButton" type="button" selector="button.action.search"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json
index 04b875efb60..fdc828cd35a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json
@@ -11,15 +11,15 @@
         "sort-packages": true
     },
     "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-testing-framework": "~2.0.0",
+        "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev",
+        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
         "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev",
         "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
+        "magento/magento2-functional-test-module-store": "100.0.0-dev"
     },
     "autoload": {
         "psr-4": {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/ActionGroup/AdminShipmentActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/ActionGroup/AdminShipmentActionGroup.xml
new file mode 100644
index 00000000000..3f420c20510
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/ActionGroup/AdminShipmentActionGroup.xml
@@ -0,0 +1,38 @@
+<?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">
+
+    <actionGroup name="verifyBasicShipmentInformation">
+        <arguments>
+            <argument name="customer" defaultValue=""/>
+            <argument name="shippingAddress" defaultValue=""/>
+            <argument name="billingAddress" defaultValue=""/>
+            <argument name="customerGroup" defaultValue="GeneralCustomerGroup"/>
+        </arguments>
+        <see selector="{{AdminShipmentOrderInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
+        <see selector="{{AdminShipmentOrderInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
+        <see selector="{{AdminShipmentOrderInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country_id}}" stepKey="seeBillingAddressCountry"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country_id}}" stepKey="seeShippingAddressCountry"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </actionGroup>
+
+    <actionGroup name="seeProductInShipmentItems">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <see selector="{{AdminShipmentItemsSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/ShippingMethodData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/ShippingMethodData.xml
new file mode 100644
index 00000000000..1c5139a5d73
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/ShippingMethodData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DefaultFlatRateMethod" type="shipping">
+        <data key="enabled">Yes</data>
+        <data key="title">Flat Rate</data>
+        <data key="methodName">Fixed</data>
+        <data key="type">Per Item</data>
+        <data key="price">5.00</data>
+        <data key="calculateHandlingFee">Fixed</data>
+        <data key="handlingFee">0.00</data>
+        <data key="errorMessage">This shipping method is not available. To use this shipping method, please contact us.</data>
+        <data key="applicableCountries">All Allowed Countries</data>
+        <data key="showIfNotApplicable">No</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Page/AdminShipmentNewPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Page/AdminShipmentNewPage.xml
new file mode 100644
index 00000000000..e1d7f8f4513
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Page/AdminShipmentNewPage.xml
@@ -0,0 +1,19 @@
+<?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="AdminShipmentNewPage" url="order_shipment/new/order_id/" area="admin" module="Shipping">
+        <section name="AdminShipmentMainActionsSection"/>
+        <section name="AdminShipmentOrderInformationSection"/>
+        <section name="AdminShipmentAddressInformationSection"/>
+        <section name="AdminShipmentPaymentShippingSection"/>
+        <section name="AdminShipmentItemsSection"/>
+        <section name="AdminShipmentTotalSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentAddressInformationSection.xml
similarity index 60%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInformationSection.xml
rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentAddressInformationSection.xml
index 1f5f678e239..ddfd21836b8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInformationSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentAddressInformationSection.xml
@@ -8,11 +8,10 @@
 
 <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="OrderDetailsInformationSection">
-        <element name="orderStatus" type="text" selector="#order_status"/>
-        <element name="accountInformation" type="text" selector=".order-account-information-table"/>
-        <element name="billingAddress" type="text" selector=".order-billing-address"/>
-        <element name="shippingAddress" type="text" selector=".order-shipping-address"/>
-        <element name="itemsOrdered" type="text" selector=".edit-order-table"/>
+    <section name="AdminShipmentAddressInformationSection">
+        <element name="billingAddress" type="text" selector=".order-billing-address address"/>
+        <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+        <element name="shippingAddressEdit" type="button" selector=".order-shipping-address .actions a"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentItemsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentItemsSection.xml
new file mode 100644
index 00000000000..562ad729fe7
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentItemsSection.xml
@@ -0,0 +1,19 @@
+<?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="AdminShipmentItemsSection">
+        <element name="itemName" type="text" selector=".order-shipment-table tbody:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
+        <element name="itemSku" type="text" selector=".order-shipment-table tbody:nth-of-type({{row}}) .col-product .product-sku-block" parameterized="true"/>
+        <element name="itemQty" type="text" selector=".order-shipment-table tbody:nth-of-type({{row}}) .col-ordered-qty .qty-table" parameterized="true"/>
+        <element name="itemQtyToShip" type="input" selector=".order-shipment-table tbody:nth-of-type({{row}}) .col-qty input.qty-item"/>
+        <element name="nameColumn" type="text" selector=".order-shipment-table .col-product .product-title"/>
+        <element name="skuColumn" type="text" selector=".order-shipment-table .col-product .product-sku-block"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentMainActionsSection.xml
new file mode 100644
index 00000000000..5cd843e0ad8
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentMainActionsSection.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="AdminShipmentMainActionsSection">
+        <element name="submitShipment" type="button" selector="button.action-default.save.submit-button"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentOrderInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentOrderInformationSection.xml
new file mode 100644
index 00000000000..9076ad5c249
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentOrderInformationSection.xml
@@ -0,0 +1,20 @@
+<?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="AdminShipmentOrderInformationSection">
+        <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="30"/>
+        <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
+        <element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
+        <element name="purchasedFrom" type="text" selector=".order-information table.order-information-table tr:last-of-type > td"/>
+        <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
+        <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
+        <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentPaymentShippingSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentPaymentShippingSection.xml
new file mode 100644
index 00000000000..a97bb481391
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentPaymentShippingSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminShipmentPaymentShippingSection">
+        <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
+        <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
+        <element name="PaymentAdditional" type="text" selector=".order-payment-method .order-payment-additional"/>
+        <element name="ShippingMethod" type="text" selector=".order-shipping-address .shipping-description-title"/>
+        <element name="ShippingPrice" type="text" selector=".order-shipping-address .shipping-description-content .price"/>
+        <element name="AddTrackingNumber" type="button" selector="#tracking_numbers_table tfoot [data-ui-id='shipment-tracking-add-button']"/>
+        <element name="Carrier" type="select" selector="#tracking_numbers_table tr:nth-of-type({{row}}) .col-carrier select" parameterized="true"/>
+        <element name="Title" type="input" selector="#tracking_numbers_table tr:nth-of-type({{row}}) .col-title input" parameterized="true"/>
+        <element name="Number" type="input" selector="#tracking_numbers_table tr:nth-of-type({{row}} .col-number input)" parameterized="true"/>
+        <element name="Delete" type="button" selector="#tracking_numbers_table tr:nth-of-type({{row}} .col-delete button.action-delete)" parameterized="true"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentTotalSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentTotalSection.xml
new file mode 100644
index 00000000000..7496bfbdf22
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentTotalSection.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="AdminShipmentTotalSection">
+        <element name="CommentText" type="textarea" selector="#shipment_comment_text"/>
+        <element name="AppendComments" type="checkbox" selector=".order-totals input#notify_customer"/>
+        <element name="EmailCopy" type="checkbox" selector=".order-totals input#send_email"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Test/EndToEndB2CAdminTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Test/EndToEndB2CAdminTest.xml
new file mode 100644
index 00000000000..9e5a1c9f26c
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Test/EndToEndB2CAdminTest.xml
@@ -0,0 +1,50 @@
+<?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="EndToEndB2CAdminTest">
+        <!--Ship Order-->
+        <comment userInput="Admin creates shipment" stepKey="adminCreatesShipmentComment" before="clickShipAction"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction" after="clickOrderIdLinkOnInvoice"/>
+        <seeInCurrentUrl url="{{AdminShipmentNewPage}}" stepKey="seeOrderShipmentUrl" after="clickShipAction"/>
+
+        <see selector="{{AdminShipmentOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeShipmentOrderStatus" after="seeOrderShipmentUrl"/>
+        <actionGroup ref="verifyBasicShipmentInformation" stepKey="checkBasicShipmentOrderInfo" after="seeShipmentOrderStatus">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+
+        <!--Submit Shipment-->
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment" after="checkBasicShipmentOrderInfo"/>
+        <!--Shipment created successfully-->
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage}}" stepKey="seeViewOrderPageShipping" after="clickSubmitShipment"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="$getOrderId" stepKey="seeOrderIdInPageNameAfterShip" after="seeViewOrderPageShipping"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="seeShipmentCreateSuccess" after="seeOrderIdInPageNameAfterShip"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Complete" stepKey="seeOrderComplete" after="seeShipmentCreateSuccess"/>
+        <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Shipped 1" stepKey="seeShippedQuantity" after="seeOrderComplete"/>
+
+        <click selector="{{AdminOrderDetailsOrderViewSection.shipments}}" stepKey="clickOrderShipmentsTab" after="seeShippedQuantity"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForShipmentTabLoad" after="clickOrderShipmentsTab"/>
+        <see selector="{{AdminOrderShipmentsTabSection.gridRow('1')}}" userInput="{{Simple_US_Customer.firstname}}" stepKey="seeOrderShipmentInTabGrid" after="waitForShipmentTabLoad"/>
+        <click selector="{{AdminOrderShipmentsTabSection.viewGridRow('1')}}" stepKey="clickRowToViewShipment" after="seeOrderShipmentInTabGrid"/>
+        <see selector="{{AdminShipmentOrderInformationSection.orderId}}" userInput="$getOrderId" stepKey="seeOrderIdOnShipment" after="clickRowToViewShipment"/>
+        <actionGroup ref="verifyBasicShipmentInformation" stepKey="checkShipmentOrderInformation" after="seeOrderIdOnShipment">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="shippingAddress" value="US_Address_TX"/>
+            <argument name="billingAddress" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInShipmentItems" stepKey="seeSimpleProductInShipmentItems" after="checkShipmentOrderInformation">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="seeProductInShipmentItems" stepKey="seeConfigurableProductInShipmentItems" after="seeSimpleProductInShipmentItems">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <click selector="{{AdminShipmentOrderInformationSection.orderId}}" stepKey="clickOrderIdOnShipment" after="seeConfigurableProductInShipmentItems"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateStoreViewActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateStoreViewActionGroup.xml
index 4cf0e64ed46..1a532119b66 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -20,10 +20,9 @@
         <fillField selector="{{AdminNewStoreSection.storeCodeTextField}}" userInput="{{customStore.code}}" stepKey="enterStoreViewCode" />
         <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="setStatus" />
         <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView" />
-        <waitForElementVisible selector=".action-primary.action-accept" stepKey="waitForModal" />
-        <seeInSource html="'Warning message'" stepKey="seeWarning" />
-        <click selector=".action-primary.action-accept" stepKey="dismissModal" />
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/>
         <see userInput="You saved the store view." stepKey="seeSavedMessage" />
     </actionGroup>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteStoreViewActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteStoreViewActionGroup.xml
new file mode 100644
index 00000000000..2e884ee262e
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteStoreViewActionGroup.xml
@@ -0,0 +1,26 @@
+<?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="AdminDeleteStoreViewActionGroup">
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
+        <waitForPageLoad stepKey="waitStoreIndexPageLoad" />
+        <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>
+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewInGrid"/>
+        <waitForPageLoad stepKey="waitForStoreViewPage"/>
+        <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreView"/>
+        <selectOption selector="{{AdminStoreBackupOptionsSection.createBackupSelect}}" userInput="No" stepKey="dontCreateDbBackup"/>
+        <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewAgain"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.title}}" stepKey="waitingForWarningModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreDelete"/>
+        <wait time="10" stepKey="extraWait"/>
+        <see userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml
index dccc561333a..79b1785158c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml
@@ -6,6 +6,11 @@
   */
 -->
 <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="_defaultStore" type="store">
+        <data key="name">Default Store View</data>
+        <data key="code">default</data>
+        <data key="is_active">1</data>
+    </entity>
     <entity name="customStore" type="store">
         <!--data key="group_id">customStoreGroup.id</data-->
         <data key="name" unique="suffix">store</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreDeletePage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreDeletePage.xml
new file mode 100644
index 00000000000..7b68d3c77e6
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreDeletePage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminSystemStoreDeletePage" url="system_store/deleteStore" module="Store" area="admin">
+        <section name="AdminStoreBackupOptionsSection"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreEditPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreEditPage.xml
new file mode 100644
index 00000000000..f6533b44947
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreEditPage.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="AdminSystemStoreEditPage" url="system_store/editStore" module="Store" area="admin">
+        <section name="AdminNewStoreViewMainActionsSection"/>
+        <section name="AdminNewStoreSection"/>
+    </page>
+</pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreViewActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreViewActionsSection.xml
index 5c731682e42..f41ae17364a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreViewActionsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreViewActionsSection.xml
@@ -7,8 +7,9 @@
 -->
 <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="AdminNewStoreViewActionsSection">
-        <element name="backButton" type="button" selector="#back"/>
-        <element name="resetButton" type="button" selector="#reset"/>
-        <element name="saveButton" type="button" selector="#save"/>
+        <element name="backButton" type="button" selector="#back" timeout="30"/>
+        <element name="delete" type="button" selector="#delete" timeout="30"/>
+        <element name="resetButton" type="button" selector="#reset" timeout="30"/>
+        <element name="saveButton" type="button" selector="#save" timeout="30"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoreBackupOptionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoreBackupOptionsSection.xml
new file mode 100644
index 00000000000..3767311d76f
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoreBackupOptionsSection.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="AdminStoreBackupOptionsSection">
+        <element name="createBackupSelect" type="select" selector="select#store_create_backup"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml
index eb283ed17b3..b28f9c37485 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml
@@ -10,7 +10,7 @@
         <element name="storeGrpFilterTextField" type="input" selector="#storeGrid_filter_group_title"/>
         <element name="websiteFilterTextField" type="input" selector="#storeGrid_filter_website_title"/>
         <element name="storeFilterTextField" type="input" selector="#storeGrid_filter_store_title"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]" timeout="30"/>
         <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
         <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontFooterSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontFooterSection.xml
new file mode 100644
index 00000000000..8fd7d03283d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontFooterSection.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="StorefrontFooterSection">
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontMessagesSection.xml
new file mode 100644
index 00000000000..981d12d0921
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontMessagesSection.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="StorefrontMessagesSection">
+        <element name="message" type="text"
+                 selector="//main//div[contains(@class, 'messages')]//div[contains(@class, 'message')]/div[contains(text(), '{{var1}}')]"
+                 parameterized="true"
+        />
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json
index bc334e7ebc0..b70bf72bfa9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json
@@ -11,7 +11,7 @@
         "sort-packages": true
     },
     "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-testing-framework": "~2.0.0",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml
new file mode 100644
index 00000000000..6c9ee30a970
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml
@@ -0,0 +1,32 @@
+<?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">
+    <!--Search grid with keyword search-->
+    <actionGroup name="searchAdminDataGridByKeyword">
+        <arguments>
+            <argument name="keyword"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch"/>
+    </actionGroup>
+
+    <!--Reset data grid to default view-->
+    <actionGroup name="resetAdminDataGridToDefaultView">
+        <click selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" stepKey="openViewBookmarks"/>
+        <click selector="{{AdminDataGridHeaderSection.bookmarkOption('Default View')}}" stepKey="selectDefaultGridView"/>
+        <see selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
+    </actionGroup>
+
+    <!--Clear all filters in grid-->
+    <actionGroup name="clearFiltersAdminDataGrid">
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml
new file mode 100644
index 00000000000..e5c81ba34be
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml
@@ -0,0 +1,32 @@
+<?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">
+
+    <actionGroup name="adminDataGridSelectPerPage">
+        <arguments>
+            <argument name="perPage"/>
+        </arguments>
+        <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/>
+        <click selector="{{AdminDataGridPaginationSection.perPageOption(perPage)}}" stepKey="selectCustomPerPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+    </actionGroup>
+
+    <actionGroup name="adminDataGridSelectCustomPerPage">
+        <arguments>
+            <argument name="perPage"/>
+        </arguments>
+        <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/>
+        <click selector="{{AdminDataGridPaginationSection.perPageOption('Custom')}}" stepKey="selectCustomPerPage"/>
+        <fillField selector="{{AdminDataGridPaginationSection.perPageInput}}" userInput="{{perPage}}" stepKey="fillCustomPerPage"/>
+        <click selector="{{AdminDataGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridHeaderSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridHeaderSection.xml
new file mode 100644
index 00000000000..c383a05fd16
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridHeaderSection.xml
@@ -0,0 +1,29 @@
+<?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="AdminDataGridHeaderSection">
+        <!--Search by keyword element-->
+        <element name="search" type="input" selector="#fulltext"/>
+        <element name="submitSearch" type="button" selector=".data-grid-search-control-wrap > button.action-submit" timeout="30"/>
+        <!--Filters-->
+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
+        <element name="filterFieldInput" type="input" selector=".admin__data-grid-filters input[name='{{name}}']" parameterized="true"/>
+        <element name="filterFieldSelect" type="select" selector=".admin__data-grid-filters select[name='{{name}}']" parameterized="true"/>
+        <element name="cancelFilters" type="button" selector="button[data-action='grid-filter-cancel']" timeout="30"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
+        <!--Grid view bookmarks-->
+        <element name="bookmarkToggle" type="button" selector="div.admin__data-grid-action-bookmarks button[data-bind='toggleCollapsible']" timeout="30"/>
+        <element name="bookmarkOption" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <!--Visible columns management-->
+        <element name="columnsToggle" type="button" selector="div.admin__data-grid-action-columns button[data-bind='toggleCollapsible']" timeout="30"/>
+        <element name="columnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridPaginationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridPaginationSection.xml
new file mode 100644
index 00000000000..d52d5ee4bb8
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridPaginationSection.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="AdminDataGridPaginationSection">
+        <element name="perPageDropdown" type="select" selector=".admin__data-grid-pager-wrap .selectmenu"/>
+        <element name="perPageOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{label}}']" parameterized="true"/>
+        <element name="perPageInput" type="input" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//input"/>
+        <element name="perPageApplyInput" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//button"/>
+        <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next" timeout="30"/>
+        <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous" timeout="30"/>
+        <element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>
+        <element name="totalPages" type="text" selector="div.admin__data-grid-pager > label"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridTableSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridTableSection.xml
new file mode 100644
index 00000000000..53228559f6d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridTableSection.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="AdminDataGridTableSection">
+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
+        <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{col}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
+        <element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="rows" type="text" selector="table.data-grid tbody > tr.data-row"/>
+        <!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
+        <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
+        <element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/ModalConfirmationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/ModalConfirmationSection.xml
new file mode 100644
index 00000000000..146aea30f46
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/ModalConfirmationSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="ModalConfirmationSection">
+        <element name="CancelButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-dismiss')]"/>
+        <element name="OkButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-accept')]"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
new file mode 100644
index 00000000000..122bfbe4cc1
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.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 Product to wishlist from the category page and check message -->
+    <actionGroup name="StorefrontCustomerAddCategoryProductToWishlistActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(productVar.name)}}" stepKey="addCategoryProductToWishlistMoveMouseOverProduct" />
+        <click selector="{{StorefrontCategoryProductSection.ProductAddToWishlistByName(productVar.name)}}" stepKey="addCategoryProductToWishlistClickAddProductToWishlist"/>
+        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addCategoryProductToWishlistWaitForSuccessMessage"/>
+        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been added to your Wish List." stepKey="addCategoryProductToWishlistSeeProductNameAddedToWishlist"/>
+        <seeCurrentUrlMatches regex="~/wishlist_id/\d+/$~" stepKey="seeCurrentUrlMatches"/>
+    </actionGroup>
+
+    <!-- Add Product to wishlist from the product page and check message -->
+    <actionGroup name="StorefrontCustomerAddProductToWishlistActionGroup">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <click selector="{{StorefrontProductInfoMainSection.productAddToWishlist}}" stepKey="addProductToWishlistClickAddToWishlist" />
+        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addProductToWishlistWaitForSuccessMessage"/>
+        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been added to your Wish List." stepKey="addProductToWishlistSeeProductNameAddedToWishlist"/>
+        <seeCurrentUrlMatches regex="~/wishlist_id/\d+/$~" stepKey="seeCurrentUrlMatches"/>
+    </actionGroup>
+
+    <!-- Check product in wishlist -->
+    <actionGroup name="StorefrontCustomerCheckProductInWishlist">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontCustomerWishlistProductSection.ProductTitleByName(productVar.name)}}" time="30" stepKey="assertWishlistProductName"/>
+        <see userInput="${{productVar.price}}.00" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName(productVar.name)}}" stepKey="AssertWishlistProductPrice"/>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName(productVar.name)}}" stepKey="wishlistMoveMouseOverProduct" />
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductAddToCartByName(productVar.name)}}" stepKey="AssertWishlistAddToCart" />
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByName(productVar.name)}}" stepKey="AssertWishlistProductImage" />
+    </actionGroup>
+
+    <!-- Check product in wishlist sidebar -->
+    <actionGroup name="StorefrontCustomerCheckProductInWishlistSidebar">
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <waitForElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductTitleByName(productVar.name)}}" time="30" stepKey="assertWishlistSidebarProductName"/>
+        <see userInput="${{productVar.price}}.00" selector="{{StorefrontCustomerWishlistSidebarSection.ProductPriceByName(productVar.name)}}" stepKey="AssertWishlistSidebarProductPrice"/>
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductAddToCartByName(productVar.name)}}" stepKey="AssertWishlistSidebarAddToCart" />
+        <seeElement selector="{{StorefrontCustomerWishlistSidebarSection.ProductImageByName(productVar.name)}}" stepKey="AssertWishlistSidebarProductImage" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCategoryProductSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCategoryProductSection.xml
new file mode 100644
index 00000000000..7229b596ddb
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCategoryProductSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryProductSection">
+        <element name="ProductAddToWishlistByNumber" type="text" selector="//main//li[{{var1}}]//a[contains(@class, 'towishlist')]" parameterized="true"/>
+        <element name="ProductAddToWishlistByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'towishlist')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistProductSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistProductSection.xml
new file mode 100644
index 00000000000..94681db830d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistProductSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerWishlistProductSection">
+        <element name="ProductTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="ProductPriceByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
+        <element name="ProductImageByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
+        <element name="ProductInfoByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//div[@class='product-item-info']" parameterized="true"/>
+        <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'action tocart primary')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSection.xml
index 6111c744a30..5a311f2a05d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSection.xml
@@ -9,6 +9,8 @@
 <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="StorefrontCustomerWishlistSection">
+        <element name="pageTitle" type="text" selector="h1.page-title"/>
+        <element name="successMsg" type="text" selector="div.message-success.success.message"/>
         <element name="productItemNameText" type="text" selector=".products-grid .product-item-name a"/>
         <element name="removeWishlistButton" type="button" selector=".products-grid .btn-remove.action.delete>span" timeout="30"/>
         <element name="emptyWishlistText" type="text" selector=".message.info.empty>span"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSidebarSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSidebarSection.xml
new file mode 100644
index 00000000000..d4a81137dbc
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSidebarSection.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="StorefrontCustomerWishlistSidebarSection">
+        <element name="ProductTitleByName" type="button" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']" parameterized="true"/>
+        <element name="ProductPriceByName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//span[@class='price']" parameterized="true"/>
+        <element name="ProductImageByName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//img[@class='product-image-photo']" parameterized="true"/>
+        <element name="ProductAddToCartByName" type="button" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//button[contains(@class, 'action tocart primary')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontProductInfoMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 00000000000..d8e16ce9a44
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/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="productAddToWishlist" type="button" selector="a.action.towishlist"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/EndToEndB2CLoggedInUserTest.xml
new file mode 100644
index 00000000000..b5a43fc4711
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/EndToEndB2CLoggedInUserTest.xml
@@ -0,0 +1,42 @@
+<?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="EndToEndB2CLoggedInUserTest">
+        <!-- Step 5: Add products to wishlist -->
+        <comment userInput="Start of adding products to wishlist" stepKey="startOfAddingProductsToWishlist" after="endOfComparingProducts" />
+        <!-- Add Simple Product 1 to wishlist -->
+        <comment userInput="Add Simple Product 1 to wishlist" stepKey="commentAddSimpleProduct1ToWishlist" after="startOfAddingProductsToWishlist" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" after="commentAddSimpleProduct1ToWishlist" stepKey="wishlistGotoCategory1"/>
+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" after="wishlistGotoCategory1" stepKey="wishlistAddSimpleProduct1ToWishlist">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlist" after="wishlistAddSimpleProduct1ToWishlist" stepKey="wishlistCheckSimpleProduct1InWishlist">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" after="wishlistCheckSimpleProduct1InWishlist" stepKey="wishlistCheckSimpleProduct1InWishlistSidebar">
+            <argument name="productVar" value="$$createSimpleProduct1$$"/>
+        </actionGroup>
+
+        <!-- Add Simple Product 2 to wishlist -->
+        <comment userInput="Add Simple Product 2 to wishlist" stepKey="commentAddSimpleProduct2ToWishlist" after="wishlistCheckSimpleProduct1InWishlistSidebar" />
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" after="commentAddSimpleProduct2ToWishlist" stepKey="wishlistGotoCategory2"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" after="wishlistGotoCategory2" stepKey="wishlistClickSimpleProduct2"/>
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" after="wishlistClickSimpleProduct2" stepKey="wishlistAddSimpleProduct2ToWishlist">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlist" after="wishlistAddSimpleProduct2ToWishlist" stepKey="wishlistCheckSimpleProduct2InWishlist">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" after="wishlistCheckSimpleProduct2InWishlist" stepKey="wishlistCheckSimpleProduct2InWishlistSidebar">
+            <argument name="productVar" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <comment userInput="End of adding products to wishlist" after="wishlistCheckSimpleProduct2InWishlistSidebar" stepKey="endOfAddingProductsToWishlist" />
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json
index 660d4ce34c3..91bdd392c88 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json
@@ -12,14 +12,15 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
+        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
+        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.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-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
+        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
         "magento/magento2-functional-test-module-rss": "100.0.0-dev",
         "magento/magento2-functional-test-module-sales": "100.0.0-dev",
         "magento/magento2-functional-test-module-store": "100.0.0-dev",
diff --git a/dev/tests/acceptance/utils/command.php b/dev/tests/acceptance/utils/command.php
index 3a1ae54bda8..943e2e9776a 100644
--- a/dev/tests/acceptance/utils/command.php
+++ b/dev/tests/acceptance/utils/command.php
@@ -17,11 +17,11 @@
         }
         echo implode("\n", $output);
     } else {
-        http_response_code(500);
+        http_response_code(403);
         echo "Given command not found valid in Magento CLI Command list.";
     }
 } else {
-    http_response_code(500);
+    http_response_code(412);
     echo("Command parameter is not set.");
 }
 
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml
index 778a4fb76d8..d9bba3ca5db 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="testmodule_default_hydrator_extension_attribute_entity" resource="default" engine="innodb">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"/>
         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"/>
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/AsyncTestData.php b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/AsyncTestData.php
new file mode 100644
index 00000000000..fc2fff50dff
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/AsyncTestData.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleAsyncAmqp\Model;
+
+class AsyncTestData
+{
+    /**
+     * @var $msgValue
+     */
+    protected $msgValue;
+
+    /**
+     * @var $path
+     */
+    protected $path;
+
+    /**
+     * set path to tmp directory.
+     *
+     * @param string $path
+     * @return void
+     */
+    public function setTextFilePath($path)
+    {
+        $this->path = $path;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTextFilePath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * @param string $strValue
+     * @return void
+     */
+    public function setValue($strValue)
+    {
+        $this->msgValue = $strValue;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->msgValue;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/CustomHandler.php b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/CustomHandler.php
new file mode 100644
index 00000000000..5cfb980a35f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/CustomHandler.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleAsyncAmqp\Model;
+
+class CustomHandler
+{
+    /**
+     * @param AsyncTestData $simpleDataItem
+     */
+    public function process($simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'custom-string-' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+
+    /**
+     * @param AsyncTestData[] $simpleDataItems
+     */
+    public function processArray($simpleDataItems)
+    {
+        foreach ($simpleDataItems as $objItem) {
+            file_put_contents(
+                $objItem->getTextFilePath(),
+                'custom-array-' . $objItem->getValue() . PHP_EOL,
+                FILE_APPEND
+            );
+        }
+    }
+
+    /**
+     * @param mixed $simpleDataItems
+     */
+    public function processMixed($simpleDataItems)
+    {
+        /** @var AsyncTestData[] $simpleDataItems */
+        $simpleDataItems = is_array($simpleDataItems) ? $simpleDataItems : [$simpleDataItems];
+        foreach ($simpleDataItems as $simpleDataItem) {
+            if (!($simpleDataItem instanceof AsyncTestData)) {
+                file_put_contents(
+                    $simpleDataItem->getTextFilePath(),
+                    'Invalid data item given. Was expected instance of ' . AsyncTestData::class . PHP_EOL,
+                    FILE_APPEND
+                );
+                continue;
+            }
+            file_put_contents(
+                $simpleDataItem->getTextFilePath(),
+                'custom-mixed-' . $simpleDataItem->getValue() . PHP_EOL,
+                FILE_APPEND
+            );
+        }
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/RequestHandler.php b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/RequestHandler.php
new file mode 100644
index 00000000000..1090c3261fc
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/RequestHandler.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleAsyncAmqp\Model;
+
+class RequestHandler
+{
+    /**
+     * @param \Magento\TestModuleAsyncAmqp\Model\AsyncTestData $simpleDataItem
+     */
+    public function process($simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'InvokedFromRequestHandler-' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/WildCardHandler.php b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/WildCardHandler.php
new file mode 100644
index 00000000000..e5c1f25b521
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/Model/WildCardHandler.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleAsyncAmqp\Model;
+
+class WildCardHandler
+{
+    /**
+     * @param AsyncTestData $simpleDataItem
+     */
+    public function methodOne(AsyncTestData $simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'WildCardHandler::methodOne - wildcard.queue.one - ' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+
+    /**
+     * @param AsyncTestData $simpleDataItem
+     */
+    public function methodTwo(AsyncTestData $simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'WildCardHandler::methodTwo - wildcard.queue.two - ' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+
+    /**
+     * @param AsyncTestData $simpleDataItem
+     */
+    public function methodThree(AsyncTestData $simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'WildCardHandler::methodThree - wildcard.queue.three - ' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+
+    /**
+     * @param AsyncTestData $simpleDataItem
+     */
+    public function methodFour(AsyncTestData $simpleDataItem)
+    {
+        file_put_contents(
+            $simpleDataItem->getTextFilePath(),
+            'WildCardHandler::methodFour - wildcard.queue.four - ' . $simpleDataItem->getValue() . PHP_EOL,
+            FILE_APPEND
+        );
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/communication.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/communication.xml
new file mode 100644
index 00000000000..c50bc3e35be
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/communication.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
+    <topic name="multi.topic.queue.topic.c.deprecated" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqC" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.d.deprecated" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqD" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.c" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqC" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.d" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqD" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.y" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqC" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.z" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="processAsyncReqD" type="Magento\TestModuleAsyncAmqp\Model\RequestHandler" method="process"/>
+    </topic>
+    <topic name="mtmh.topic.1" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData">
+        <handler name="mtmh.handler.1" type="Magento\TestModuleAsyncAmqp\Model\CustomHandler" method="process"/>
+    </topic>
+    <topic name="mtmh.topic.2" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData[]">
+        <handler name="mtmh.handler.2" type="Magento\TestModuleAsyncAmqp\Model\CustomHandler" method="processArray"/>
+    </topic>
+
+    <topic name="segment1.segment2.segment3.wildcard" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData"/>
+    <topic name="segment2.segment3.wildcard" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData"/>
+    <topic name="not.matching.wildcard.topic" request="Magento\TestModuleAsyncAmqp\Model\AsyncTestData"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/module.xml
new file mode 100644
index 00000000000..629a61d715c
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleAsyncAmqp" />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue.xml
new file mode 100644
index 00000000000..17895f1c796
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+    <broker topic="multi.topic.queue.topic.c.deprecated" type="amqp" exchange="magento">
+        <queue consumer="queue.for.multiple.topics.test.c.deprecated" name="queue.for.multiple.topics.test.c.deprecated"/>
+        <queue consumer="mixed.sync.and.async.queue.consumer.deprecated" name="mixed.sync.and.async.queue.deprecated"/>
+    </broker>
+    <broker topic="multi.topic.queue.topic.d.deprecated" type="amqp" exchange="magento">
+        <queue consumer="queue.for.multiple.topics.test.d.deprecated" name="queue.for.multiple.topics.test.d.deprecated"/>
+    </broker>
+</config>
+
+
+
+
+
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_consumer.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_consumer.xml
new file mode 100644
index 00000000000..5416452ca66
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_consumer.xml
@@ -0,0 +1,21 @@
+<!--<?xml version="1.0"?>-->
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+    <consumer name="queue.for.multiple.topics.test.c" queue="queue.for.multiple.topics.test.c"/>
+    <consumer name="queue.for.multiple.topics.test.d" queue="queue.for.multiple.topics.test.d"/>
+    <consumer name="queue.for.multiple.topics.test.y" queue="queue.for.multiple.topics.test.y"/>
+    <consumer name="queue.for.multiple.topics.test.z" queue="queue.for.multiple.topics.test.z"/>
+    <consumer name="mixed.sync.and.async.queue.consumer" queue="mixed.sync.and.async.queue"/>
+    <consumer name="mtmh.queue.1.consumer" queue="mtmh.queue.1" handler="Magento\TestModuleAsyncAmqp\Model\CustomHandler::processMixed"/>
+    <consumer name="mtmh.queue.2.consumer" queue="mtmh.queue.2"/>
+
+    <consumer name="wildcard.queue.one.consumer" queue="wildcard.queue.one" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodOne"/>
+    <consumer name="wildcard.queue.two.consumer" queue="wildcard.queue.two" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodTwo"/>
+    <consumer name="wildcard.queue.three.consumer" queue="wildcard.queue.three" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodThree"/>
+    <consumer name="wildcard.queue.four.consumer" queue="wildcard.queue.four" handler="Magento\TestModuleAsyncAmqp\Model\WildCardHandler::methodFour"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_publisher.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_publisher.xml
new file mode 100644
index 00000000000..c6ea325a4f9
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_publisher.xml
@@ -0,0 +1,19 @@
+<!--<?xml version="1.0"?>-->
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+    <publisher topic="multi.topic.queue.topic.c"/>
+    <publisher topic="multi.topic.queue.topic.d"/>
+    <publisher topic="multi.topic.queue.topic.y"/>
+    <publisher topic="multi.topic.queue.topic.z"/>
+    <publisher topic="mtmh.topic.1"/>
+    <publisher topic="mtmh.topic.2"/>
+
+    <publisher topic="segment1.segment2.segment3.wildcard"/>
+    <publisher topic="segment2.segment3.wildcard"/>
+    <publisher topic="not.matching.wildcard.topic"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_topology.xml b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_topology.xml
new file mode 100644
index 00000000000..a4aa46e7fad
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/etc/queue_topology.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+    <exchange name="magento" connection="amqp" type="topic">
+        <binding id="async.binding1" topic="multi.topic.queue.topic.c" destinationType="queue" destination="queue.for.multiple.topics.test.c"/>
+        <binding id="async.binding2" topic="multi.topic.queue.topic.c" destinationType="queue" destination="mixed.sync.and.async.queue"/>
+        <binding id="async.binding3" topic="multi.topic.queue.topic.d" destinationType="queue" destination="queue.for.multiple.topics.test.d"/>
+        <binding id="async.binding4" topic="mtmh.topic.1" destinationType="queue" destination="mtmh.queue.1"/>
+        <binding id="async.binding5" topic="mtmh.topic.1" destinationType="queue" destination="mtmh.queue.2"/>
+        <binding id="async.binding6" topic="mtmh.topic.2" destinationType="queue" destination="mtmh.queue.1"/>
+        <binding id="async.binding7" topic="mtmh.topic.2" destinationType="queue" destination="mtmh.queue.2"/>
+        <binding id="async.binding8" topic="multi.topic.queue.topic.y" destinationType="queue" destination="queue.for.multiple.topics.test.y"/>
+        <binding id="async.binding9" topic="multi.topic.queue.topic.z" destinationType="queue" destination="queue.for.multiple.topics.test.z"/>
+
+        <binding id="wildCardBinding1" topic="#.wildcard" destinationType="queue" destination="wildcard.queue.one"/>
+        <binding id="wildCardBinding2" topic="*.*.segment3.wildcard" destinationType="queue" destination="wildcard.queue.two"/>
+        <binding id="wildCardBinding3" topic="*.segment3.wildcard" destinationType="queue" destination="wildcard.queue.three"/>
+        <binding id="wildCardBinding4" topic="#.segment3.*" destinationType="queue" destination="wildcard.queue.four"/>
+    </exchange>
+</config>
+
+
+
+
diff --git a/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/registration.php b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/registration.php
new file mode 100644
index 00000000000..7f547277c5f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleAsyncAmqp/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleAsyncAmqp') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleAsyncAmqp', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json
new file mode 100644
index 00000000000..dd4cc648248
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/module-test-module-message-queue-config-override",
+    "description": "test module for message queue configuration",
+    "require": {
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "magento/framework": "100.1.*",
+        "magento/module-integration": "100.1.*"
+    },
+    "type": "magento2-module",
+    "version": "1.0",
+    "extra": {
+        "map": [
+            [
+                "*",
+                "Magento/TestModuleMessageQueueConfigOverride"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/module.xml
new file mode 100644
index 00000000000..7e355e75190
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleMessageQueueConfigOverride"  />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/queue_topology.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/queue_topology.xml
new file mode 100644
index 00000000000..bc746fbbec4
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/etc/queue_topology.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+    <exchange name="magento-topic-based-exchange1" connection="amqp">
+        <arguments>
+            <argument name="alternate-exchange" xsi:type="string">magento-log-exchange</argument>
+        </arguments>
+    </exchange>
+
+    <exchange name="magento-topic-based-exchange2" type="topic" connection="amqp">
+        <arguments>
+            <argument name="alternate-exchange" xsi:type="string">magento-log-exchange</argument>
+        </arguments>
+        <binding id="topicBasedRouting2">
+            <arguments>
+                <argument name="argument2" xsi:type="boolean">true</argument>
+                <argument name="argument3" xsi:type="number">150</argument>
+            </arguments>
+        </binding>
+    </exchange>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/registration.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/registration.php
new file mode 100644
index 00000000000..04fdd678514
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/registration.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleMessageQueueConfigOverride') === null) {
+    ComponentRegistrar::register(
+        ComponentRegistrar::MODULE,
+        'Magento_TestModuleMessageQueueConfigOverride',
+        __DIR__
+    );
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/AsyncHandler.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/AsyncHandler.php
new file mode 100644
index 00000000000..945dc9e801c
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/AsyncHandler.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleMessageQueueConfiguration;
+
+/**
+ * Class for testing asynchronous queue handlers.
+ *
+ * @SuppressWarnings(PHPMD)
+ */
+class AsyncHandler
+{
+    /**
+     * @param string
+     * @return void
+     */
+    public function methodWithStringParam($param)
+    {
+        return;
+    }
+
+    /**
+     * @param bool
+     * @return void
+     */
+    public function methodWithBoolParam($param)
+    {
+        return;
+    }
+
+    /**
+     * @param mixed
+     * @return void
+     */
+    public function methodWithMixedParam($param)
+    {
+        return;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerOne.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerOne.php
new file mode 100644
index 00000000000..db85053299e
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerOne.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleMessageQueueConfiguration;
+
+/**
+ * Class for testing queue handlers.
+ */
+class HandlerOne
+{
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodOne()
+    {
+        return true;
+    }
+
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodTwo()
+    {
+        return true;
+    }
+
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodThree()
+    {
+        return true;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerTwo.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerTwo.php
new file mode 100644
index 00000000000..ef62089ad8c
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/HandlerTwo.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleMessageQueueConfiguration;
+
+/**
+ * Class for testing queue handlers.
+ */
+class HandlerTwo
+{
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodOne()
+    {
+        return true;
+    }
+
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodTwo()
+    {
+        return true;
+    }
+
+    /**
+     * Return true.
+     *
+     * @return bool
+     */
+    public function handlerMethodThree()
+    {
+        return true;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/SyncHandler.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/SyncHandler.php
new file mode 100644
index 00000000000..801729072ca
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/SyncHandler.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleMessageQueueConfiguration;
+
+/**
+ * Class for testing synchronous queue handlers.
+ */
+class SyncHandler
+{
+    /**
+     * @param string
+     * @return string
+     */
+    public function methodWithStringParam($param)
+    {
+        return 'Processed: ' . $param;
+    }
+
+    /**
+     * @param bool
+     * @return bool
+     */
+    public function methodWithBoolParam($param)
+    {
+        return !$param;
+    }
+
+    /**
+     * @param mixed
+     * @return mixed
+     */
+    public function methodWithMixedParam($param)
+    {
+        return $param;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json
new file mode 100644
index 00000000000..9cc4af3df9f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/module-test-module-message-queue-configuration",
+    "description": "test module for message queue configuration",
+    "require": {
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "magento/framework": "100.1.*",
+        "magento/module-integration": "100.1.*"
+    },
+    "type": "magento2-module",
+    "version": "1.0",
+    "extra": {
+        "map": [
+            [
+                "*",
+                "Magento/TestModuleMessageQueueConfiguration"
+            ]
+        ]
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/communication.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/communication.xml
new file mode 100644
index 00000000000..2c2c9f8be09
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/communication.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
+    <topic name="deprecated.config.async.bool.topic" request="bool">
+        <handler name="handler1" type="Magento\TestModuleMessageQueueConfiguration\AsyncHandler" method="methodWithBoolParam"/>
+        <handler name="handler2" type="Magento\TestModuleMessageQueueConfiguration\AsyncHandler" method="methodWithMixedParam"/>
+    </topic>
+    <topic name="deprecated.config.async.string.topic" request="string"/>
+    <topic name="deprecated.config.sync.string.topic" request="string" response="string">
+        <handler name="handler1" type="Magento\TestModuleMessageQueueConfiguration\SyncHandler" method="methodWithStringParam"/>
+    </topic>
+    <topic name="deprecated.config.sync.bool.topic" schema="Magento\TestModuleMessageQueueConfiguration\SyncHandler::methodWithBoolParam">
+        <handler name="handler1" type="Magento\TestModuleMessageQueueConfiguration\SyncHandler" method="methodWithBoolParam"/>
+    </topic>
+    <topic name="overlapping.topic.declaration" request="string">
+        <handler name="handler1" type="Magento\TestModuleMessageQueueConfiguration\AsyncHandler" method="methodWithStringParam"/>
+    </topic>
+    <topic name="anotherTopic1" request="string"/>
+    <topic name="anotherTopic2" request="string"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/module.xml
new file mode 100644
index 00000000000..b49cdec747d
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/module.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleMessageQueueConfiguration" >
+    </module>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue.xml
new file mode 100644
index 00000000000..7bd099710a1
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+    <broker topic="deprecated.config.async.string.topic">
+        <queue consumer="deprecatedConfigAsyncStringConsumer" name="deprecated.config.queue.1" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" maxMessages="200"/>
+        <queue consumer="deprecatedConfigAsyncMixedConsumer" name="deprecated.config.queue.3" handler="Magento\TestModuleMessageQueueConfiguration\AsyncHandler::methodWithMixedParam"/>
+    </broker>
+    <broker topic="deprecated.config.async.bool.topic" type="db" exchange="deprecatedExchange">
+        <queue consumer="deprecatedConfigAsyncBoolConsumer" name="deprecated.config.queue.2" />
+    </broker>
+    <broker topic="deprecated.config.sync.bool.topic" type="amqp" exchange="customExchange">
+        <queue consumer="deprecatedConfigSyncBoolConsumer" name="deprecated.config.queue.4"/>
+    </broker>
+    <broker topic="overlapping.topic.declaration" type="amqp" exchange="overlappingDeprecatedExchange">
+        <queue consumer="overlappingConsumerDeclaration" name="consumer.config.queue" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" maxMessages="222" handler="Magento\TestModuleMessageQueueConfiguration\AsyncHandler::methodWithMixedParam"/>
+    </broker>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_consumer.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_consumer.xml
new file mode 100644
index 00000000000..47be546a1d7
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_consumer.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+    <consumer name="consumer1" queue="queue1" handler="Magento\TestModuleMessageQueueConfiguration\HandlerOne::handlerMethodOne" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" connection="amqp" maxMessages="100"/>
+    <consumer name="consumer2" queue="queue2" handler="Magento\TestModuleMessageQueueConfiguration\HandlerOne::handlerMethodTwo" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" connection="db"/>
+    <consumer name="consumer3" queue="queue3" handler="Magento\TestModuleMessageQueueConfiguration\HandlerTwo::handlerMethodOne" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer"/>
+    <consumer name="consumer4" queue="queue4" handler="Magento\TestModuleMessageQueueConfiguration\HandlerOne::handlerMethodOne"/>
+    <consumer name="consumer5" queue="queue5"/>
+    <consumer name="overlappingConsumerDeclaration" queue="consumer.config.queue" connection="amqp"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_publisher.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_publisher.xml
new file mode 100644
index 00000000000..9d86e065e05
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_publisher.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+    <publisher topic="topic.message.queue.config.01">
+        <connection name="amqp" exchange="magento2" />
+        <connection name="db" exchange="magento2" disabled="true" />
+    </publisher>
+    <publisher topic="topic.message.queue.config.02">
+        <connection name="amqp" exchange="magento2" disabled="true"/>
+        <connection name="db" exchange="magento2" disabled="true" />
+    </publisher>
+    <publisher topic="topic.message.queue.config.03" disabled="true" />
+    <publisher topic="topic.message.queue.config.04">
+        <connection name="amqp" />
+    </publisher>
+    <publisher topic="overlapping.topic.declaration"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_topology.xml b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_topology.xml
new file mode 100644
index 00000000000..9b72e7d2e5d
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_topology.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+    <exchange name="magento-topic-based-exchange1" type="topic" connection="amqp">
+        <binding id="topicBasedRouting1" topic="anotherTopic1" destinationType="queue" destination="topic-queue1">
+            <arguments>
+                <argument name="argument1" xsi:type="string">value</argument>
+            </arguments>
+        </binding>
+    </exchange>
+
+    <exchange name="magento-topic-based-exchange2" connection="amqp">
+        <binding id="topicBasedRouting2" topic="anotherTopic2" destination="topic-queue2" destinationType="queue">
+            <arguments>
+                <argument name="argument1" xsi:type="string">value</argument>
+            </arguments>
+        </binding>
+        <arguments>
+            <argument name="arrayValue" xsi:type="array">
+                <item name="element01" xsi:type="string">10</item>
+                <item name="element02" xsi:type="string">20</item>
+            </argument>
+        </arguments>
+    </exchange>
+
+    <exchange name="magento-topic-based-exchange3" type="topic" connection="amqp" autoDelete="true" durable="false" internal="true" />
+
+    <exchange name="magento-topic-based-exchange4" type="topic" connection="amqp">
+        <binding id="wildcard1" destination="topic-queue1" destinationType="queue" topic="#">
+            <arguments>
+                <argument name="test" xsi:type="string">one</argument>
+            </arguments>
+        </binding>
+        <binding id="wildcard2" destination="topic-queue2" destinationType="queue" topic="*.*.*" />
+    </exchange>
+
+    <exchange name="overlappingDeprecatedExchange" type="topic" connection="amqp">
+        <binding id="binding1" topic="overlapping.topic.declaration" destinationType="queue" destination="topology.config.queue" />
+        <binding id="binding2" topic="deprecated.config.async.string.topic" destinationType="queue" destination="topology.config.queue" />
+    </exchange>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/registration.php b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/registration.php
new file mode 100644
index 00000000000..eaffb9c79bb
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleMessageQueueConfiguration') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleMessageQueueConfiguration', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Api/ServiceInterface.php b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Api/ServiceInterface.php
new file mode 100644
index 00000000000..71438473a7b
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Api/ServiceInterface.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleSynchronousAmqp\Api;
+
+interface ServiceInterface
+{
+    /**
+     * @param string $simpleDataItem
+     * @return string
+     */
+    public function execute($simpleDataItem);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Model/RpcRequestHandler.php b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Model/RpcRequestHandler.php
new file mode 100644
index 00000000000..4c4279a0968
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/Model/RpcRequestHandler.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestModuleSynchronousAmqp\Model;
+
+class RpcRequestHandler
+{
+    /**
+     * @param string $simpleDataItem
+     * @return string
+     */
+    public function process($simpleDataItem)
+    {
+        return $simpleDataItem . ' processed by RPC handler';
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/communication.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/communication.xml
new file mode 100644
index 00000000000..87e1dde456a
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/communication.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
+    <topic name="synchronous.rpc.test.deprecated" request="string" response="string">
+        <handler name="processRpcRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+    <topic name="synchronous.rpc.test" request="string" response="string">
+        <handler name="processRpcRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+    <topic name="magento.testModuleSynchronousAmqp.api.serviceInterface.execute" schema="Magento\TestModuleSynchronousAmqp\Api\ServiceInterface::execute">
+        <handler name="processRemoteRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+    <topic name="sync.topic.for.mixed.sync.and.async.queue" request="string" response="string">
+        <handler name="processRpcRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.a" request="string" response="string">
+        <handler name="processRpcRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+    <topic name="multi.topic.queue.topic.b" request="string" response="string">
+        <handler name="processRpcRequest" type="Magento\TestModuleSynchronousAmqp\Model\RpcRequestHandler" method="process"/>
+    </topic>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/di.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/di.xml
new file mode 100644
index 00000000000..83b9a2d985f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/di.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\TestModuleSynchronousAmqp\Api\ServiceInterface" type="Magento\TestModuleSynchronousAmqp\Api\ServiceInterfaceRemote" />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/module.xml
new file mode 100644
index 00000000000..d84a61380c6
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestModuleSynchronousAmqp"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue.xml
new file mode 100644
index 00000000000..ec196a6e3b7
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+    <broker topic="synchronous.rpc.test.deprecated" type="amqp" exchange="magento">
+        <queue consumer="synchronousRpcTestConsumer.deprecated" name="synchronous.rpc.test.deprecated" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+    </broker>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_consumer.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_consumer.xml
new file mode 100644
index 00000000000..6f9cc0fa758
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_consumer.xml
@@ -0,0 +1,14 @@
+<!--<?xml version="1.0"?>-->
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+    <consumer name="synchronousRpcTestConsumer" queue="synchronous.rpc.test" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+    <consumer name="RemoteServiceTestConsumer" queue="queue.magento.testModuleSynchronousAmqp.api.serviceInterface.execute" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+    <consumer name="mixed.sync.and.async.queue.consumer" queue="mixed.sync.and.async.queue" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+    <consumer name="queue.for.multiple.topics.test.a" queue="synchronous.rpc.test" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+    <consumer name="queue.for.multiple.topics.test.b" queue="synchronous.rpc.test" consumerInstance="Magento\Framework\MessageQueue\Rpc\Consumer"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_publisher.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_publisher.xml
new file mode 100644
index 00000000000..0d1e3b6850a
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_publisher.xml
@@ -0,0 +1,14 @@
+<!--<?xml version="1.0"?>-->
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+    <publisher topic="synchronous.rpc.test"/>
+    <publisher topic="magento.testModuleSynchronousAmqp.api.serviceInterface.execute"/>
+    <publisher topic="sync.topic.for.mixed.sync.and.async.queue"/>
+    <publisher topic="multi.topic.queue.topic.a"/>
+    <publisher topic="multi.topic.queue.topic.b"/>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_topology.xml b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_topology.xml
new file mode 100644
index 00000000000..d16636b2522
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/etc/queue_topology.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+    <exchange name="magento" connection="amqp" type="topic">
+        <binding id="sync.binding1" topic="synchronous.rpc.test" destinationType="queue" destination="synchronous.rpc.test"/>
+        <binding id="sync.binding2" topic="magento.testModuleSynchronousAmqp.api.serviceInterface.execute" destinationType="queue" destination="queue.magento.testModuleSynchronousAmqp.api.serviceInterface.execute"/>
+        <binding id="sync.binding3" topic="sync.topic.for.mixed.sync.and.async.queue" destinationType="queue" destination="mixed.sync.and.async.queue"/>
+        <binding id="sync.binding4" topic="multi.topic.queue.topic.a" destinationType="queue" destination="synchronous.rpc.test"/>
+        <binding id="sync.binding5" topic="multi.topic.queue.topic.b" destinationType="queue" destination="synchronous.rpc.test"/>
+    </exchange>
+</config>
+
+
+
+
diff --git a/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/registration.php b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/registration.php
new file mode 100644
index 00000000000..6260921e0fb
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSynchronousAmqp/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleSynchronousAmqp') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleSynchronousAmqp', __DIR__);
+}
diff --git a/dev/tests/integration/bin/magento b/dev/tests/integration/bin/magento
new file mode 100755
index 00000000000..303fbfb217d
--- /dev/null
+++ b/dev/tests/integration/bin/magento
@@ -0,0 +1,42 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+if (PHP_SAPI !== 'cli') {
+    echo 'bin/magento must be run as a CLI application';
+    exit(1);
+}
+
+if (isset($_SERVER['INTEGRATION_TEST_PARAMS'])) {
+    parse_str($_SERVER['INTEGRATION_TEST_PARAMS'], $params);
+    foreach ($params as $paramName => $paramValue) {
+        $_SERVER[$paramName] = $paramValue;
+    }
+} else {
+    echo 'Test parameters are required';
+    exit(1);
+}
+
+try {
+    require $_SERVER['MAGE_DIRS']['base']['path'] . '/app/bootstrap.php';
+} catch (\Exception $e) {
+    echo 'Autoload error: ' . $e->getMessage();
+    exit(1);
+}
+try {
+    $handler = new \Magento\Framework\App\ErrorHandler();
+    set_error_handler([$handler, 'handler']);
+    $application = new Magento\Framework\Console\Cli('Magento CLI');
+    $application->run();
+} catch (\Exception $e) {
+    while ($e) {
+        echo $e->getMessage();
+        echo $e->getTraceAsString();
+        echo "\n\n";
+        $e = $e->getPrevious();
+    }
+    exit(Cli::RETURN_FAILURE);
+}
diff --git a/dev/tests/integration/etc/install-config-mysql.php.dist b/dev/tests/integration/etc/install-config-mysql.php.dist
index 512930ab95f..4766048c623 100644
--- a/dev/tests/integration/etc/install-config-mysql.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.php.dist
@@ -16,4 +16,8 @@ return [
     'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
     'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
     'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
+    'amqp-host' => 'localhost',
+    'amqp-port' => '5672',
+    'amqp-user' => 'guest',
+    'amqp-password' => 'guest',
 ];
diff --git a/dev/tests/integration/etc/install-config-mysql.travis.php.dist b/dev/tests/integration/etc/install-config-mysql.travis.php.dist
index 5abe9483317..8c41b0a0f26 100644
--- a/dev/tests/integration/etc/install-config-mysql.travis.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.travis.php.dist
@@ -16,4 +16,8 @@ return [
     'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
     'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
     'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
+    'amqp-host' => 'localhost',
+    'amqp-port' => '5672',
+    'amqp-user' => 'guest',
+    'amqp-password' => 'guest',
 ];
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php
new file mode 100644
index 00000000000..ab209ab21ad
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Helper;
+
+use Magento\Framework\HTTP\Client\Curl;
+
+/**
+ * Helper class to access RabbitMQ server configuration
+ */
+class Amqp
+{
+    /**
+     * @var Curl
+     */
+    private $curl;
+
+    /**
+     * RabbitMQ API host
+     *
+     * @var string
+     */
+    private $host = 'http://localhost:15672/api/';
+
+    /**
+     * Initialize dependencies.
+     */
+    public function __construct()
+    {
+        $this->curl = new Curl();
+        $this->curl->setCredentials('guest', 'guest');
+        $this->curl->addHeader('content-type', 'application/json');
+    }
+
+    /**
+     * Get declared exchanges.
+     *
+     * @return array
+     */
+    public function getExchanges()
+    {
+        $this->curl->get($this->host . 'exchanges');
+        $data = $this->curl->getBody();
+        $data = json_decode($data, true);
+        $output = [];
+        foreach ($data as $value) {
+            $output[$value['name']] = $value;
+        }
+        return $output;
+    }
+
+    /**
+     * Get declared exchange bindings.
+     *
+     * @return array
+     */
+    public function getExchangeBindings($name)
+    {
+        $this->curl->get($this->host . 'exchanges/%2f/' . $name . '/bindings/source');
+        $data = $this->curl->getBody();
+        return json_decode($data, true);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/dev/tests/integration/testsuite/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
new file mode 100644
index 00000000000..63ebbcbc2c9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Analytics\Block\Adminhtml\System\Config;
+
+use Magento\Framework\Data\FormFactory;
+use Magento\Framework\Data\Form\Element\TimeFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for CollectionTimeLabel block.
+ */
+class CollectionTimeLabelTest extends TestCase
+{
+    /**
+     * Test render will add comment considering config locale(default en_US).
+     *
+     * @magentoAppIsolation enabled
+     */
+    public function testRenderWithDefaultLocale()
+    {
+        $result = $this->render();
+        $this->assertRegExp('/<span>Pacific Standard Time/', $result);
+    }
+
+    /**
+     * Test render will add comment considering config locale(non-default de_DE).
+     *
+     * @magentoConfigFixture default_store general/locale/code de_DE
+     * @magentoAppIsolation enabled
+     */
+    public function testRenderWithNonDefaultLocale()
+    {
+        $result = $this->render();
+        $this->assertRegExp('/<span>Nordamerikanische Westküsten-Normalzeit/', $result);
+    }
+
+    /**
+     * Render 'time' element.
+     *
+     * @return string
+     */
+    private function render()
+    {
+        $collectionTimeLabel = Bootstrap::getObjectManager()->get(CollectionTimeLabelFactory::class)->create();
+        $form = Bootstrap::getObjectManager()->get(FormFactory::class)->create();
+        $element = Bootstrap::getObjectManager()->get(TimeFactory::class)->create();
+        $element->setForm($form);
+
+        return $collectionTimeLabel->render($element);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
new file mode 100644
index 00000000000..5ecc274c5bb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\MessageQueue\BulkPublisherInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BulkManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit\Framework\MockObject_MockObject
+     */
+    private $publisherMock;
+
+    /**
+     * @var BulkManagement
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->publisherMock = $this->createMock(BulkPublisherInterface::class);
+
+        $this->model = $this->objectManager->create(
+            BulkManagement::class,
+            [
+                'publisher' => $this->publisherMock
+            ]
+        );
+    }
+
+    public function testScheduleBulk()
+    {
+        // general bulk information
+        $bulkUuid = '5a12c1bd-a8b5-41d4-8c00-3f5bcaa6d3c7';
+        $bulkDescription = 'Bulk General Information';
+        $topicName = 'example.topic.name';
+        $userId = 1;
+
+        // generate bulk operations that must be saved
+        $operationCount = 100;
+        $operations = [];
+        $operationFactory = $this->objectManager->get(OperationInterfaceFactory::class);
+        for ($index = 0; $index < $operationCount; $index++) {
+            /** @var OperationInterface $operation */
+            $operation = $operationFactory->create();
+            $operation->setBulkUuid($bulkUuid);
+            $operation->setTopicName($topicName);
+            $operation->setSerializedData(json_encode(['entity_id' => $index]));
+            $operations[] = $operation;
+        }
+
+        $this->publisherMock->expects($this->once())
+            ->method('publish')
+            ->with($topicName, $operations);
+
+        // schedule bulk
+        $this->assertTrue($this->model->scheduleBulk($bulkUuid, $operations, $bulkDescription, $userId));
+        $storedData = $this->getStoredOperationData();
+        // No operations should be saved to database during bulk creation
+        $this->assertCount(0, $storedData);
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testRetryBulk()
+    {
+        $bulkUuid = 'bulk-uuid-5';
+        $topicName = 'topic-4';
+        $errorCodes = [1111, 2222];
+        $operations = $this->objectManager->get(CollectionFactory::class)
+            ->create()
+            ->addFieldToFilter('bulk_uuid', ['eq' => $bulkUuid])
+            ->getItems();
+        foreach ($operations as $operation) {
+            $operation->setId(null);
+        }
+        $this->publisherMock->expects($this->once())
+            ->method('publish')
+            ->with($topicName, array_values($operations));
+        $this->assertEquals(2, $this->model->retryBulk($bulkUuid, $errorCodes));
+
+        $operations = $this->objectManager->get(CollectionFactory::class)
+            ->create()
+            ->addFieldToFilter('bulk_uuid', ['eq' => $bulkUuid])
+            ->getItems();
+        // Failed operations should be removed from database during bulk retry
+        $this->assertCount(0, $operations);
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testDeleteBulk()
+    {
+        $this->model->deleteBulk('bulk-uuid-1');
+
+        /** @var EntityManager $entityManager */
+        $entityManager = $this->objectManager->get(EntityManager::class);
+        $bulkSummaryFactory = $this->objectManager->get(BulkSummaryInterfaceFactory::class);
+        /** @var BulkSummaryInterface $bulkSummary */
+        $bulkSummary = $entityManager->load($bulkSummaryFactory->create(), 'bulk-uuid-1');
+        $this->assertNull($bulkSummary->getBulkId());
+    }
+
+    /**
+     * Retrieve stored operation data
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private function getStoredOperationData()
+    {
+        /** @var MetadataPool $metadataPool */
+        $metadataPool = $this->objectManager->get(MetadataPool::class);
+        $operationMetadata = $metadataPool->getMetadata(OperationInterface::class);
+        /** @var ResourceConnection $resourceConnection */
+        $resourceConnection = $this->objectManager->get(ResourceConnection::class);
+        $connection = $resourceConnection->getConnectionByName($operationMetadata->getEntityConnectionName());
+
+        return $connection->fetchAll($connection->select()->from($operationMetadata->getEntityTable()));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkNotificationManagementTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkNotificationManagementTest.php
new file mode 100644
index 00000000000..f8a349e04c2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkNotificationManagementTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\ObjectManagerInterface;
+
+class BulkNotificationManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var BulkNotificationManagement
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->model = $this->objectManager->create(
+            BulkNotificationManagement::class
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testAcknowledgeBulks()
+    {
+        $this->model->acknowledgeBulks(['bulk-uuid-5']);
+
+        $acknowledgedBulks = $this->model->getAcknowledgedBulksByUser(1);
+        $this->assertCount(1, $acknowledgedBulks);
+        /** @var BulkSummaryInterface $acknowledgedBulk */
+        $acknowledgedBulk = array_pop($acknowledgedBulks);
+        $this->assertEquals('bulk-uuid-5', $acknowledgedBulk->getBulkId());
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/acknowledged_bulk.php
+     */
+    public function testIgnoreBulks()
+    {
+        // 'bulk-uuid-5' and 'bulk-uuid-4' are marked as acknowledged in fixture
+        $this->model->ignoreBulks(['bulk-uuid-5']);
+
+        $acknowledgedBulks = $this->model->getAcknowledgedBulksByUser(1);
+        $this->assertCount(1, $acknowledgedBulks);
+        /** @var BulkSummaryInterface $acknowledgedBulk */
+        $acknowledgedBulk = array_pop($acknowledgedBulks);
+        $this->assertEquals('bulk-uuid-4', $acknowledgedBulk->getBulkId());
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/acknowledged_bulk.php
+     */
+    public function testGetAcknowledgedBulks()
+    {
+        // 'bulk-uuid-5' and 'bulk-uuid-4' are marked as acknowledged in fixture
+        $acknowledgedBulks = $this->model->getAcknowledgedBulksByUser(1);
+        $this->assertCount(2, $acknowledgedBulks);
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/acknowledged_bulk.php
+     */
+    public function testGetIgnoredBulks()
+    {
+        // 'bulk-uuid-5' and 'bulk-uuid-4' are marked as acknowledged in fixture. Fixture creates 5 bulks in total.
+        $ignoredBulks = $this->model->getIgnoredBulksByUser(1);
+        $this->assertCount(3, $ignoredBulks);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkStatusTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkStatusTest.php
new file mode 100644
index 00000000000..a7857bd7a2f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkStatusTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+
+class BulkStatusTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkStatus
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\AsynchronousOperations\Model\BulkStatus::class
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testGetBulkStatus()
+    {
+        $this->assertEquals(BulkSummaryInterface::NOT_STARTED, $this->model->getBulkStatus('bulk-uuid-1'));
+        $this->assertEquals(BulkSummaryInterface::IN_PROGRESS, $this->model->getBulkStatus('bulk-uuid-2'));
+        $this->assertEquals(BulkSummaryInterface::FINISHED_SUCCESSFULLY, $this->model->getBulkStatus('bulk-uuid-4'));
+        $this->assertEquals(BulkSummaryInterface::FINISHED_WITH_FAILURE, $this->model->getBulkStatus('bulk-uuid-5'));
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testGetBulksByUser()
+    {
+        /** @var \Magento\AsynchronousOperations\Model\BulkSummary[] $bulks */
+        $bulksUuidArray = ['bulk-uuid-1', 'bulk-uuid-2', 'bulk-uuid-3', 'bulk-uuid-4', 'bulk-uuid-5'];
+        $bulks =  $this->model->getBulksByUser(1);
+        $this->assertEquals(5, count($bulks));
+        foreach ($bulks as $bulk) {
+            $this->assertTrue(in_array($bulk->getBulkId(), $bulksUuidArray));
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testGetFailedOperationsByBulkId()
+    {
+        /** @var  \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $operations */
+        $operations =  $this->model->getFailedOperationsByBulkId('bulk-uuid-1');
+        $this->assertEquals([], $operations);
+        $operations =  $this->model->getFailedOperationsByBulkId('bulk-uuid-5', 3);
+        foreach ($operations as $operation) {
+            $this->assertEquals(1111, $operation->getErrorCode());
+        }
+        $operations =  $this->model->getFailedOperationsByBulkId('bulk-uuid-5', 2);
+        foreach ($operations as $operation) {
+            $this->assertEquals(2222, $operation->getErrorCode());
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/OperationManagementTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/OperationManagementTest.php
new file mode 100644
index 00000000000..a9933966e5b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/OperationManagementTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+use Magento\Framework\EntityManager\EntityManager;
+
+class OperationManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Model\OperationManagement
+     */
+    private $model;
+
+    /**
+     * @var \Magento\AsynchronousOperations\Model\BulkStatus
+     */
+    private $bulkStatusManagement;
+
+    /**
+     * @var OperationInterfaceFactory
+     */
+    private $operationFactory;
+
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    protected function setUp()
+    {
+        $this->model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\AsynchronousOperations\Model\OperationManagement::class
+        );
+        $this->bulkStatusManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\AsynchronousOperations\Model\BulkStatus::class
+        );
+
+        $this->operationFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            OperationInterfaceFactory::class
+        );
+        $this->entityManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            EntityManager::class
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     */
+    public function testGetBulkStatus()
+    {
+        $operations =  $this->bulkStatusManagement->getFailedOperationsByBulkId('bulk-uuid-5', 3);
+        if (empty($operations)) {
+            $this->fail('Operation doesn\'t exist');
+        }
+        /** @var OperationInterface $operation */
+        $operation = array_shift($operations);
+        $operationId = $operation->getId();
+
+        $this->assertTrue($this->model->changeOperationStatus($operationId, OperationInterface::STATUS_TYPE_OPEN));
+
+        /** @var OperationInterface $updatedOperation */
+        $updatedOperation = $this->operationFactory->create();
+        $this->entityManager->load($updatedOperation, $operationId);
+        $this->assertEquals(OperationInterface::STATUS_TYPE_OPEN, $updatedOperation->getStatus());
+        $this->assertEquals(null, $updatedOperation->getResultMessage());
+        $this->assertEquals(null, $updatedOperation->getSerializedData());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResultTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResultTest.php
new file mode 100644
index 00000000000..64077eeb18b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Failed/SearchResultTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Failed;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class SearchResultTest
+ */
+class SearchResultTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     * @magentoDbIsolation enabled
+     * @magentoAppArea adminhtml
+     */
+    public function testGetItems()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $request = $objectManager->get(\Magento\Framework\App\RequestInterface::class);
+        $requestData = [
+            'uuid' => 'bulk-uuid-5',
+        ];
+
+        $request->setParams($requestData);
+
+        /** @var \Magento\AsynchronousOperations\Ui\Component\DataProvider\SearchResult $searchResult */
+        $searchResult = $objectManager->create(
+            \Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Failed\SearchResult::class
+        );
+        $this->assertEquals(1, $searchResult->getTotalCount());
+        $expected = $searchResult->getItems();
+        $expectedItem = array_shift($expected);
+        $this->assertEquals('Test', $expectedItem->getMetaInformation());
+        $this->assertEquals('5', $expectedItem->getEntityId());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResultTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResultTest.php
new file mode 100644
index 00000000000..6e0afaf1287
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/Operation/Retriable/SearchResultTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class SearchResultTest
+ */
+class SearchResultTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     * @magentoDbIsolation enabled
+     * @magentoAppArea adminhtml
+     */
+    public function testGetTotalCount()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $requestData = [
+            'uuid' => 'bulk-uuid-5',
+        ];
+        $request = $objectManager->get(\Magento\Framework\App\RequestInterface::class);
+        $request->setParams($requestData);
+
+        /**
+         * @var \Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable\SearchResult $searchResult
+         */
+        $searchResult = $objectManager->create(
+            \Magento\AsynchronousOperations\Ui\Component\DataProvider\Operation\Retriable\SearchResult::class
+        );
+        $this->assertEquals(1, $searchResult->getTotalCount());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResultTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResultTest.php
new file mode 100644
index 00000000000..852308e83c2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResultTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Ui\Component\DataProvider;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class SearchResultTest
+ */
+class SearchResultTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/AsynchronousOperations/_files/bulk.php
+     * @magentoDbIsolation enabled
+     * @magentoAppArea adminhtml
+     */
+    public function testGetAllIds()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $user = $objectManager->create(\Magento\User\Model\User::class);
+        $user->loadByUsername(\Magento\TestFramework\Bootstrap::ADMIN_NAME);
+        $session = $objectManager->get(\Magento\Backend\Model\Auth\Session::class);
+        $session->setUser($user);
+
+        /** @var \Magento\AsynchronousOperations\Ui\Component\DataProvider\SearchResult $searchResult */
+        $searchResult = $objectManager->create(
+            \Magento\AsynchronousOperations\Ui\Component\DataProvider\SearchResult::class
+        );
+        $this->assertEquals(5, $searchResult->getTotalCount());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk.php
new file mode 100644
index 00000000000..2b5c286a283
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+require __DIR__ . '/bulk.php';
+
+$acknowledgedBulkTable = $resource->getTableName('magento_acknowledged_bulk');
+$acknowledgedBulkQuery = "INSERT INTO {$acknowledgedBulkTable} (`bulk_uuid`) VALUES ('bulk-uuid-4'), ('bulk-uuid-5');";
+$connection->query($acknowledgedBulkQuery);
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk_rollback.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk_rollback.php
new file mode 100644
index 00000000000..24fa9cfd4f4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/acknowledged_bulk_rollback.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// when bulks are removed, acknowledged bulk table will be cleared too.
+require __DIR__ . '/bulk_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php
new file mode 100644
index 00000000000..787d2c10a44
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Bulk\OperationInterface;
+
+/**
+ * @var $resource Magento\Framework\App\ResourceConnection
+ */
+$resource = Bootstrap::getObjectManager()->get(\Magento\Framework\App\ResourceConnection::class);
+$connection = $resource->getConnection();
+$bulkTable = $resource->getTableName('magento_bulk');
+$operationTable = $resource->getTableName('magento_operation');
+
+$bulks = [
+    'not_started' => [
+        'uuid' => 'bulk-uuid-1',
+        'user_id' => 1,
+        'description' => 'Bulk Description',
+        'operation_count' => 1,
+    ],
+    'in_progress_success' => [
+        'uuid' => 'bulk-uuid-2',
+        'user_id' => 1,
+        'description' => 'Bulk Description',
+        'operation_count' => 3,
+    ],
+    'in_progress_failed' => [
+        'uuid' => 'bulk-uuid-3',
+        'user_id' => 1,
+        'description' => 'Bulk Description',
+        'operation_count' => 2,
+    ],
+    'finish_success' => [
+        'uuid' => 'bulk-uuid-4',
+        'user_id' => 1,
+        'description' => 'Bulk Description',
+        'operation_count' => 1,
+    ],
+    'finish_failed' => [
+        'uuid' => 'bulk-uuid-5',
+        'user_id' => 1,
+        'description' => 'Bulk Description',
+        'operation_count' => 2,
+    ]
+];
+// Only processed operations are saved into database (i.e. operations that are not in 'open' state)
+$operations = [
+    [
+        'bulk_uuid' => 'bulk-uuid-2',
+        'topic_name' => 'topic-3',
+        'serialized_data' => json_encode(['entity_id' => 2]),
+        'status' => OperationInterface::STATUS_TYPE_COMPLETE,
+        'error_code' => null,
+        'result_message' => null,
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-3',
+        'topic_name' => 'topic-3',
+        'serialized_data' => json_encode(['entity_id' => 3]),
+        'status' => OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+        'error_code' => 1111,
+        'result_message' => 'Something went wrong during your request',
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-4',
+        'topic_name' => 'topic-4',
+        'serialized_data' => json_encode(['entity_id' => 4]),
+        'status' => OperationInterface::STATUS_TYPE_COMPLETE,
+        'error_code' => null,
+        'result_message' => null,
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-5',
+        'topic_name' => 'topic-4',
+        'serialized_data' => json_encode(['entity_id' => 5, 'meta_information' => 'Test']),
+        'status' => OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+        'error_code' => 1111,
+        'result_message' => 'Something went wrong during your request',
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-5',
+        'topic_name' => 'topic-4',
+        'serialized_data' => json_encode(['entity_id' => 5]),
+        'status' => OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+        'error_code' => 2222,
+        'result_message' => 'Entity with ID=4 does not exist',
+    ],
+
+];
+
+$bulkQuery = "INSERT INTO {$bulkTable} (`uuid`, `user_id`, `description`, `operation_count`)"
+    . " VALUES (:uuid, :user_id, :description, :operation_count);";
+foreach ($bulks as $bulk) {
+    $connection->query($bulkQuery, $bulk);
+}
+
+$operationQuery = "INSERT INTO {$operationTable}"
+    . " (`bulk_uuid`, `topic_name`, `serialized_data`, `status`, `error_code`, `result_message`)"
+    . " VALUES (:bulk_uuid, :topic_name, :serialized_data, :status, :error_code, :result_message);";
+foreach ($operations as $operation) {
+    $connection->query($operationQuery, $operation);
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk_rollback.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk_rollback.php
new file mode 100644
index 00000000000..e5e765ab45b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk_rollback.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @var $resource Magento\Framework\App\ResourceConnection
+ */
+$resource = Bootstrap::getObjectManager()->get(\Magento\Framework\App\ResourceConnection::class);
+$connection = $resource->getConnection();
+$bulkTable = $resource->getTableName('magento_bulk');
+
+$connection->query("DELETE FROM {$bulkTable};");
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 19923daf81c..4a3d5d2e28a 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
@@ -104,6 +104,18 @@ public function testBundleImport()
                 $optionSku = 'Simple ' . ($optionKey + 1 + $linkKey);
                 $this->assertEquals($optionIdList[$optionSku], $productLink->getData('entity_id'));
                 $this->assertEquals($optionSku, $productLink->getData('sku'));
+
+                switch ($optionKey + 1 + $linkKey) {
+                    case 1:
+                        $this->assertEquals(1, (int) $productLink->getCanChangeQuantity());
+                        break;
+                    case 2:
+                        $this->assertEquals(0, (int) $productLink->getCanChangeQuantity());
+                        break;
+                    case 3:
+                        $this->assertEquals(1, (int) $productLink->getCanChangeQuantity());
+                        break;
+                }
             }
         }
     }
diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle.csv b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle.csv
index 43e3d04c62e..fdb3f39327a 100644
--- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle.csv
+++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle.csv
@@ -2,4 +2,4 @@ sku,store_view_code,attribute_set_code,product_type,product_websites,name,produc
 Simple 1,,Default,simple,base,Simple 1,1,100,,1000,0,1,,,,,
 Simple 2,,Default,simple,base,Simple 2,1,200,,1000,0,1,,,,,
 Simple 3,,Default,simple,base,Simple 3,1,300,,1000,0,1,,,,,
-Bundle 1,,Default,bundle,base,Bundle 1,1,,shipment_type=separately,0,0,1,dynamic,dynamic,Price range,dynamic,"name=Option 1,type=checkbox,required=1,sku=Simple 1,price=0.0000,default=0,default_qty=1.0000,price_type=fixed|name=Option 2,type=checkbox,required=1,sku=Simple 2,price=0.0000,default=0,default_qty=1.0000,price_type=fixed|name=Option 2,type=checkbox,required=1,sku=Simple 3,price=0.0000,default=0,default_qty=1.0000,price_type=fixed"
+Bundle 1,,Default,bundle,base,Bundle 1,1,,shipment_type=separately,0,0,1,dynamic,dynamic,Price range,dynamic,"name=Option 1,type=checkbox,required=1,sku=Simple 1,price=0.0000,default=0,default_qty=1.0000,price_type=fixed,can_change_qty=1|name=Option 2,type=checkbox,required=1,sku=Simple 2,price=0.0000,default=0,default_qty=1.0000,price_type=fixed,can_change_qty=0|name=Option 2,type=checkbox,required=1,sku=Simple 3,price=0.0000,default=0,default_qty=1.0000,price_type=fixed"
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
index 17c0f451f90..f68e509e4a8 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
@@ -55,6 +55,10 @@ public function testToolbarCoverage()
         $parent = $this->_getLayout()->createBlock(\Magento\Catalog\Block\Product\ListProduct::class, 'parent');
 
         /* Prepare toolbar block */
+        $this->_getLayout()
+            ->createBlock(\Magento\Catalog\Block\Product\ProductList\Toolbar::class, 'product_list_toolbar');
+        $parent->setToolbarBlockName('product_list_toolbar');
+
         $toolbar = $parent->getToolbarBlock();
         $this->assertInstanceOf(\Magento\Catalog\Block\Product\ProductList\Toolbar::class, $toolbar, 'Default Toolbar');
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
index a118ae99d8a..186c6b8a92b 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
@@ -97,10 +97,16 @@ public function exportImportDataProvider()
             'simple-product-image' => [
                 [
                     'Magento/CatalogImportExport/Model/Import/_files/media_import_image.php',
-                    'Magento/Catalog/_files/product_with_image.php'
+                    'Magento/Catalog/_files/product_with_image.php',
                 ],
                 [
                     'simple',
+                ],
+                [
+                    "image",
+                    "small_image",
+                    "thumbnail",
+                    "media_gallery"
                 ]
             ],
             'simple-product-crosssell' => [
@@ -134,4 +140,32 @@ public function importReplaceDataProvider()
     {
         return $this->exportImportDataProvider();
     }
+
+    /**
+     * Fixing https://github.com/magento-engcom/import-export-improvements/issues/50 means that during import images
+     * can now get renamed for this we need to skip the attribute checking and instead check that the images contain
+     * the right beginning part of the name. When an image is named "magento_image.jpeg" but there is already an image
+     * with that name it will now become "magento_image_1.jpeg"
+     *
+     * @param \Magento\Catalog\Model\Product $expectedProduct
+     * @param \Magento\Catalog\Model\Product $actualProduct
+     */
+    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
+    {
+        if (!empty($actualProduct->getImage())
+            && !empty($expectedProduct->getImage())
+        ) {
+            $this->assertContains('magento_image', $actualProduct->getImage());
+        }
+        if (!empty($actualProduct->getSmallImage())
+            && !empty($expectedProduct->getSmallImage())
+        ) {
+            $this->assertContains('magento_image', $actualProduct->getSmallImage());
+        }
+        if (!empty($actualProduct->getThumbnail())
+            && !empty($expectedProduct->getThumbnail())
+        ) {
+            $this->assertContains('magento_image', $actualProduct->getThumbnail());
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
index 358742ae69e..f68f3cf37b0 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
@@ -142,7 +142,7 @@ private function loadConfig()
      * @magentoDbIsolation enabled
      * @dataProvider runLockDataProvider
      */
-    public function testRunLock($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
+    public function testRunLockEnv($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
     {
         $this->inputMock->expects($this->any())
             ->method('getArgument')
@@ -153,15 +153,15 @@ public function testRunLock($path, $value, $scope = ScopeConfigInterface::SCOPE_
         $this->inputMock->expects($this->any())
             ->method('getOption')
             ->willReturnMap([
-                [ConfigSetCommand::OPTION_LOCK, true],
+                [ConfigSetCommand::OPTION_LOCK_ENV, true],
                 [ConfigSetCommand::OPTION_SCOPE, $scope],
                 [ConfigSetCommand::OPTION_SCOPE_CODE, $scopeCode]
             ]);
         $this->outputMock->expects($this->exactly(2))
             ->method('writeln')
             ->withConsecutive(
-                ['<info>Value was saved and locked.</info>'],
-                ['<info>Value was saved and locked.</info>']
+                ['<info>Value was saved in app/etc/env.php and locked.</info>'],
+                ['<info>Value was saved in app/etc/env.php and locked.</info>']
             );
 
         /** @var ConfigSetCommand $command */
@@ -218,7 +218,7 @@ public function testRunExtended(
             [ConfigSetCommand::OPTION_SCOPE, $scope],
             [ConfigSetCommand::OPTION_SCOPE_CODE, $scopeCode]
         ];
-        $optionsLock = array_merge($options, [[ConfigSetCommand::OPTION_LOCK, true]]);
+        $optionsLock = array_merge($options, [[ConfigSetCommand::OPTION_LOCK_ENV, true]]);
 
         /** @var ConfigPathResolver $resolver */
         $resolver = $this->objectManager->get(ConfigPathResolver::class);
@@ -234,8 +234,8 @@ public function testRunExtended(
         );
         $this->assertSame(null, $this->arrayManager->get($configPath, $this->loadConfig()));
 
-        $this->runCommand($arguments, $optionsLock, '<info>Value was saved and locked.</info>');
-        $this->runCommand($arguments, $optionsLock, '<info>Value was saved and locked.</info>');
+        $this->runCommand($arguments, $optionsLock, '<info>Value was saved in app/etc/env.php and locked.</info>');
+        $this->runCommand($arguments, $optionsLock, '<info>Value was saved in app/etc/env.php and locked.</info>');
 
         $this->assertSame($value, $this->arrayManager->get($configPath, $this->loadConfig()));
     }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php
index b4a00d497f5..e28a9602b93 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php
@@ -65,10 +65,10 @@ public function testRenderingNewsletterBlock()
         $this->dispatch('backend/customer/index/edit');
         $body = $this->getResponse()->getBody();
 
-        $this->assertContains('<span>Newsletter Information<\/span>', $body);
-        $this->assertContains('<input id=\"_newslettersubscription\"', $body);
+        $this->assertContains('\u003Cspan\u003ENewsletter Information\u003C\/span\u003E', $body);
+        $this->assertContains('\u003Cinput id=\"_newslettersubscription\"', $body);
         $this->assertNotContains('checked="checked"', $body);
-        $this->assertContains('<span>Subscribed to Newsletter<\/span>', $body);
-        $this->assertContains('>No Newsletter Found<', $body);
+        $this->assertContains('\u003Cspan\u003ESubscribed to Newsletter\u003C\/span\u003E', $body);
+        $this->assertContains('\u003ENo Newsletter Found\u003C', $body);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
index a40a7c8ad29..3b006b50443 100644
--- a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
+++ b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
@@ -112,25 +112,27 @@ private function enableDebugging()
             ->getMockForAbstractClass();
         $this->outputMock = $this->getMockBuilder(OutputInterface::class)
             ->getMockForAbstractClass();
-        $this->inputMock->expects($this->exactly(2))
-            ->method('getArgument')
-            ->withConsecutive([ConfigSetCommand::ARG_PATH], [ConfigSetCommand::ARG_VALUE])
-            ->willReturnOnConsecutiveCalls('dev/debug/debug_logging', 1);
-        $this->inputMock->expects($this->exactly(3))
+        $this->inputMock->expects($this->exactly(4))
             ->method('getOption')
             ->withConsecutive(
+                [ConfigSetCommand::OPTION_LOCK_ENV],
+                [ConfigSetCommand::OPTION_LOCK_CONFIG],
                 [ConfigSetCommand::OPTION_SCOPE],
-                [ConfigSetCommand::OPTION_SCOPE_CODE],
-                [ConfigSetCommand::OPTION_LOCK]
+                [ConfigSetCommand::OPTION_SCOPE_CODE]
             )
             ->willReturnOnConsecutiveCalls(
+                true,
+                false,
                 ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-                null,
-                true
+                null
             );
+        $this->inputMock->expects($this->exactly(2))
+            ->method('getArgument')
+            ->withConsecutive([ConfigSetCommand::ARG_PATH], [ConfigSetCommand::ARG_VALUE])
+            ->willReturnOnConsecutiveCalls('dev/debug/debug_logging', 1);
         $this->outputMock->expects($this->once())
             ->method('writeln')
-            ->with('<info>Value was saved and locked.</info>');
+            ->with('<info>Value was saved in app/etc/env.php and locked.</info>');
         $this->assertFalse((bool)$this->configSetCommand->run($this->inputMock, $this->outputMock));
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/ConfigTest.php
new file mode 100644
index 00000000000..228ee9d79d9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/ConfigTest.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Test of communication configuration reading and parsing.
+ *
+ * @magentoCache config disabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetConsumers()
+    {
+        $consumers = $this->getConfigData()->getConsumers();
+        $expectedParsedConfig = include __DIR__ . '/_files/valid_expected_queue.php';
+        $this->assertEquals($expectedParsedConfig['consumers'], $consumers);
+    }
+
+    public function testGetPublishers()
+    {
+        $publishers = $this->getConfigData()->getPublishers();
+        $expectedParsedConfig = include __DIR__ . '/_files/valid_expected_queue.php';
+        $this->assertEquals($expectedParsedConfig['publishers'], $publishers);
+    }
+
+    public function testGetBinds()
+    {
+        $binds = $this->getConfigData()->getBinds();
+        $expectedParsedConfig = include __DIR__ . '/_files/valid_expected_queue.php';
+        $this->assertEquals($expectedParsedConfig['binds'], $binds);
+    }
+
+    public function testGetMaps()
+    {
+        $topicName = 'topic.broker.test';
+        $queue = $this->getConfigData()->getQueuesByTopic($topicName);
+        $expectedParsedConfig = include __DIR__ . '/_files/valid_expected_queue.php';
+        $this->assertEquals(
+            $expectedParsedConfig['exchange_topic_to_queues_map']['magento--topic.broker.test'],
+            $queue
+        );
+    }
+
+    public function testGetTopic()
+    {
+        $topicName = 'topic.broker.test';
+        $topic = $this->getConfigData()->getTopic($topicName);
+        $expectedParsedConfig = include __DIR__ . '/_files/valid_expected_queue.php';
+        $this->assertEquals($expectedParsedConfig['topics'][$topicName], $topic);
+    }
+
+    /**
+     * Return mocked config data
+     *
+     * @return \Magento\Framework\MessageQueue\ConfigInterface
+     */
+    private function getConfigData()
+    {
+        return $this->getConfigInstance(
+            [
+                __DIR__ . '/_files/valid_new_queue.xml'
+            ]
+        );
+    }
+
+    /**
+     * Create config instance initialized with configuration from $configFilePath
+     *
+     * @param string|string[] $configFilePath
+     * @param string|null $envConfigFilePath
+     * @return \Magento\Framework\MessageQueue\ConfigInterface
+     */
+    protected function getConfigInstance($configFilePath, $envConfigFilePath = null)
+    {
+        $content = [];
+        if (is_array($configFilePath)) {
+            foreach ($configFilePath as $file) {
+                $content[] = file_get_contents($file);
+            }
+        } else {
+            $content[] = file_get_contents($configFilePath);
+        }
+        $fileResolver = $this->getMockForAbstractClass(\Magento\Framework\Config\FileResolverInterface::class);
+        $fileResolver->expects($this->any())
+            ->method('get')
+            ->willReturn($content);
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $topicConverter = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Xml\Converter\TopicConfig::class,
+            [
+                'communicationConfig' => $this->getCommunicationConfigInstance()
+            ]
+        );
+
+        $converter = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Xml\CompositeConverter::class,
+            [
+                'converters' => [
+                    ['converter' => $topicConverter, 'sortOrder' => 10]
+                ]
+            ]
+        );
+        $xmlReader = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Xml::class,
+            [
+                'fileResolver' => $fileResolver,
+                'converter' => $converter,
+            ]
+        );
+        $deploymentConfigReader = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig\Reader::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $envConfigData = include $envConfigFilePath ?: __DIR__ . '/_files/valid_queue_input.php';
+        $deploymentConfigReader->expects($this->any())->method('load')->willReturn($envConfigData);
+        $deploymentConfig = $objectManager->create(
+            \Magento\Framework\App\DeploymentConfig::class,
+            ['reader' => $deploymentConfigReader]
+        );
+        $envReader = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Env::class,
+            [
+                'deploymentConfig' => $deploymentConfig
+            ]
+        );
+        $methodsMap = $objectManager->create(\Magento\Framework\Reflection\MethodsMap::class);
+        $envValidator = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Env\Validator::class,
+            [
+                'methodsMap' => $methodsMap
+            ]
+        );
+
+        $compositeReader = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\CompositeReader::class,
+            [
+                'readers' => [
+                    ['reader' => $xmlReader, 'sortOrder' => 10],
+                    ['reader' => $envReader, 'sortOrder' => 20]
+                ],
+            ]
+        );
+
+        /** @var \Magento\Framework\MessageQueue\Config $configData */
+        $configData = $objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Data::class,
+            [
+                'reader' => $compositeReader,
+                'envValidator' => $envValidator
+            ]
+        );
+        return $objectManager->create(
+            \Magento\Framework\MessageQueue\ConfigInterface::class,
+            ['queueConfigData' => $configData]
+        );
+    }
+
+    /**
+     * Get mocked Communication Config Instance
+     *
+     * @return \Magento\Framework\Communication\ConfigInterface
+     */
+    private function getCommunicationConfigInstance()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $fileResolver = $this->getMockForAbstractClass(\Magento\Framework\Config\FileResolverInterface::class);
+        $fileResolver->expects($this->any())
+            ->method('get')
+            ->willReturn([file_get_contents(__DIR__ . '/_files/communication.xml')]);
+
+        $xmlReader = $objectManager->create(
+            \Magento\Framework\Communication\Config\Reader\XmlReader::class,
+            [
+                'fileResolver' => $fileResolver,
+            ]
+        );
+
+        $compositeReader = $objectManager->create(
+            \Magento\Framework\Communication\Config\CompositeReader::class,
+            [
+                'readers' => [
+                    ['reader' => $xmlReader, 'sortOrder' => 10],
+                    [
+                        'reader' => $objectManager->create(
+                            \Magento\Framework\Communication\Config\Reader\EnvReader::class
+                        ),
+                        'sortOrder' => 20
+                    ]
+                ],
+            ]
+        );
+
+        /** @var \Magento\Framework\Communication\Config $configData */
+        $configData = $objectManager->create(
+            \Magento\Framework\Communication\Config\Data::class,
+            [
+                'reader' => $compositeReader
+            ]
+        );
+
+        $config = $objectManager->create(
+            \Magento\Framework\Communication\ConfigInterface::class,
+            [
+                'configData' => $configData
+            ]
+        );
+        return $config;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/ConfigTest.php
new file mode 100644
index 00000000000..6ff19121e33
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/ConfigTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\Iterator as HandlerIterator;
+
+/**
+ * Test of queue consumer configuration reading and parsing.
+ *
+ * @magentoCache config disabled
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetConsumers()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+
+        $consumers = $config->getConsumers();
+        $consumer = $config->getConsumer('consumer1');
+
+        $this->assertEquals(
+            $consumer,
+            $consumers['consumer1'],
+            'Consumers received from collection and via getter must be the same'
+        );
+
+        $this->assertEquals('consumer1', $consumer->getName());
+        $this->assertEquals('queue1', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\BatchConsumer::class, $consumer->getConsumerInstance());
+        $this->assertEquals('100', $consumer->getMaxMessages());
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(1, $handlers);
+        $this->assertEquals('handlerMethodOne', $handlers[0]->getMethod());
+        $this->assertEquals('Magento\TestModuleMessageQueueConfiguration\HandlerOne', $handlers[0]->getType());
+    }
+
+    public function testGetConsumerWithDefaultValues()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+
+        $consumer = $config->getConsumer('consumer5');
+
+        $this->assertEquals('consumer5', $consumer->getName());
+        $this->assertEquals('queue5', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
+        $this->assertEquals(null, $consumer->getMaxMessages());
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(0, $handlers);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Consumer 'undeclaredConsumer' is not declared.
+     */
+    public function testGetUndeclaredConsumer()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $config->getConsumer('undeclaredConsumer');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/DeprecatedConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/DeprecatedConfigTest.php
new file mode 100644
index 00000000000..7a783cb1da5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/DeprecatedConfigTest.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\Iterator as HandlerIterator;
+
+/**
+ * Test access to consumer configuration declared in deprecated queue.xml configs using Consumer\ConfigInterface.
+ *
+ * @magentoCache config disabled
+ */
+class DeprecatedConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetConsumerMultipleHandlersFromCommunicationConfig()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $consumer = $config->getConsumer('deprecatedConfigAsyncBoolConsumer');
+
+        $this->assertEquals('deprecatedConfigAsyncBoolConsumer', $consumer->getName());
+        $this->assertEquals('deprecated.config.queue.2', $consumer->getQueue());
+        $this->assertEquals('db', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
+        $this->assertEquals(null, $consumer->getMaxMessages());
+
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(2, $handlers);
+        $this->assertEquals('methodWithBoolParam', $handlers[0]->getMethod());
+        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\AsyncHandler::class, $handlers[0]->getType());
+        $this->assertEquals('methodWithMixedParam', $handlers[1]->getMethod());
+        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\AsyncHandler::class, $handlers[1]->getType());
+    }
+
+    public function testGetConsumerCustomHandler()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $consumer = $config->getConsumer('deprecatedConfigAsyncMixedConsumer');
+
+        $this->assertEquals('deprecatedConfigAsyncMixedConsumer', $consumer->getName());
+        $this->assertEquals('deprecated.config.queue.3', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
+        $this->assertEquals(null, $consumer->getMaxMessages());
+
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(1, $handlers);
+        $this->assertEquals('methodWithMixedParam', $handlers[0]->getMethod());
+        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\AsyncHandler::class, $handlers[0]->getType());
+    }
+
+    public function testGetConsumerCustomConnectionSync()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $consumer = $config->getConsumer('deprecatedConfigSyncBoolConsumer');
+
+        $this->assertEquals('deprecatedConfigSyncBoolConsumer', $consumer->getName());
+        $this->assertEquals('deprecated.config.queue.4', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
+        $this->assertEquals(null, $consumer->getMaxMessages());
+
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(1, $handlers);
+        $this->assertEquals('methodWithBoolParam', $handlers[0]->getMethod());
+        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\SyncHandler::class, $handlers[0]->getType());
+    }
+
+    public function testGetConsumerCustomConsumerAndMaxMessages()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $consumer = $config->getConsumer('deprecatedConfigAsyncStringConsumer');
+
+        $this->assertEquals('deprecatedConfigAsyncStringConsumer', $consumer->getName());
+        $this->assertEquals('deprecated.config.queue.1', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\BatchConsumer::class, $consumer->getConsumerInstance());
+        $this->assertEquals(200, $consumer->getMaxMessages());
+
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(0, $handlers);
+    }
+
+    public function testGetOverlapWithQueueConfig()
+    {
+        /** @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class);
+        $consumer = $config->getConsumer('overlappingConsumerDeclaration');
+
+        $this->assertEquals('overlappingConsumerDeclaration', $consumer->getName());
+        $this->assertEquals('consumer.config.queue', $consumer->getQueue());
+        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
+        $this->assertEquals(null, $consumer->getMaxMessages());
+
+        $handlers = $consumer->getHandlers();
+        $this->assertInstanceOf(HandlerIterator::class, $handlers);
+        $this->assertCount(0, $handlers);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/MessageEncoderTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/MessageEncoderTest.php
new file mode 100644
index 00000000000..342f280f6af
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/MessageEncoderTest.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\Communication\Config;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MessageEncoderTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var MessageEncoder */
+    protected $encoder;
+
+    /** @var \Magento\Framework\ObjectManagerInterface */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->encoder = $this->objectManager->create(MessageEncoder::class);
+        $this->setBackwardCompatibleProperty(
+            $this->encoder,
+            'communicationConfig',
+            $this->getConfig()
+        );
+        parent::setUp();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     */
+    public function testEncode()
+    {
+        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $fixtureCustomerId = 1;
+        $customer = $customerRepository->getById($fixtureCustomerId);
+        /** @var \Magento\Customer\Api\Data\CustomerExtensionInterface $customerExtension */
+        $customerExtension = $this->objectManager->create(\Magento\Customer\Api\Data\CustomerExtension::class);
+        $customerExtension->setTestGroupCode('Some Group Code');
+        $customer->setExtensionAttributes($customerExtension);
+        $encodedCustomerData = json_decode($this->encoder->encode('customer.created', $customer), true);
+        $createdAt = $customer->getCreatedAt();
+        $updatedAt = $customer->getUpdatedAt();
+        $expectedEncodedCustomerData = json_decode($this->getCustomerDataAsJson($createdAt, $updatedAt), true);
+        $this->assertEquals($expectedEncodedCustomerData, $encodedCustomerData);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     */
+    public function testEncodeArrayOfEntities()
+    {
+        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $fixtureCustomerId = 1;
+        $customer = $customerRepository->getById($fixtureCustomerId);
+        /** @var \Magento\Customer\Api\Data\CustomerExtensionInterface $customerExtension */
+        $customerExtension = $this->objectManager->create(\Magento\Customer\Api\Data\CustomerExtension::class);
+        $customerExtension->setTestGroupCode('Some Group Code');
+        $customer->setExtensionAttributes($customerExtension);
+        $encodedCustomerData = json_decode($this->encoder->encode('customer.list.retrieved', [$customer]), true);
+        $createdAt = $customer->getCreatedAt();
+        $updatedAt = $customer->getUpdatedAt();
+        $expectedEncodedCustomerData = json_decode($this->getCustomerDataAsJson($createdAt, $updatedAt), true);
+        $this->assertEquals($expectedEncodedCustomerData, $encodedCustomerData[0]);
+    }
+
+    public function testDecode()
+    {
+        $encodedMessage = $this->getCustomerDataAsJson('2015-07-22 12:43:36', '2015-07-22 12:45:36');
+        /** @var \Magento\Customer\Api\Data\CustomerInterface $decodedCustomerObject */
+        $decodedCustomerObject = $this->encoder->decode('customer.created', $encodedMessage);
+        $this->assertInstanceOf(\Magento\Customer\Api\Data\CustomerInterface::class, $decodedCustomerObject);
+        $this->assertEquals('customer@example.com', $decodedCustomerObject->getEmail());
+        $this->assertEquals(1, $decodedCustomerObject->getGroupId());
+
+        $this->assertInstanceOf(
+            \Magento\Customer\Api\Data\CustomerExtensionInterface::class,
+            $decodedCustomerObject->getExtensionAttributes()
+        );
+        $this->assertEquals('Some Group Code', $decodedCustomerObject->getExtensionAttributes()->getTestGroupCode());
+        $addresses = $decodedCustomerObject->getAddresses();
+        $this->assertCount(1, $addresses, "Address was not decoded.");
+        $this->assertInstanceOf(
+            \Magento\Customer\Api\Data\AddressInterface::class,
+            $addresses[0]
+        );
+        $this->assertEquals('3468676', $addresses[0]->getTelephone());
+        $this->assertEquals(true, $addresses[0]->isDefaultBilling());
+
+        $this->assertInstanceOf(
+            \Magento\Customer\Api\Data\RegionInterface::class,
+            $addresses[0]->getRegion()
+        );
+        $this->assertEquals('AL', $addresses[0]->getRegion()->getRegionCode());
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Error occurred during message decoding
+     */
+    public function testDecodeInvalidMessageFormat()
+    {
+        $this->encoder->decode('customer.created', "{");
+    }
+
+    /**
+     * @expectedException \LogicException
+     */
+    public function testDecodeInvalidMessage()
+    {
+        $message = 'Property "NotExistingField" does not have accessor method "getNotExistingField" in class '
+            . '"Magento\Customer\Api\Data\CustomerInterface".';
+        $this->expectExceptionMessage($message);
+        $this->encoder->decode('customer.created', '{"not_existing_field": "value"}');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Error occurred during message decoding
+     */
+    public function testDecodeIncorrectMessage()
+    {
+        $this->encoder->decode('customer.created', "{");
+    }
+
+    /**
+     * @return \Magento\Framework\MessageQueue\Config
+     */
+    protected function getConfig()
+    {
+        $newData = include __DIR__ . '/_files/encoder_communication.php';
+        /** @var \Magento\Framework\Communication\Config\Data $configData */
+        $configData = $this->objectManager->create(\Magento\Framework\Communication\Config\Data::class);
+        $configData->reset();
+        $configData->merge($newData);
+        $config = $this->objectManager->create(Config::class, ['configData' => $configData]);
+
+        return $config;
+    }
+
+    /**
+     * Get fixture customer data in Json format
+     *
+     * @param string $createdAt
+     * @param string $updatedAt
+     * @return string
+     */
+    protected function getCustomerDataAsJson($createdAt, $updatedAt)
+    {
+        return <<<JSON
+{
+    "id": 1,
+    "group_id": 1,
+    "default_billing": "1",
+    "default_shipping": "1",
+    "created_at": "{$createdAt}",
+    "updated_at": "{$updatedAt}",
+    "email": "customer@example.com",
+    "firstname": "John",
+    "lastname": "Smith",
+    "middlename": "A",
+    "prefix": "Mr.",
+    "suffix": "Esq.",
+    "gender": 0,
+    "store_id": 1,
+    "taxvat": "12",
+    "website_id": 1,
+    "addresses": [
+        {
+            "id": 1,
+            "customer_id": 1,
+            "region": {
+                "region_code": "AL",
+                "region": "Alabama",
+                "region_id": 1
+            },
+            "region_id": 1,
+            "country_id": "US",
+            "street": [
+                "Green str, 67"
+            ],
+            "company": "CompanyName",
+            "telephone": "3468676",
+            "postcode": "75477",
+            "city": "CityM",
+            "firstname": "John",
+            "lastname": "Smith",
+            "default_shipping": true,
+            "default_billing": true
+        }
+    ],
+    "disable_auto_group_change": 0,
+    "extension_attributes": {
+        "test_group_code": "Some Group Code"
+    }
+}
+JSON;
+    }
+
+    /**
+     * Set mocked property
+     *
+     * @param object $object
+     * @param string $propertyName
+     * @param object $propertyValue
+     * @return void
+     */
+    public function setBackwardCompatibleProperty($object, $propertyName, $propertyValue)
+    {
+        $reflection = new \ReflectionClass(get_class($object));
+        $reflectionProperty = $reflection->getProperty($propertyName);
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($object, $propertyValue);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/ConfigTest.php
new file mode 100644
index 00000000000..5dc98891980
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/ConfigTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher;
+
+/**
+ * Test of queue publisher configuration reading and parsing.
+ *
+ * @magentoCache config disabled
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetPublishersWithOneEnabledConnection()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+
+        $publishers = $config->getPublishers();
+        $publisher = $config->getPublisher('topic.message.queue.config.01');
+        $itemFromList = null;
+        foreach ($publishers as $item) {
+            if ($item->getTopic() == 'topic.message.queue.config.01') {
+                $itemFromList = $item;
+                break;
+            }
+        }
+
+        $this->assertEquals($publisher, $itemFromList, 'Inconsistent publisher object');
+
+        $this->assertEquals('topic.message.queue.config.01', $publisher->getTopic(), 'Incorrect topic name');
+        $this->assertFalse($publisher->isDisabled(), 'Incorrect publisher state');
+        /** @var \Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface $connection */
+        $connection = $publisher->getConnection();
+        $this->assertEquals('amqp', $connection->getName(), 'Incorrect connection name');
+        $this->assertEquals('magento2', $connection->getExchange(), 'Incorrect exchange name');
+        $this->assertFalse($connection->isDisabled(), 'Incorrect connection status');
+    }
+
+    public function testGetPublisherConnectionWithoutConfiguredExchange()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+
+        $publisher = $config->getPublisher('topic.message.queue.config.04');
+        $connection = $publisher->getConnection();
+        $this->assertEquals('magento', $connection->getExchange(), 'Incorrect exchange name');
+    }
+
+    public function testGetPublishersWithoutEnabledConnection()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+
+        $publisher = $config->getPublisher('topic.message.queue.config.02');
+
+        $this->assertEquals('topic.message.queue.config.02', $publisher->getTopic(), 'Incorrect topic name');
+        $this->assertFalse($publisher->isDisabled(), 'Incorrect publisher state');
+
+        /** @var \Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface $connection */
+        $connection = $publisher->getConnection();
+        $this->assertEquals('amqp', $connection->getName(), 'Incorrect default connection name');
+        $this->assertEquals('magento', $connection->getExchange(), 'Incorrect default exchange name');
+        $this->assertFalse($connection->isDisabled(), 'Incorrect connection status');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Publisher 'topic.message.queue.config.03' is not declared.
+     */
+    public function testGetDisabledPublisherThrowsException()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+        $config->getPublisher('topic.message.queue.config.03');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/DeprecatedConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/DeprecatedConfigTest.php
new file mode 100644
index 00000000000..9c2b4c075d8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/DeprecatedConfigTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher;
+
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface;
+
+/**
+ * Test access to publisher configuration declared in deprecated queue.xml configs using Publisher\ConfigInterface.
+ *
+ * @magentoCache config disabled
+ */
+class DeprecatedConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetPublisher()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+        $publisher = $config->getPublisher('deprecated.config.async.string.topic');
+        $this->assertEquals('deprecated.config.async.string.topic', $publisher->getTopic());
+        $this->assertEquals(false, $publisher->isDisabled());
+
+        $connection = $publisher->getConnection();
+        $this->assertEquals('amqp', $connection->getName());
+        $this->assertEquals('magento', $connection->getExchange());
+        $this->assertEquals(false, $connection->isDisabled());
+    }
+
+    public function testGetPublisherCustomConnection()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+        $publisher = $config->getPublisher('deprecated.config.sync.bool.topic');
+        $this->assertEquals('deprecated.config.sync.bool.topic', $publisher->getTopic());
+        $this->assertEquals(false, $publisher->isDisabled());
+
+        $connection = $publisher->getConnection();
+        $this->assertEquals('amqp', $connection->getName());
+        $this->assertEquals('customExchange', $connection->getExchange());
+        $this->assertEquals(false, $connection->isDisabled());
+    }
+
+    public function testGetOverlapWithQueueConfig()
+    {
+        /** @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class);
+        $publisher = $config->getPublisher('overlapping.topic.declaration');
+        $this->assertEquals('overlapping.topic.declaration', $publisher->getTopic());
+        $this->assertEquals(false, $publisher->isDisabled());
+
+        $connection = $publisher->getConnection();
+        $this->assertEquals('amqp', $connection->getName());
+        $this->assertEquals('magento', $connection->getExchange());
+        $this->assertEquals(false, $connection->isDisabled());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/ConfigTest.php
new file mode 100644
index 00000000000..a8e55602327
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/ConfigTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+/**
+ * Test of queue topology configuration reading and parsing.
+ *
+ * @magentoCache config disabled
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetExchangeByName()
+    {
+        /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
+        $exchange = $config->getExchange('magento-topic-based-exchange1', 'amqp');
+        $this->assertEquals('magento-topic-based-exchange1', $exchange->getName());
+        $this->assertEquals('topic', $exchange->getType());
+        $this->assertEquals('amqp', $exchange->getConnection());
+        $exchangeArguments = $exchange->getArguments();
+        $expectedArguments = ['alternate-exchange' => 'magento-log-exchange'];
+        $this->assertEquals($expectedArguments, $exchangeArguments);
+
+        /** @var BindingInterface $binding */
+        $binding = current($exchange->getBindings());
+        $this->assertEquals('topicBasedRouting1', $binding->getId());
+        $this->assertEquals('anotherTopic1', $binding->getTopic());
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('topic-queue1', $binding->getDestination());
+        $bindingArguments = $binding->getArguments();
+        $expectedArguments = ['argument1' => 'value'];
+        $this->assertEquals($expectedArguments, $bindingArguments);
+    }
+
+    public function testGetExchangeByNameWithDefaultValues()
+    {
+        /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
+        $exchange = $config->getExchange('magento-topic-based-exchange2', 'amqp');
+        $this->assertEquals('magento-topic-based-exchange2', $exchange->getName());
+        $this->assertEquals('topic', $exchange->getType());
+        $this->assertEquals('amqp', $exchange->getConnection());
+        $exchangeArguments = $exchange->getArguments();
+        $expectedArguments = [
+            'alternate-exchange' => 'magento-log-exchange',
+            'arrayValue' => [
+                'element01' => '10',
+                'element02' => '20',
+            ]
+        ];
+        $this->assertEquals($expectedArguments, $exchangeArguments);
+
+        /** @var BindingInterface $binding */
+        $binding = current($exchange->getBindings());
+        $this->assertEquals('topicBasedRouting2', $binding->getId());
+        $this->assertEquals('anotherTopic2', $binding->getTopic());
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('topic-queue2', $binding->getDestination());
+        $bindingArguments = $binding->getArguments();
+        $expectedArguments = ['argument1' => 'value', 'argument2' => true, 'argument3' => 150];
+        $this->assertEquals($expectedArguments, $bindingArguments);
+    }
+
+    public function testGetAllExchanges()
+    {
+        /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
+        $exchanges = $config->getExchanges();
+        $expectedResults = ['magento-topic-based-exchange1', 'magento-topic-based-exchange2'];
+        $actual = [];
+        foreach ($exchanges as $exchange) {
+            $actual[] = $exchange->getName();
+        }
+        $this->assertEmpty(array_diff($expectedResults, $actual));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/DeprecatedConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/DeprecatedConfigTest.php
new file mode 100644
index 00000000000..30a1c27abf7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Topology/DeprecatedConfigTest.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding\Iterator as BindingIterator;
+
+/**
+ * Test access to topology configuration declared in deprecated queue.xml configs using Topology\ConfigInterface.
+ *
+ * @magentoCache config disabled
+ */
+class DeprecatedConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    public function testGetTopology()
+    {
+        /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
+        $topology = $config->getExchange('deprecatedExchange', 'db');
+        $this->assertEquals('deprecatedExchange', $topology->getName());
+        $this->assertEquals('topic', $topology->getType());
+        $this->assertEquals('db', $topology->getConnection());
+        $this->assertEquals(true, $topology->isDurable());
+        $this->assertEquals(false, $topology->isAutoDelete());
+        $this->assertEquals(false, $topology->isInternal());
+
+        $arguments = $topology->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+
+        // Verify bindings
+        $bindings = $topology->getBindings();
+        $this->assertInstanceOf(BindingIterator::class, $bindings);
+        $this->assertCount(1, $bindings);
+
+        $bindingId = 'queue--deprecated.config.queue.2--deprecated.config.async.bool.topic';
+        $this->assertArrayHasKey($bindingId, $bindings);
+        $binding = $bindings[$bindingId];
+
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('deprecated.config.queue.2', $binding->getDestination());
+        $this->assertEquals(false, $binding->isDisabled());
+        $this->assertEquals('deprecated.config.async.bool.topic', $binding->getTopic());
+        $arguments = $binding->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+    }
+
+    public function testGetTopologyOverlapWithQueueConfig()
+    {
+        /** @var \Magento\Framework\MessageQueue\Topology\ConfigInterface $config */
+        $config = $this->objectManager->create(\Magento\Framework\MessageQueue\Topology\ConfigInterface::class);
+        $topology = $config->getExchange('overlappingDeprecatedExchange', 'amqp');
+        $this->assertEquals('overlappingDeprecatedExchange', $topology->getName());
+        $this->assertEquals('topic', $topology->getType());
+        $this->assertEquals('amqp', $topology->getConnection());
+        $this->assertEquals(true, $topology->isDurable());
+        $this->assertEquals(false, $topology->isAutoDelete());
+        $this->assertEquals(false, $topology->isInternal());
+
+        $arguments = $topology->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+
+        // Verify bindings
+        $bindings = $topology->getBindings();
+        $this->assertInstanceOf(BindingIterator::class, $bindings);
+        $this->assertCount(3, $bindings);
+
+        // Note that connection was changed for this binding during merge with topology config
+        // since we do not support exchanges with the same names on different connections
+        $bindingId = 'queue--consumer.config.queue--overlapping.topic.declaration';
+        $this->assertArrayHasKey($bindingId, $bindings);
+        $binding = $bindings[$bindingId];
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('consumer.config.queue', $binding->getDestination());
+        $this->assertEquals(false, $binding->isDisabled());
+        $this->assertEquals('overlapping.topic.declaration', $binding->getTopic());
+        $arguments = $binding->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+
+        $bindingId = 'binding1';
+        $this->assertArrayHasKey($bindingId, $bindings);
+        $binding = $bindings[$bindingId];
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('topology.config.queue', $binding->getDestination());
+        $this->assertEquals(false, $binding->isDisabled());
+        $this->assertEquals('overlapping.topic.declaration', $binding->getTopic());
+        $arguments = $binding->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+
+        $bindingId = 'binding2';
+        $this->assertArrayHasKey($bindingId, $bindings);
+        $binding = $bindings[$bindingId];
+        $this->assertEquals('queue', $binding->getDestinationType());
+        $this->assertEquals('topology.config.queue', $binding->getDestination());
+        $this->assertEquals(false, $binding->isDisabled());
+        $this->assertEquals('deprecated.config.async.string.topic', $binding->getTopic());
+        $arguments = $binding->getArguments();
+        $this->assertInternalType('array', $arguments);
+        $this->assertCount(0, $arguments);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
new file mode 100644
index 00000000000..189d189d32c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * @see dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration
+ * @see dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride
+ */
+class TopologyTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * List of declared exchanges.
+     *
+     * @var array
+     */
+    private $declaredExchanges;
+
+    /**
+     * @var \Magento\TestFramework\Helper\Amqp
+     */
+    private $helper;
+
+    protected function setUp()
+    {
+        $this->helper = new \Magento\TestFramework\Helper\Amqp();
+        $this->declaredExchanges = $this->helper->getExchanges();
+    }
+
+    /**
+     * @dataProvider exchangeDataProvider
+     * @param array $expectedConfig
+     * @param array $bindingConfig
+     */
+    public function testTopologyInstallation(array $expectedConfig, array $bindingConfig)
+    {
+        $name = $expectedConfig['name'];
+        $this->assertArrayHasKey($name, $this->declaredExchanges);
+        unset($this->declaredExchanges[$name]['message_stats']);
+        $this->assertEquals(
+            $expectedConfig,
+            $this->declaredExchanges[$name],
+            'Invalid exchange configuration: ' . $name
+        );
+
+        $bindings = $this->helper->getExchangeBindings($name);
+        $bindings = array_map(function ($value) {
+            unset($value['properties_key']);
+            return $value;
+        }, $bindings);
+        $this->assertEquals(
+            $bindingConfig,
+            $bindings,
+            'Invalid exchange bindings configuration: ' . $name
+        );
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exchangeDataProvider()
+    {
+        return [
+            'magento-topic-based-exchange1' => [
+                'exchangeConfig' => [
+                    'name' => 'magento-topic-based-exchange1',
+                    'vhost' => '/',
+                    'type' => 'topic',
+                    'durable' => true,
+                    'auto_delete' => false,
+                    'internal' => false,
+                    'arguments' => [
+                        'alternate-exchange' => 'magento-log-exchange'
+                    ],
+                ],
+                'bindingConfig' => [
+                    [
+                        'source' => 'magento-topic-based-exchange1',
+                        'vhost' => '/',
+                        'destination' => 'topic-queue1',
+                        'destination_type' => 'queue',
+                        'routing_key' => 'anotherTopic1',
+                        'arguments' => [
+                            'argument1' => 'value'
+                        ],
+                    ],
+                ]
+            ],
+            'magento-topic-based-exchange2' => [
+                'exchangeConfig' => [
+                    'name' => 'magento-topic-based-exchange2',
+                    'vhost' => '/',
+                    'type' => 'topic',
+                    'durable' => true,
+                    'auto_delete' => false,
+                    'internal' => false,
+                    'arguments' => [
+                        'alternate-exchange' => 'magento-log-exchange',
+                        'arrayValue' => ['10', '20']
+                    ],
+                ],
+                'bindingConfig' => [
+                    [
+                        'source' => 'magento-topic-based-exchange2',
+                        'vhost' => '/',
+                        'destination' => 'topic-queue2',
+                        'destination_type' => 'queue',
+                        'routing_key' => 'anotherTopic2',
+                        'arguments' => [
+                            'argument1' => 'value',
+                            'argument2' => true,
+                            'argument3' => '150',
+                        ],
+                    ],
+                ]
+            ],
+            'magento-topic-based-exchange3' => [
+                'exchangeConfig' => [
+                    'name' => 'magento-topic-based-exchange3',
+                    'vhost' => '/',
+                    'type' => 'topic',
+                    'durable' => false,
+                    'auto_delete' => true,
+                    'internal' => true,
+                    'arguments' => [],
+                ],
+                'bindingConfig' => [],
+            ],
+            'magento-topic-based-exchange4' => [
+                'exchangeConfig' => [
+                    'name' => 'magento-topic-based-exchange4',
+                    'vhost' => '/',
+                    'type' => 'topic',
+                    'durable' => true,
+                    'auto_delete' => false,
+                    'internal' => false,
+                    'arguments' => [],
+                ],
+                'bindingConfig' => [
+                    [
+                        'source' => 'magento-topic-based-exchange4',
+                        'vhost' => '/',
+                        'destination' => 'topic-queue1',
+                        'destination_type' => 'queue',
+                        'routing_key' => '#',
+                        'arguments' => [
+                            'test' => 'one'
+                        ],
+                    ],
+                    [
+                        'source' => 'magento-topic-based-exchange4',
+                        'vhost' => '/',
+                        'destination' => 'topic-queue2',
+                        'destination_type' => 'queue',
+                        'routing_key' => '*.*.*',
+                        'arguments' => [],
+                    ],
+                ]
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleHandlersTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleHandlersTest.php
new file mode 100644
index 00000000000..890a0d01c71
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleHandlersTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+use Magento\TestModuleAsyncAmqp\Model\AsyncTestData;
+
+class AsyncMultipleHandlersTest extends QueueTestCaseAbstract
+{
+    /**
+     * @var string
+     */
+    protected $expectedMessages;
+
+    /**
+     * @var string[]
+     */
+    protected $consumers = [
+        'mtmh.queue.1.consumer',
+        'mtmh.queue.2.consumer',
+    ];
+
+    /**
+     * @var string[]
+     */
+    private $topicValueMap = [
+        'mtmh.topic.1' => 'mtmh.topic.1',
+        'mtmh.topic.2' => ['mtmh.topic.2-1', 'mtmh.topic.2-2']
+    ];
+
+    /**
+     * @var string[]
+     */
+    private $expectedValues = [
+        'string-mtmh.topic.1',
+        'mixed-mtmh.topic.1',
+        'array-mtmh.topic.2-1',
+        'array-mtmh.topic.2-2',
+        'mixed-mtmh.topic.2-1',
+        'mixed-mtmh.topic.2-2'
+    ];
+
+    /**
+     * Verify that Queue Framework supports multiple topics per queue.
+     *
+     * Current test is not test of Web API framework itself,
+     * it just utilizes its infrastructure to test Message Queue.
+     */
+    public function testAsynchronousRpcCommunication()
+    {
+        foreach ($this->topicValueMap as $topic => $data) {
+            $message = null;
+            if (is_array($data)) {
+                foreach ($data as $key => $value) {
+                    /** @var AsyncTestData $testObject */
+                    $testObject = $this->objectManager->create(AsyncTestData::class);
+                    $testObject->setValue($value);
+                    $testObject->setTextFilePath($this->logFilePath);
+                    $message[$key] = $testObject;
+                }
+            } else {
+                $testObject = $this->objectManager->create(AsyncTestData::class);
+                $testObject->setValue($data);
+                $testObject->setTextFilePath($this->logFilePath);
+                $message = $testObject;
+            }
+            $this->publisher->publish($topic, $message);
+        }
+
+        $this->waitForAsynchronousResult(count($this->expectedValues), $this->logFilePath);
+
+        //assertions
+        foreach ($this->expectedValues as $item) {
+            $this->assertContains($item, file_get_contents($this->logFilePath));
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleTopicsWithEachQueueTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleTopicsWithEachQueueTest.php
new file mode 100644
index 00000000000..e1de6423152
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/AsyncMultipleTopicsWithEachQueueTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+class AsyncMultipleTopicsWithEachQueueTest extends QueueTestCaseAbstract
+{
+    /**
+     * @var string[]
+     */
+    protected $uniqueID;
+
+    /**
+     * @var \Magento\TestModuleAsyncAmqp\Model\AsyncTestData
+     */
+    protected $msgObject;
+
+    /**
+     * @var string[]
+     */
+    protected $consumers = ['queue.for.multiple.topics.test.y', 'queue.for.multiple.topics.test.z'];
+
+    /**
+     * @var string[]
+     */
+    private $topics = ['multi.topic.queue.topic.y', 'multi.topic.queue.topic.z'];
+
+    /**
+     * Verify that Queue Framework processes multiple asynchronous topics sent to the same queue.
+     *
+     * Current test is not test of Web API framework itself, it just utilizes its infrastructure to test Message Queue.
+     */
+    public function testAsyncMultipleTopicsPerQueue()
+    {
+        $this->msgObject = $this->objectManager->create(\Magento\TestModuleAsyncAmqp\Model\AsyncTestData::class);
+
+        foreach ($this->topics as $topic) {
+            $this->uniqueID[$topic] = md5(uniqid($topic));
+            $this->msgObject->setValue($this->uniqueID[$topic] . "_" . $topic);
+            $this->msgObject->setTextFilePath($this->logFilePath);
+            $this->publisher->publish($topic, $this->msgObject);
+        }
+
+        $this->waitForAsynchronousResult(count($this->uniqueID), $this->logFilePath);
+
+        //assertions
+        foreach ($this->topics as $item) {
+            $this->assertContains($this->uniqueID[$item] . "_" . $item, file_get_contents($this->logFilePath));
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/AsyncMultiTopicsSeparateQueuesTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/AsyncMultiTopicsSeparateQueuesTest.php
new file mode 100644
index 00000000000..f361f8e4e62
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/AsyncMultiTopicsSeparateQueuesTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase\DeprecatedFormat;
+
+use Magento\Framework\MessageQueue\UseCase\QueueTestCaseAbstract;
+
+class AsyncMultiTopicsSeparateQueuesTest extends QueueTestCaseAbstract
+{
+    /**
+     * @var string[]
+     */
+    protected $uniqueID;
+
+    /**
+     * @var \Magento\TestModuleAsyncAmqp\Model\AsyncTestData
+     */
+    protected $msgObject;
+
+    /**
+     * @var string[]
+     */
+    protected $consumers = [
+        'queue.for.multiple.topics.test.c.deprecated',
+        'queue.for.multiple.topics.test.d.deprecated'
+    ];
+
+    /**
+     * @var string[]
+     */
+    private $topics = ['multi.topic.queue.topic.c.deprecated', 'multi.topic.queue.topic.d.deprecated'];
+
+    /**
+     * Verify that Queue Framework processes multiple asynchronous topics sent to the same queue.
+     *
+     * Current test is not test of Web API framework itself, it just utilizes its infrastructure to test Message Queue.
+     */
+    public function testAsyncMultipleTopicsPerQueue()
+    {
+        $this->msgObject = $this->objectManager->create(\Magento\TestModuleAsyncAmqp\Model\AsyncTestData::class);
+
+        foreach ($this->topics as $topic) {
+            $this->uniqueID[$topic] = md5(uniqid($topic));
+            $this->msgObject->setValue($this->uniqueID[$topic] . "_" . $topic);
+            $this->msgObject->setTextFilePath($this->logFilePath);
+            $this->publisher->publish($topic, $this->msgObject);
+        }
+
+        $this->waitForAsynchronousResult(count($this->uniqueID), $this->logFilePath);
+
+        //assertions
+        foreach ($this->topics as $item) {
+            $this->assertContains($this->uniqueID[$item] . "_" . $item, file_get_contents($this->logFilePath));
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/RpcCommunicationTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/RpcCommunicationTest.php
new file mode 100644
index 00000000000..2c2b9c94037
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/RpcCommunicationTest.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase\DeprecatedFormat;
+
+use Magento\Framework\MessageQueue\UseCase\QueueTestCaseAbstract;
+
+class RpcCommunicationTest extends QueueTestCaseAbstract
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $consumers = ['synchronousRpcTestConsumer.deprecated'];
+
+    /**
+     * Verify that RPC call based on Rabbit MQ is processed correctly.
+     *
+     * Current test is not test of Web API framework itself, it just utilizes its infrastructure to test RPC.
+     */
+    public function testSynchronousRpcCommunication()
+    {
+        $input = 'Input value';
+        $response = $this->publisher->publish('synchronous.rpc.test.deprecated', $input);
+        $this->assertEquals($input . ' processed by RPC handler', $response);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MixSyncAndAsyncSingleQueueTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MixSyncAndAsyncSingleQueueTest.php
new file mode 100644
index 00000000000..a7987320e90
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MixSyncAndAsyncSingleQueueTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+class MixSyncAndAsyncSingleQueueTest extends QueueTestCaseAbstract
+{
+    /**
+     * @var \Magento\TestModuleAsyncAmqp\Model\AsyncTestData
+     */
+    protected $msgObject;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $consumers = ['mixed.sync.and.async.queue.consumer'];
+
+    /**
+     * @var string[]
+     */
+    protected $messages = ['message1', 'message2', 'message3'];
+
+    /**
+     * @var int
+     */
+    protected $maxMessages = 4;
+
+    public function testMixSyncAndAsyncSingleQueue()
+    {
+        $this->msgObject = $this->objectManager->create(\Magento\TestModuleAsyncAmqp\Model\AsyncTestData::class);
+
+        // Publish asynchronous messages
+        foreach ($this->messages as $item) {
+            $this->msgObject->setValue($item);
+            $this->msgObject->setTextFilePath($this->logFilePath);
+            $this->publisher->publish('multi.topic.queue.topic.c', $this->msgObject);
+        }
+
+        // Publish synchronous message to the same queue
+        $input = 'Input value';
+        $response = $this->publisher->publish('sync.topic.for.mixed.sync.and.async.queue', $input);
+        $this->assertEquals($input . ' processed by RPC handler', $response);
+
+        $this->waitForAsynchronousResult(count($this->messages), $this->logFilePath);
+
+        // Verify that asynchronous messages were processed
+        foreach ($this->messages as $item) {
+            $this->assertContains($item, file_get_contents($this->logFilePath));
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MultipleTopicsPerQueueTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MultipleTopicsPerQueueTest.php
new file mode 100644
index 00000000000..edd0fb9d560
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MultipleTopicsPerQueueTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+class MultipleTopicsPerQueueTest extends QueueTestCaseAbstract
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $consumers = [
+        'queue.for.multiple.topics.test.a',
+        'queue.for.multiple.topics.test.b'
+    ];
+
+    /**
+     * Verify that Queue Framework supports multiple topics per queue.
+     *
+     * Current test is not test of Web API framework itself,
+     * it just utilizes its infrastructure to test Message Queue.
+     */
+    public function testSynchronousRpcCommunication()
+    {
+        foreach (['multi.topic.queue.topic.a', 'multi.topic.queue.topic.b'] as $topic) {
+            $input = "Input value for topic '{$topic}'";
+            $response = $this->publisher->publish($topic, $input);
+            $this->assertEquals($input . ' processed by RPC handler', $response);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php
new file mode 100644
index 00000000000..65f7c568159
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\MessageQueue\PublisherInterface;
+
+/**
+ * Base test case for message queue tests.
+ */
+abstract class QueueTestCaseAbstract extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string[]
+     */
+    protected $consumers = [];
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var PublisherInterface
+     */
+    protected $publisher;
+
+    /**
+     * @var string
+     */
+    protected $logFilePath;
+
+    /**
+     * @var int|null
+     */
+    protected $maxMessages = null;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        /** @var \Magento\Framework\OsInfo $osInfo */
+        $osInfo = $this->objectManager->get(\Magento\Framework\OsInfo::class);
+        if ($osInfo->isWindows()) {
+            $this->markTestSkipped("This test relies on *nix shell and should be skipped in Windows environment.");
+        }
+        foreach ($this->consumers as $consumer) {
+            foreach ($this->getConsumerProcessIds($consumer) as $consumerProcessId) {
+                exec("kill {$consumerProcessId}");
+            }
+        }
+        foreach ($this->consumers as $consumer) {
+            if (!$this->getConsumerProcessIds($consumer)) {
+                exec("{$this->getConsumerStartCommand($consumer, true)} > /dev/null &");
+            }
+        }
+
+        $this->logFilePath = TESTS_TEMP_DIR . "/MessageQueueTestLog.txt";
+        if (file_exists($this->logFilePath)) {
+            // try to remove before failing the test
+            unlink($this->logFilePath);
+            if (file_exists($this->logFilePath)) {
+                $this->fail(
+                    "Precondition failed: test log ({$this->logFilePath}) cannot be deleted before test execution."
+                );
+            }
+        }
+
+        $this->publisher = $this->objectManager->get(PublisherInterface::class);
+    }
+
+    protected function tearDown()
+    {
+        foreach ($this->consumers as $consumer) {
+            foreach ($this->getConsumerProcessIds($consumer) as $consumerProcessId) {
+                exec("kill {$consumerProcessId}");
+            }
+        }
+    }
+
+    /**
+     * @param string $consumer
+     * @return string[]
+     */
+    protected function getConsumerProcessIds($consumer)
+    {
+        exec("ps ax | grep -v grep | grep '{$this->getConsumerStartCommand($consumer)}' | awk '{print $1}'", $output);
+        return $output;
+    }
+
+    /**
+     * Get CLI command for starting specified consumer.
+     *
+     * @param string $consumer
+     * @param bool $withEnvVariables
+     * @return string
+     */
+    protected function getConsumerStartCommand($consumer, $withEnvVariables = false)
+    {
+        $binDirectory = realpath(TESTS_TEMP_DIR . '/../bin/');
+        $magentoCli = $binDirectory . '/magento';
+        $consumerStartCommand = "php {$magentoCli} queue:consumers:start -vvv " . $consumer;
+        if ($this->maxMessages) {
+            $consumerStartCommand .= " --max-messages={$this->maxMessages}";
+        }
+        if ($withEnvVariables) {
+            $params = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getAppInitParams();
+            $params['MAGE_DIRS']['base']['path'] = BP;
+            $params = 'INTEGRATION_TEST_PARAMS="' . urldecode(http_build_query($params)) . '"';
+            $consumerStartCommand = $params . ' ' . $consumerStartCommand;
+        }
+        return $consumerStartCommand;
+    }
+
+    /**
+     * Wait for asynchronous handlers to log data to file.
+     *
+     * @param int $expectedLinesCount
+     * @param string $logFilePath
+     */
+    protected function waitForAsynchronousResult($expectedLinesCount, $logFilePath)
+    {
+        $i = 0;
+        do {
+            sleep(1);
+            $actualCount = file_exists($logFilePath) ? count(file($logFilePath)) : 0;
+        } while (($expectedLinesCount !== $actualCount) && ($i++ < 180));
+
+        if (!file_exists($logFilePath)) {
+            $this->fail("No asynchronous messages were processed.");
+        }
+    }
+
+    /**
+     * Workaround for https://bugs.php.net/bug.php?id=72286
+     */
+    public static function tearDownAfterClass()
+    {
+        if (version_compare(phpversion(), '7') == -1) {
+            $closeConnection = new \ReflectionMethod(\Magento\Amqp\Model\Config::class, 'closeConnection');
+            $closeConnection->setAccessible(true);
+
+            $config = Bootstrap::getObjectManager()->get(\Magento\Amqp\Model\Config::class);
+            $closeConnection->invoke($config);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RemoteServiceCommunicationTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RemoteServiceCommunicationTest.php
new file mode 100644
index 00000000000..a7f6845a866
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RemoteServiceCommunicationTest.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+use Magento\TestModuleSynchronousAmqp\Api\ServiceInterface;
+
+class RemoteServiceCommunicationTest extends QueueTestCaseAbstract
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $consumers = ['RemoteServiceTestConsumer'];
+
+    public function testRemoteServiceCommunication()
+    {
+        $input = 'Input value';
+        /** @var ServiceInterface $generatedRemoteService */
+        $generatedRemoteService = $this->objectManager->get(ServiceInterface::class);
+        $response = $generatedRemoteService->execute($input);
+        $this->assertEquals($input . ' processed by RPC handler', $response);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RpcCommunicationTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RpcCommunicationTest.php
new file mode 100644
index 00000000000..0acde6fc884
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/RpcCommunicationTest.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+class RpcCommunicationTest extends QueueTestCaseAbstract
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $consumers = ['synchronousRpcTestConsumer'];
+
+    /**
+     * Verify that RPC call based on Rabbit MQ is processed correctly.
+     *
+     * Current test is not test of Web API framework itself, it just utilizes its infrastructure to test RPC.
+     */
+    public function testSynchronousRpcCommunication()
+    {
+        $input = 'Input value';
+        $response = $this->publisher->publish('synchronous.rpc.test', $input);
+        $this->assertEquals($input . ' processed by RPC handler', $response);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WildcardTopicTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WildcardTopicTest.php
new file mode 100644
index 00000000000..d8c369334cb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WildcardTopicTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\UseCase;
+
+use Magento\TestModuleAsyncAmqp\Model\AsyncTestData;
+
+class WildcardTopicTest extends QueueTestCaseAbstract
+{
+    /**
+     * @var string[]
+     */
+    protected $consumers = [
+        'wildcard.queue.one.consumer',
+        'wildcard.queue.two.consumer',
+        'wildcard.queue.three.consumer',
+        'wildcard.queue.four.consumer',
+    ];
+
+    /**
+     * @param string $topic
+     * @param string[] $matchingQueues
+     * @param string[] $nonMatchingQueues
+     *
+     * @dataProvider wildCardTopicsDataProvider
+     */
+    public function testWildCardMatchingTopic($topic, $matchingQueues, $nonMatchingQueues)
+    {
+        $testObject = $this->generateTestObject();
+        $this->publisher->publish($topic, $testObject);
+
+        $this->waitForAsynchronousResult(count($matchingQueues), $this->logFilePath);
+
+        $this->assertTrue(file_exists($this->logFilePath), "No handlers invoked (log file was not created).");
+        foreach ($nonMatchingQueues as $queueName) {
+            $this->assertNotContains($queueName, file_get_contents($this->logFilePath));
+        }
+        foreach ($matchingQueues as $queueName) {
+            $this->assertContains($queueName, file_get_contents($this->logFilePath));
+        }
+    }
+
+    public function wildCardTopicsDataProvider()
+    {
+        return [
+            'segment1.segment2.segment3.wildcard' => [
+                'segment1.segment2.segment3.wildcard',
+                ['wildcard.queue.one', 'wildcard.queue.two', 'wildcard.queue.four'],
+                ['wildcard.queue.three']
+            ],
+            'segment2.segment3.wildcard' => [
+                'segment2.segment3.wildcard',
+                ['wildcard.queue.one', 'wildcard.queue.three', 'wildcard.queue.four'],
+                ['wildcard.queue.two']
+            ]
+        ];
+    }
+
+    public function testWildCardNonMatchingTopic()
+    {
+        $testObject = $this->generateTestObject();
+        $this->publisher->publish('not.matching.wildcard.topic', $testObject);
+        sleep(2);
+        $this->assertFalse(file_exists($this->logFilePath), "No log file must be created for non-matching topic.");
+    }
+
+    /**
+     * @return AsyncTestData
+     */
+    private function generateTestObject()
+    {
+        $testObject = $this->objectManager->create(AsyncTestData::class);
+        $testObject->setValue('||Message Contents||');
+        $testObject->setTextFilePath($this->logFilePath);
+        return $testObject;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/communication.xml b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/communication.xml
new file mode 100644
index 00000000000..0fc50f0432b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/communication.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
+    <topic name="topic.broker.test" request="string" response="string">
+        <handler name="topicBrokerHandler" type="Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    </topic>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/encoder_communication.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/encoder_communication.php
new file mode 100644
index 00000000000..9870e1d234e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/encoder_communication.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'topics' => [
+        'customer.created' => [
+            'request_type' => 'object_interface',
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'response' => null,
+        ],
+        'customer.list.retrieved' => [
+            'request_type' => 'object_interface',
+            'request' => 'Magento\Customer\Api\Data\CustomerInterface[]',
+            'response' => null,
+        ],
+        'customer.updated' => [
+            'request_type' => 'object_interface',
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'response' => null,
+        ],
+        'customer.deleted' => [
+            'request_type' => 'object_interface',
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'response' => null,
+        ],
+        'product.created' => [
+            'request_type' => 'object_interface',
+            'request' => \Magento\Catalog\Api\Data\ProductInterface::class,
+            'response' => null,
+        ],
+    ],
+];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_expected_queue.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_expected_queue.php
new file mode 100644
index 00000000000..b5f5145c32c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_expected_queue.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    "publishers" => [
+        "amqp-magento" => [
+            "name" => "amqp-magento",
+            "connection" => "amqp",
+            "exchange" => "magento"
+        ],
+        'demo-publisher-1' => [
+            'name' => 'demo-publisher-1',
+            'connection' => 'amqp',
+            "exchange" => "magento"
+        ],
+        "test-publisher-5" => [
+            "name" => "test-publisher-5",
+            "connection" => "amqp",
+            "exchange" => "test-exchange-10"
+        ]
+    ],
+    "topics" => [
+        "topic.broker.test" => [
+            "name" => "topic.broker.test",
+            "schema" => [
+                "schema_type" => "object",
+                "schema_value" => "string"
+            ],
+            "response_schema" => [
+                "schema_type" => "object",
+                "schema_value" => "string"
+            ],
+            "publisher" => "amqp-magento",
+            'is_synchronous' => true,
+        ],
+        "publisher5.topic" => [
+            "name" => "publisher5.topic",
+            "schema" => [
+                "schema_type" => "object",
+                "schema_value" => '\\' . \Magento\MysqlMq\Model\DataObject::class
+            ],
+            "response_schema" => [
+                "schema_type" => "object",
+                "schema_value" => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            "publisher" => "test-publisher-5"
+        ]
+    ],
+    "consumers" => [
+        "topicBrokerConsumer" => [
+            "name" => "topicBrokerConsumer",
+            "queue" => "demo-queue-1",
+            "connection" => "amqp",
+            "consumer_type" => "sync",
+            "handlers" => [
+                "topic.broker.test" => [
+                    "0" => [
+                        "type" => \Magento\MysqlMq\Model\Processor::class,
+                        "method" => "processMessage"
+                    ]
+                ]
+            ],
+            "max_messages" => null,
+            "instance_type" => \Magento\Framework\MessageQueue\ConsumerInterface::class
+        ]
+    ],
+    "binds" => [
+        "topic.broker.test--magento--demo-queue-1" => [
+            "queue" => "demo-queue-1",
+            "exchange" => "magento",
+            "topic" => "topic.broker.test"
+        ],
+        "publisher5.topic--test-exchange-10--demo-queue-1" => [
+            "queue" => "demo-queue-1",
+            "exchange" => "test-exchange-10",
+            "topic" => "publisher5.topic"
+        ]
+    ],
+    "exchange_topic_to_queues_map" => [
+        "magento--topic.broker.test" => [
+            "demo-queue-1"
+        ],
+        "test-exchange-10--publisher5.topic" => [
+            "demo-queue-1"
+        ]
+    ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_new_queue.xml b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_new_queue.xml
new file mode 100644
index 00000000000..f27f0b22f46
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_new_queue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+    <broker topic="topic.broker.test" type="amqp" exchange="magento">
+        <queue consumer="topicBrokerConsumer" name="demo-queue-1" />
+    </broker>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_queue_input.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_queue_input.php
new file mode 100644
index 00000000000..fdd4a7d3007
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/_files/valid_queue_input.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'queue' => [
+        'publishers' => [
+            'demo-publisher-1' => [
+                'name' => 'demo-publisher-1',
+                'connection' => 'amqp',
+                "exchange" => "magento"
+            ],
+            "test-publisher-5" => [
+                "name" => "test-publisher-5",
+                "connection" => "amqp",
+                "exchange" => "test-exchange-10"
+            ]
+        ],
+        "topics" => [
+            "publisher5.topic" => [
+                "name" => "publisher5.topic",
+                "schema" => [
+                    "schema_type" => "object",
+                    "schema_value" => "Magento\\MysqlMq\\Model\\DataObject"
+                ],
+                "response_schema" => [
+                    "schema_type" => "object",
+                    "schema_value" => "Magento\\Customer\\Api\\Data\\CustomerInterface"
+                ],
+                "publisher" => "test-publisher-5"
+            ]
+        ],
+        "binds" => [
+            "publisher5.topic--test-exchange-10--demo-queue-1" => [
+                "queue" => "demo-queue-1",
+                "exchange" => "test-exchange-10",
+                "topic" => "publisher5.topic"
+            ]
+        ],
+        "exchange_topic_to_queues_map" => [
+            "test-exchange-10--publisher5.topic" => [
+                "demo-queue-1"
+            ]
+        ]
+    ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
index a36da56bb46..1cfe77b22a6 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
@@ -9,6 +9,8 @@
 }
 
 namespace Magento\Framework\Session {
+
+    use Magento\Framework\App\State;
     // @codingStandardsIgnoreEnd
 
     /**
@@ -59,6 +61,16 @@ class SessionManagerTest extends \PHPUnit\Framework\TestCase
          */
         protected $objectManager;
 
+        /**
+         * @var \Magento\Framework\App\RequestInterface
+         */
+        private $request;
+
+        /**
+         * @var State|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $appState;
+
         protected function setUp()
         {
             $this->sessionName = 'frontEndSession';
@@ -69,7 +81,18 @@ protected function setUp()
             $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
             /** @var \Magento\Framework\Session\SidResolverInterface $sidResolver */
-            $this->_sidResolver = $this->objectManager->get(\Magento\Framework\Session\SidResolverInterface::class);
+            $this->appState = $this->getMockBuilder(State::class)
+                ->setMethods(['getAreaCode'])
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            /** @var \Magento\Framework\Session\SidResolver $sidResolver */
+            $this->_sidResolver = $this->objectManager->create(
+                \Magento\Framework\Session\SidResolver::class,
+                [
+                    'appState' => $this->appState,
+                ]
+            );
 
             $this->request = $this->objectManager->get(\Magento\Framework\App\RequestInterface::class);
 
@@ -144,6 +167,9 @@ public function testDestroy()
         public function testSetSessionId()
         {
             $sessionId = $this->_model->getSessionId();
+            $this->appState->expects($this->atLeastOnce())
+                ->method('getAreaCode')
+                ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
             $this->_model->setSessionId($this->_sidResolver->getSid($this->_model));
             $this->assertEquals($sessionId, $this->_model->getSessionId());
 
@@ -156,6 +182,9 @@ public function testSetSessionId()
          */
         public function testSetSessionIdFromParam()
         {
+            $this->appState->expects($this->atLeastOnce())
+                ->method('getAreaCode')
+                ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
             $this->assertNotEquals('test_id', $this->_model->getSessionId());
             $this->request->getQuery()->set($this->_sidResolver->getSessionIdQueryParam($this->_model), 'test-id');
             $this->_model->setSessionId($this->_sidResolver->getSid($this->_model));
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
index 2cfb8b47da7..6e043728b07 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Session;
 
+use Magento\Framework\App\State;
 use Zend\Stdlib\Parameters;
 
 class SidResolverTest extends \PHPUnit\Framework\TestCase
@@ -49,6 +50,11 @@ class SidResolverTest extends \PHPUnit\Framework\TestCase
      */
     protected $request;
 
+    /**
+     * @var State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $appState;
+
     protected function setUp()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -70,6 +76,11 @@ protected function setUp()
 
         $this->request = $objectManager->get(\Magento\Framework\App\RequestInterface::class);
 
+        $this->appState = $this->getMockBuilder(State::class)
+            ->setMethods(['getAreaCode'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = $objectManager->create(
             \Magento\Framework\Session\SidResolver::class,
             [
@@ -77,6 +88,7 @@ protected function setUp()
                 'urlBuilder' => $this->urlBuilder,
                 'sidNameMap' => [$this->customSessionName => $this->customSessionQueryParam],
                 'request' => $this->request,
+                'appState' => $this->appState,
             ]
         );
     }
@@ -95,6 +107,10 @@ public function tearDown()
      */
     public function testGetSid($sid, $useFrontedSid, $isOwnOriginUrl, $testSid)
     {
+        $this->appState->expects($this->atLeastOnce())
+            ->method('getAreaCode')
+            ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
+
         $this->scopeConfig->expects(
             $this->any()
         )->method(
diff --git a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
new file mode 100644
index 00000000000..3d717d62822
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MessageQueue\Model\Cron;
+
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
+use Magento\MessageQueue\Model\Cron\ConsumersRunner\PidConsumerManager;
+use Magento\Framework\App\DeploymentConfig\FileReader;
+use Magento\Framework\App\DeploymentConfig\Writer;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\ShellInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+
+/**
+ * Tests the different cases of consumers running by ConsumersRunner
+ *
+ * {@inheritdoc}
+ */
+class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * Consumer config provider
+     *
+     * @var ConsumerConfigInterface
+     */
+    private $consumerConfig;
+
+    /**
+     * @var PidConsumerManager
+     */
+    private $pid;
+
+    /**
+     * @var FileReader
+     */
+    private $reader;
+
+    /**
+     * @var ConsumersRunner
+     */
+    private $consumersRunner;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var ConfigFilePool
+     */
+    private $configFilePool;
+
+    /**
+     * @var ReinitableConfigInterface
+     */
+    private $appConfig;
+
+    /**
+     * @var ShellInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shellMock;
+
+    /**
+     * @var array
+     */
+    private $config;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->shellMock = $this->getMockBuilder(ShellInterface::class)
+            ->getMockForAbstractClass();
+        $this->pid = $this->objectManager->get(PidConsumerManager::class);
+        $this->consumerConfig = $this->objectManager->get(ConsumerConfigInterface::class);
+        $this->reader = $this->objectManager->get(FileReader::class);
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+        $this->configFilePool = $this->objectManager->get(ConfigFilePool::class);
+        $this->appConfig = $this->objectManager->get(ReinitableConfigInterface::class);
+        $this->consumersRunner = $this->objectManager->create(
+            ConsumersRunner::class,
+            ['shellBackground' => $this->shellMock]
+        );
+        $this->config = $this->loadConfig();
+
+        $this->shellMock->expects($this->any())
+            ->method('execute')
+            ->willReturnCallback(function ($command, $arguments) {
+                $command = vsprintf($command, $arguments);
+                $params = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getAppInitParams();
+                $params['MAGE_DIRS']['base']['path'] = BP;
+                $params = 'INTEGRATION_TEST_PARAMS="' . urldecode(http_build_query($params)) . '"';
+                $command = str_replace('bin/magento', 'dev/tests/integration/bin/magento', $command);
+                $command = $params . ' ' . $command;
+
+                return exec("{$command} > /dev/null &");
+            });
+    }
+
+    /**
+     * Checks that pid files are created
+     *
+     * @return void
+     */
+    public function testCheckThatPidFilesWasCreated()
+    {
+        $this->consumersRunner->run();
+        foreach ($this->consumerConfig->getConsumers() as $consumer) {
+            $this->waitConsumerPidFile($consumer->getName());
+        }
+    }
+
+    /**
+     * Tests running of specific consumer and his re-running when it is working
+     *
+     * @return void
+     */
+    public function testSpecificConsumerAndRerun()
+    {
+        $specificConsumer = 'quoteItemCleaner';
+        $pidFilePath = $specificConsumer . ConsumersRunner::PID_FILE_EXT;
+        $config = $this->config;
+        $config['cron_consumers_runner'] = ['consumers' => [$specificConsumer], 'max_messages' => 0];
+
+        $this->writeConfig($config);
+        $this->reRunConsumersAndCheckPidFiles($specificConsumer);
+        $pid = $this->pid->getPid($pidFilePath);
+        $this->reRunConsumersAndCheckPidFiles($specificConsumer);
+        $this->assertSame($pid, $this->pid->getPid($pidFilePath));
+    }
+
+    /**
+     * @param string $specificConsumer
+     * @return void
+     */
+    private function reRunConsumersAndCheckPidFiles($specificConsumer)
+    {
+        $this->consumersRunner->run();
+
+        sleep(20);
+
+        foreach ($this->consumerConfig->getConsumers() as $consumer) {
+            $consumerName = $consumer->getName();
+            $pidFileFullPath = $this->getPidFileFullPath($consumerName);
+
+            if ($consumerName === $specificConsumer) {
+                $this->assertTrue(file_exists($pidFileFullPath));
+            } else {
+                $this->assertFalse(file_exists($pidFileFullPath));
+            }
+        }
+    }
+
+    /**
+     * Tests disabling cron job which runs consumers
+     *
+     * @return void
+     */
+    public function testCronJobDisabled()
+    {
+        $config = $this->config;
+        $config['cron_consumers_runner'] = ['cron_run' => false];
+
+        $this->writeConfig($config);
+
+        $this->consumersRunner->run();
+
+        sleep(20);
+
+        foreach ($this->consumerConfig->getConsumers() as $consumer) {
+            $pidFileFullPath = $this->getPidFileFullPath($consumer->getName());
+            $this->assertFalse(file_exists($pidFileFullPath));
+        }
+    }
+
+    /**
+     * @param string $consumerName
+     * @return void
+     */
+    private function waitConsumerPidFile($consumerName)
+    {
+        $pidFileFullPath = $this->getPidFileFullPath($consumerName);
+        $i = 0;
+        do {
+            sleep(1);
+        } while (!file_exists($pidFileFullPath) && ($i++ < 60));
+
+        if (!file_exists($pidFileFullPath)) {
+            $this->fail($consumerName . ' pid file does not exist.');
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function loadConfig()
+    {
+        return $this->reader->load(ConfigFilePool::APP_ENV);
+    }
+
+    /**
+     * @param array $config
+     * @return void
+     */
+    private function writeConfig(array $config)
+    {
+        /** @var Writer $writer */
+        $writer = $this->objectManager->get(Writer::class);
+        $writer->saveConfig([ConfigFilePool::APP_ENV => $config]);
+    }
+
+    /**
+     * @param string $consumerName
+     * @return string
+     */
+    private function getPidFileFullPath($consumerName)
+    {
+        $directoryList = $this->objectManager->get(DirectoryList::class);
+        return $directoryList->getPath(DirectoryList::VAR_DIR) . '/' . $consumerName . ConsumersRunner::PID_FILE_EXT;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        foreach ($this->consumerConfig->getConsumers() as $consumer) {
+            $consumerName = $consumer->getName();
+            $pidFileFullPath = $this->getPidFileFullPath($consumerName);
+            $pidFilePath = $consumerName . ConsumersRunner::PID_FILE_EXT;
+            $pid = $this->pid->getPid($pidFilePath);
+
+            if ($pid && $this->pid->isRun($pidFilePath)) {
+                posix_kill($pid, SIGKILL);
+            }
+
+            if (file_exists($pidFileFullPath)) {
+                unlink($pidFileFullPath);
+            }
+        }
+
+        $this->filesystem->getDirectoryWrite(DirectoryList::CONFIG)->writeFile(
+            $this->configFilePool->getPath(ConfigFilePool::APP_ENV),
+            "<?php\n return array();\n"
+        );
+        $this->writeConfig($this->config);
+        $this->appConfig->reinit();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Plugin/ResourceModel/LockTest.php b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Plugin/ResourceModel/LockTest.php
new file mode 100644
index 00000000000..960114e35be
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Plugin/ResourceModel/LockTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MessageQueue\Model\Plugin\ResourceModel;
+
+use Magento\TestFramework\Event\Magento;
+
+class LockTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\LockInterface
+     */
+    protected $lock;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Lock\WriterInterface
+     */
+    protected $writer;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Lock\ReaderInterface
+     */
+    protected $reader;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->lock = $this->objectManager->get(\Magento\Framework\MessageQueue\LockInterface::class);
+        $this->writer = $this->objectManager->get(\Magento\Framework\MessageQueue\Lock\WriterInterface::class);
+        $this->reader = $this->objectManager->get(\Magento\Framework\MessageQueue\Lock\ReaderInterface::class);
+    }
+
+    /**
+     * Test to ensure Queue Lock Table is cleared when maintenance mode transitions from on to off.
+     *
+     * @return void
+     */
+    public function testLockClearedByMaintenanceModeOff()
+    {
+        /** @var $maintenanceMode \Magento\Framework\App\MaintenanceMode */
+        $maintenanceMode = $this->objectManager->get(\Magento\Framework\App\MaintenanceMode::class);
+        $code = md5('consumer.name-1');
+        $this->lock->setMessageCode($code);
+        $this->writer->saveLock($this->lock);
+        $this->reader->read($this->lock, $code);
+        $id = $this->lock->getId();
+        $maintenanceMode->set(true);
+        $maintenanceMode->set(false);
+        $this->reader->read($this->lock, $code);
+        $emptyId = $this->lock->getId();
+
+        $this->assertGreaterThanOrEqual('1', $id);
+        $this->assertEmpty($emptyId);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObject.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObject.php
new file mode 100644
index 00000000000..31843be00a5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObject.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+class DataObject extends \Magento\Framework\Api\AbstractExtensibleObject
+{
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_get('name');
+    }
+
+    /**
+     * @param string $name
+     * @return $this
+     */
+    public function setName($name)
+    {
+        return $this->setData('name', $name);
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getEntityId()
+    {
+        return $this->_get('entity_id');
+    }
+
+    /**
+     * @param int $entityId
+     * @return $this
+     */
+    public function setEntityId($entityId)
+    {
+        return $this->setData('entity_id', $entityId);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObjectRepository.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObjectRepository.php
new file mode 100644
index 00000000000..879872315ec
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/DataObjectRepository.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+class DataObjectRepository
+{
+    /**
+     * @param DataObject $dataObject
+     * @param string $requiredParam
+     * @param int|null $optionalParam
+     * @return bool
+     */
+    public function delayedOperation(
+        \Magento\MysqlMq\Model\DataObject $dataObject,
+        $requiredParam,
+        $optionalParam = null
+    ) {
+        echo "Processed '{$dataObject->getEntityId()}'; "
+            . "Required param '{$requiredParam}'; Optional param '{$optionalParam}'\n";
+        return true;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Driver/QueueTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Driver/QueueTest.php
new file mode 100644
index 00000000000..974d2d78079
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Driver/QueueTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model\Driver;
+
+use Magento\MysqlMq\Model\Driver\Queue;
+
+/**
+ * Test for MySQL queue driver class.
+ *
+ * @magentoDbIsolation disabled
+ */
+class QueueTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Queue
+     */
+    protected $queue;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var \Magento\Framework\MessageQueue\Config\Data $queueConfig */
+        $queueConfig = $this->objectManager->get(\Magento\Framework\MessageQueue\Config\Data::class);
+        $queueConfig->reset();
+
+        $this->queue = $this->objectManager->create(
+            \Magento\MysqlMq\Model\Driver\Queue::class,
+            ['queueName' => 'queue2']
+        );
+    }
+
+    protected function tearDown()
+    {
+        /** @var \Magento\Framework\MessageQueue\Config\Data $queueConfig */
+        $queueConfig = $this->objectManager->get(\Magento\Framework\MessageQueue\Config\Data::class);
+        $queueConfig->reset();
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testPushAndDequeue()
+    {
+        /** @var \Magento\Framework\MessageQueue\EnvelopeFactory $envelopFactory */
+        $envelopFactory = $this->objectManager->get(\Magento\Framework\MessageQueue\EnvelopeFactory::class);
+        $messageBody = '{"data": {"body": "Message body"}, "message_id": 1}';
+        $topicName = 'some.topic';
+        $envelop = $envelopFactory->create(['body' => $messageBody, 'properties' => ['topic_name' => $topicName]]);
+
+        $this->queue->push($envelop);
+
+        $messageFromQueue = $this->queue->dequeue();
+
+        $this->assertEquals($messageBody, $messageFromQueue->getBody());
+        $actualMessageProperties = $messageFromQueue->getProperties();
+        $this->assertArrayHasKey('topic_name', $actualMessageProperties);
+        $this->assertEquals($topicName, $actualMessageProperties['topic_name']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/ObserverTest.php
new file mode 100644
index 00000000000..c22bf2823c1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/ObserverTest.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+class ObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var \Magento\MysqlMq\Model\Observer
+     */
+    private $observer;
+
+    /**
+     * @var \Magento\MysqlMq\Model\QueueManagement
+     */
+    private $queueManagement;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->observer = $this->objectManager->get(\Magento\MysqlMq\Model\Observer::class);
+        $this->queueManagement = $this->objectManager->get(\Magento\MysqlMq\Model\QueueManagement::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages_done_old.php
+     */
+    public function testCleanUpOld()
+    {
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory $messageStatusCollectionFactory */
+        $messageStatusCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory::class);
+
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory $messageStatusCollectionFactory */
+        $messageCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory::class);
+
+        //Check how many messages in collection by the beginning of tests
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic.updated.use.just.in.tests');
+        $this->assertEquals(1, $messageCollection->getSize());
+        $messageId = $messageCollection->getFirstItem()->getId();
+
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId);
+        $this->assertEquals(3, $messageStatusCollection->getSize());
+
+        //Run clean up once. It should move 3 out of 4 statuses to TO BE DELETED status
+        $this->observer->cleanupMessages();
+
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic.updated.use.just.in.tests');
+        $this->assertEquals(0, $messageCollection->getSize());
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId);
+        $this->assertEquals(0, $messageStatusCollection->getSize());
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages_done_old.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages_done_recent.php
+     */
+    public function testCleanupMessages()
+    {
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory $messageStatusCollectionFactory */
+        $messageStatusCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory::class);
+
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory $messageStatusCollectionFactory */
+        $messageCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory::class);
+
+        //Check how many messages in collection by the beginning of tests
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic.updated.use.just.in.tests');
+        $this->assertEquals(1, $messageCollection->getSize());
+        $messageId = $messageCollection->getFirstItem()->getId();
+
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId);
+        $this->assertEquals(4, $messageStatusCollection->getSize());
+
+        //Run clean up once. It should move 3 out of 4 statuses to TO BE DELETED status
+        $this->observer->cleanupMessages();
+
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic.updated.use.just.in.tests');
+        $this->assertEquals(1, $messageCollection->getSize());
+
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId)
+            ->addFieldToFilter('status', \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_TO_BE_DELETED);
+
+        $this->assertEquals(3, $messageStatusCollection->getSize());
+
+        // Change the Updated At in order to make job visible
+        $lastMessageStatus = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId)
+            ->addFieldToFilter('status', \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE)
+            ->getFirstItem();
+        $lastMessageStatus->setUpdatedAt(time() - 1 - 24 * 7 * 60 * 60)
+            ->save();
+
+        $this->observer->cleanupMessages();
+
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic.updated.use.just.in.tests');
+        $this->assertEquals(0, $messageCollection->getSize());
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId);
+        $this->assertEquals(0, $messageStatusCollection->getSize());
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages.php
+     * @magentoDataFixture Magento/MysqlMq/_files/messages_in_progress.php
+     */
+    public function testCleanupInProgressMessages()
+    {
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory $messageStatusCollectionFactory */
+        $messageStatusCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageStatusCollectionFactory::class);
+
+        /** @var \Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory $messageStatusCollectionFactory */
+        $messageCollectionFactory = $this->objectManager
+            ->create(\Magento\MysqlMq\Model\ResourceModel\MessageCollectionFactory::class);
+
+        //Check how many messages in collection by the beginning of tests
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic_second.updated.use.just.in.tests');
+        $this->assertEquals(1, $messageCollection->getSize());
+        $messageId = $messageCollection->getFirstItem()->getId();
+
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId);
+        $this->assertEquals(2, $messageStatusCollection->getSize());
+
+        $this->observer->cleanupMessages();
+
+        $messageCollection = $messageCollectionFactory->create()
+            ->addFieldToFilter('topic_name', 'topic_second.updated.use.just.in.tests');
+        $this->assertEquals(1, $messageCollection->getSize());
+        $messageStatusCollection = $messageStatusCollectionFactory->create()
+            ->addFieldToFilter('message_id', $messageId)
+            ->addFieldToFilter('status', \Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED);
+        $this->assertEquals(1, $messageStatusCollection->getSize());
+        $this->assertEquals(1, $messageStatusCollection->getFirstItem()->getNumberOfTrials());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Processor.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Processor.php
new file mode 100644
index 00000000000..3b2a76104a2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/Processor.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+/**
+ * Test message processor is used by \Magento\MysqlMq\Model\PublisherTest
+ */
+class Processor
+{
+    /**
+     * @param \Magento\MysqlMq\Model\DataObject $message
+     */
+    public function processMessage($message)
+    {
+        echo "Processed {$message->getEntityId()}\n";
+    }
+
+    /**
+     * @param \Magento\MysqlMq\Model\DataObject $message
+     */
+    public function processMessageWithException($message)
+    {
+        throw new \LogicException("Exception during message processing happened. Entity: {{$message->getEntityId()}}");
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/PublisherConsumerTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/PublisherConsumerTest.php
new file mode 100644
index 00000000000..f03d03d3a25
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/PublisherConsumerTest.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+use Magento\Framework\MessageQueue\PublisherInterface;
+
+/**
+ * Test for MySQL publisher class.
+ *
+ * @magentoDbIsolation disabled
+ */
+class PublisherConsumerTest extends \PHPUnit\Framework\TestCase
+{
+    const MAX_NUMBER_OF_TRIALS = 3;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\PublisherInterface
+     */
+    protected $publisher;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->markTestIncomplete('Should be converted to queue config v2.');
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $configPath = __DIR__ . '/../etc/queue.xml';
+        $fileResolverMock = $this->createMock(\Magento\Framework\Config\FileResolverInterface::class);
+        $fileResolverMock->expects($this->any())
+            ->method('get')
+            ->willReturn([$configPath => file_get_contents(($configPath))]);
+
+        /** @var \Magento\Framework\MessageQueue\Config\Reader\Xml $xmlReader */
+        $xmlReader = $this->objectManager->create(
+            \Magento\Framework\MessageQueue\Config\Reader\Xml::class,
+            ['fileResolver' => $fileResolverMock]
+        );
+
+        $newData = $xmlReader->read();
+
+        /** @var \Magento\Framework\MessageQueue\Config\Data $configData */
+        $configData = $this->objectManager->get(\Magento\Framework\MessageQueue\Config\Data::class);
+        $configData->reset();
+        $configData->merge($newData);
+
+        $this->publisher = $this->objectManager->create(\Magento\Framework\MessageQueue\PublisherInterface::class);
+    }
+
+    protected function tearDown()
+    {
+        $this->markTestIncomplete('Should be converted to queue config v2.');
+        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX);
+        $this->consumeMessages('demoConsumerQueueTwo', PHP_INT_MAX);
+        $this->consumeMessages('demoConsumerQueueThree', PHP_INT_MAX);
+        $this->consumeMessages('demoConsumerQueueFour', PHP_INT_MAX);
+        $this->consumeMessages('demoConsumerQueueFive', PHP_INT_MAX);
+        $this->consumeMessages('demoConsumerQueueOneWithException', PHP_INT_MAX);
+
+        $objectManagerConfiguration = [\Magento\Framework\MessageQueue\Config\Reader\Xml::class => [
+                'arguments' => [
+                    'fileResolver' => ['instance' => \Magento\Framework\Config\FileResolverInterface::class],
+                ],
+            ],
+        ];
+        $this->objectManager->configure($objectManagerConfiguration);
+        /** @var \Magento\Framework\MessageQueue\Config\Data $queueConfig */
+        $queueConfig = $this->objectManager->get(\Magento\Framework\MessageQueue\Config\Data::class);
+        $queueConfig->reset();
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testPublishConsumeFlow()
+    {
+        /** @var \Magento\MysqlMq\Model\DataObjectFactory $objectFactory */
+        $objectFactory = $this->objectManager->create(\Magento\MysqlMq\Model\DataObjectFactory::class);
+        /** @var \Magento\MysqlMq\Model\DataObject $object */
+        $object = $objectFactory->create();
+        for ($i = 0; $i < 10; $i++) {
+            $object->setName('Object name ' . $i)->setEntityId($i);
+            $this->publisher->publish('demo.object.created', $object);
+        }
+        for ($i = 0; $i < 5; $i++) {
+            $object->setName('Object name ' . $i)->setEntityId($i);
+            $this->publisher->publish('demo.object.updated', $object);
+        }
+        for ($i = 0; $i < 3; $i++) {
+            $object->setName('Object name ' . $i)->setEntityId($i);
+            $this->publisher->publish('demo.object.custom.created', $object);
+        }
+
+        $outputPattern = '/(Processed \d+\s)/';
+        /** There are total of 10 messages in the first queue, total expected consumption is 7, 3 then 0 */
+        $this->consumeMessages('demoConsumerQueueOne', 7, 7, $outputPattern);
+        /** Consumer all messages which left in this queue */
+        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX, 3, $outputPattern);
+        $this->consumeMessages('demoConsumerQueueOne', 7, 0, $outputPattern);
+
+        /** Verify that messages were added correctly to second queue for update and create topics */
+        $this->consumeMessages('demoConsumerQueueTwo', 20, 15, $outputPattern);
+
+        /** Verify that messages were NOT added to fourth queue */
+        $this->consumeMessages('demoConsumerQueueFour', 11, 0, $outputPattern);
+
+        /** Verify that messages were added correctly by '*' pattern in bind config to third queue */
+        $this->consumeMessages('demoConsumerQueueThree', 20, 15, $outputPattern);
+
+        /** Verify that messages were added correctly by '#' pattern in bind config to fifth queue */
+        $this->consumeMessages('demoConsumerQueueFive', 20, 18, $outputPattern);
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testPublishAndConsumeWithFailedJobs()
+    {
+        /** @var \Magento\MysqlMq\Model\DataObjectFactory $objectFactory */
+        $objectFactory = $this->objectManager->create(\Magento\MysqlMq\Model\DataObjectFactory::class);
+        /** @var \Magento\MysqlMq\Model\DataObject $object */
+        /** Try consume messages for MAX_NUMBER_OF_TRIALS and then consumer them without exception */
+        $object = $objectFactory->create();
+        for ($i = 0; $i < 5; $i++) {
+            $object->setName('Object name ' . $i)->setEntityId($i);
+            $this->publisher->publish('demo.object.created', $object);
+        }
+        $outputPattern = '/(Processed \d+\s)/';
+        for ($i = 0; $i < self::MAX_NUMBER_OF_TRIALS; $i++) {
+            $this->consumeMessages('demoConsumerQueueOneWithException', PHP_INT_MAX, 0, $outputPattern);
+        }
+        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX, 0, $outputPattern);
+
+        /** Try consume messages for MAX_NUMBER_OF_TRIALS+1 and then consumer them without exception */
+        for ($i = 0; $i < 5; $i++) {
+            $object->setName('Object name ' . $i)->setEntityId($i);
+            $this->publisher->publish('demo.object.created', $object);
+        }
+        /** Try consume messages for MAX_NUMBER_OF_TRIALS and then consumer them without exception */
+        for ($i = 0; $i < self::MAX_NUMBER_OF_TRIALS + 1; $i++) {
+            $this->consumeMessages('demoConsumerQueueOneWithException', PHP_INT_MAX, 0, $outputPattern);
+        }
+        /** Make sure that messages are not accessible anymore after number of trials is exceeded */
+        $this->consumeMessages('demoConsumerQueueOne', PHP_INT_MAX, 0, $outputPattern);
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testPublishAndConsumeSchemaDefinedByMethod()
+    {
+        /** @var \Magento\MysqlMq\Model\DataObjectFactory $objectFactory */
+        $objectFactory = $this->objectManager->create(\Magento\MysqlMq\Model\DataObjectFactory::class);
+        /** @var \Magento\MysqlMq\Model\DataObject $object */
+        $object = $objectFactory->create();
+        $id = 33;
+        $object->setName('Object name ' . $id)->setEntityId($id);
+        $requiredStringParam = 'Required value';
+        $optionalIntParam = 44;
+        $this->publisher->publish('test.schema.defined.by.method', [$object, $requiredStringParam, $optionalIntParam]);
+        $outputPattern = "/Processed '{$object->getEntityId()}'; "
+            . "Required param '{$requiredStringParam}'; Optional param '{$optionalIntParam}'/";
+        $this->consumeMessages('delayedOperationConsumer', PHP_INT_MAX, 1, $outputPattern);
+    }
+
+    /**
+     * Make sure that consumers consume correct number of messages.
+     *
+     * @param string $consumerName
+     * @param int|null $messagesToProcess
+     * @param int|null $expectedNumberOfProcessedMessages
+     * @param string|null $outputPattern
+     */
+    protected function consumeMessages(
+        $consumerName,
+        $messagesToProcess,
+        $expectedNumberOfProcessedMessages = null,
+        $outputPattern = null
+    ) {
+        /** @var \Magento\Framework\MessageQueue\ConsumerFactory $consumerFactory */
+        $consumerFactory = $this->objectManager->create(\Magento\Framework\MessageQueue\ConsumerFactory::class);
+        $consumer = $consumerFactory->get($consumerName);
+        ob_start();
+        $consumer->process($messagesToProcess);
+        $consumersOutput = ob_get_contents();
+        ob_end_clean();
+        if ($outputPattern) {
+            $this->assertEquals(
+                $expectedNumberOfProcessedMessages,
+                preg_match_all($outputPattern, $consumersOutput)
+            );
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php
new file mode 100644
index 00000000000..197df292332
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MysqlMq\Model;
+
+use Magento\MysqlMq\Model\QueueManagement;
+
+/**
+ * Test for Queue Management class.
+ */
+class QueueManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var QueueManagement
+     */
+    protected $queueManagement;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->queueManagement = $this->objectManager->create(\Magento\MysqlMq\Model\QueueManagement::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testAllFlows()
+    {
+        $this->queueManagement->addMessageToQueues('topic1', 'messageBody1', ['queue1', 'queue2']);
+        $this->queueManagement->addMessageToQueues('topic2', 'messageBody2', ['queue2', 'queue3']);
+        $this->queueManagement->addMessageToQueues('topic3', 'messageBody3', ['queue1', 'queue3']);
+        $this->queueManagement->addMessageToQueues('topic4', 'messageBody4', ['queue1', 'queue2', 'queue3']);
+        $maxMessagesNumber = 2;
+        $messages = $this->queueManagement->readMessages('queue3', $maxMessagesNumber);
+
+        $this->assertCount($maxMessagesNumber, $messages);
+
+        $firstMessage = array_shift($messages);
+        $this->assertEquals('topic2', $firstMessage[QueueManagement::MESSAGE_TOPIC]);
+        $this->assertEquals('messageBody2', $firstMessage[QueueManagement::MESSAGE_BODY]);
+        $this->assertEquals('queue3', $firstMessage[QueueManagement::MESSAGE_QUEUE_NAME]);
+        $this->assertEquals(
+            QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
+            $firstMessage[QueueManagement::MESSAGE_STATUS]
+        );
+        $this->assertTrue(is_numeric($firstMessage[QueueManagement::MESSAGE_QUEUE_ID]));
+        $this->assertTrue(is_numeric($firstMessage[QueueManagement::MESSAGE_ID]));
+        $this->assertTrue(is_numeric($firstMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]));
+        $this->assertEquals(0, $firstMessage[QueueManagement::MESSAGE_NUMBER_OF_TRIALS]);
+        $this->assertCount(12, date_parse($firstMessage[QueueManagement::MESSAGE_UPDATED_AT]));
+
+        $secondMessage = array_shift($messages);
+        $this->assertEquals('topic3', $secondMessage[QueueManagement::MESSAGE_TOPIC]);
+        $this->assertEquals('messageBody3', $secondMessage[QueueManagement::MESSAGE_BODY]);
+        $this->assertEquals('queue3', $secondMessage[QueueManagement::MESSAGE_QUEUE_NAME]);
+        $this->assertEquals(
+            QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
+            $secondMessage[QueueManagement::MESSAGE_STATUS]
+        );
+        $this->assertTrue(is_numeric($secondMessage[QueueManagement::MESSAGE_QUEUE_ID]));
+        $this->assertTrue(is_numeric($secondMessage[QueueManagement::MESSAGE_ID]));
+        $this->assertTrue(is_numeric($secondMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]));
+        $this->assertEquals(0, $secondMessage[QueueManagement::MESSAGE_NUMBER_OF_TRIALS]);
+        $this->assertCount(12, date_parse($secondMessage[QueueManagement::MESSAGE_UPDATED_AT]));
+
+        /** Mark one message as complete or failed and make sure it is not displayed in the list of read messages */
+        $this->queueManagement->changeStatus(
+            [
+                $secondMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]
+            ],
+            QueueManagement::MESSAGE_STATUS_COMPLETE
+        );
+        $messages = $this->queueManagement->readMessages('queue3', $maxMessagesNumber);
+        $this->assertCount(1, $messages);
+
+        $this->queueManagement->changeStatus(
+            [
+                $firstMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]
+            ],
+            QueueManagement::MESSAGE_STATUS_ERROR
+        );
+        $messages = $this->queueManagement->readMessages('queue3', $maxMessagesNumber);
+        $this->assertCount(0, $messages);
+
+        /** Ensure that message for retry is still accessible when reading messages from the queue */
+        $messages = $this->queueManagement->readMessages('queue2', 1);
+        $message = array_shift($messages);
+        $messageRelationId = $message[QueueManagement::MESSAGE_QUEUE_RELATION_ID];
+
+        for ($i = 0; $i < 2; $i++) {
+            $this->assertEquals($i, $message[QueueManagement::MESSAGE_NUMBER_OF_TRIALS]);
+            $this->queueManagement->pushToQueueForRetry($message[QueueManagement::MESSAGE_QUEUE_RELATION_ID]);
+            $messages = $this->queueManagement->readMessages('queue2', 1);
+            $message = array_shift($messages);
+            $this->assertEquals($messageRelationId, $message[QueueManagement::MESSAGE_QUEUE_RELATION_ID]);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages.php b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages.php
new file mode 100644
index 00000000000..413ff50f709
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\MysqlMq\Model\MessageFactory $messageFactory */
+$messageFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageFactory::class);
+$message = $messageFactory->create();
+
+$message->setTopicName('topic.updated.use.just.in.tests')
+    ->setBody('{test:test}')
+    ->save();
+
+$message = $messageFactory->create();
+
+$message->setTopicName('topic_second.updated.use.just.in.tests')
+    ->setBody('{test:test}')
+    ->save();
+
+$message = $messageFactory->create();
+
+$message->setTopicName('topic_thrird.updated.use.just.in.tests')
+    ->setBody('{test:test}')
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_old.php b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_old.php
new file mode 100644
index 00000000000..64d0ffcadde
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_old.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\MysqlMq\Model\MessageFactory $messageFactory */
+$messageFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageFactory::class);
+$message1 = $messageFactory->create()
+    ->load('topic.updated.use.just.in.tests', 'topic_name');
+
+$messageId1 = $message1->getId();
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$queueFactory = $objectManager->create(\Magento\MysqlMq\Model\QueueFactory::class);
+$queueId1 = $queueFactory->create()
+    ->load('queue1', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId2 = $queueFactory->create()
+    ->load('queue2', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId3 = $queueFactory->create()
+    ->load('queue3', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId4 = $queueFactory->create()
+    ->load('queue4', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+
+$plan = [
+    [
+        $messageId1,
+        $queueId1,
+        time() - 1 - 24 * 7 * 60 * 60, Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE
+    ],
+    [
+        $messageId1,
+        $queueId2,
+        time() - 1 - 24 * 7 * 60 * 60, Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_ERROR
+    ],
+    [
+        $messageId1,
+        $queueId3,
+        time() - 1 - 24 * 7 * 60 * 60, Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE
+    ],
+];
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$messageStatusFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageStatusFactory::class);
+foreach ($plan as $instruction) {
+    $messageStatus = $messageStatusFactory->create();
+
+    $messageStatus->setQueueId($instruction[1])
+        ->setMessageId($instruction[0])
+        ->setUpdatedAt($instruction[2])
+        ->setStatus($instruction[3])
+        ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_recent.php b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_recent.php
new file mode 100644
index 00000000000..2a0f09b9967
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_done_recent.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\MysqlMq\Model\MessageFactory $messageFactory */
+$messageFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageFactory::class);
+$message1 = $messageFactory->create()
+    ->load('topic.updated.use.just.in.tests', 'topic_name');
+
+$messageId1 = $message1->getId();
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$queueFactory = $objectManager->create(\Magento\MysqlMq\Model\QueueFactory::class);
+$queueId4 = $queueFactory->create()
+    ->load('queue4', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+
+$plan = [
+    [$messageId1, $queueId4, time(), Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_COMPLETE],
+];
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$messageStatusFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageStatusFactory::class);
+foreach ($plan as $instruction) {
+    $messageStatus = $messageStatusFactory->create();
+
+    $messageStatus->setQueueId($instruction[1])
+        ->setMessageId($instruction[0])
+        ->setUpdatedAt($instruction[2])
+        ->setStatus($instruction[3])
+        ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_in_progress.php b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_in_progress.php
new file mode 100644
index 00000000000..88607060f4f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/messages_in_progress.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\MysqlMq\Model\MessageFactory $messageFactory */
+$messageFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageFactory::class);
+$message1 = $messageFactory->create()
+    ->load('topic_second.updated.use.just.in.tests', 'topic_name');
+
+$messageId1 = $message1->getId();
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$queueFactory = $objectManager->create(\Magento\MysqlMq\Model\QueueFactory::class);
+$queueId1 = $queueFactory->create()
+    ->load('queue1', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId2 = $queueFactory->create()
+    ->load('queue2', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId3 = $queueFactory->create()
+    ->load('queue3', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+$queueId4 = $queueFactory->create()
+    ->load('queue4', Magento\MysqlMq\Model\Queue::KEY_NAME)
+    ->getId();
+
+$plan = [
+    [$messageId1, $queueId1, time() - 1 - 24 * 7 * 60 * 60,
+        Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS],
+    [$messageId1, $queueId2, time(), Magento\MysqlMq\Model\QueueManagement::MESSAGE_STATUS_IN_PROGRESS],
+];
+
+/** @var \Magento\MysqlMq\Model\MessageStatusFactory $messageStatusFactory */
+$messageStatusFactory = $objectManager->create(\Magento\MysqlMq\Model\MessageStatusFactory::class);
+foreach ($plan as $instruction) {
+    $messageStatus = $messageStatusFactory->create();
+
+    $messageStatus->setQueueId($instruction[1])
+        ->setMessageId($instruction[0])
+        ->setUpdatedAt($instruction[2])
+        ->setStatus($instruction[3])
+        ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/_files/queues.php b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/queues.php
new file mode 100644
index 00000000000..4038ee1bd12
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/_files/queues.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$queues = [
+    'queue1',
+    'queue2',
+    'queue3',
+    'queue4',
+    'demo-queue-1',
+    'demo-queue-2',
+    'demo-queue-3',
+    'demo-queue-4',
+    'demo-queue-5',
+    'demo-queue-6',
+    'demo-queue-7',
+    'demo-queue-8',
+    'demo-queue-9',
+];
+foreach ($queues as $queueName) {
+    /** @var \Magento\MysqlMq\Model\Queue $queue */
+    $queue = $objectManager->create(\Magento\MysqlMq\Model\Queue::class);
+    $queue->load($queueName, 'name');
+    if (!$queue->getId()) {
+        $queue->setName($queueName)->save();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/etc/queue.xml b/dev/tests/integration/testsuite/Magento/MysqlMq/etc/queue.xml
new file mode 100644
index 00000000000..fd618d504df
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/etc/queue.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
+    <publisher name="demo-publisher-1" connection="db" exchange="magento"/>
+    <publisher name="demo-publisher-2" connection="db" exchange="magento"/>
+
+    <publisher name="test-publisher-1" connection="amqp" exchange="magento"/>
+    <publisher name="test-publisher-3" connection="amqp" exchange="test-exchange-1"/>
+
+    <topic name="demo.object.created" schema="Magento\MysqlMq\Model\DataObject" publisher="demo-publisher-1"/>
+    <topic name="demo.object.updated" schema="Magento\MysqlMq\Model\DataObject" publisher="demo-publisher-2"/>
+    <topic name="demo.object.custom.created" schema="Magento\MysqlMq\Model\DataObject" publisher="demo-publisher-2"/>
+
+    <topic name="test.schema.defined.by.method" schema="Magento\MysqlMq\Model\DataObjectRepository::delayedOperation" publisher="demo-publisher-2"/>
+
+    <topic name="customer.created" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
+    <topic name="customer.created.one" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
+    <topic name="customer.created.one.two" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
+    <topic name="customer.created.two" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="test-publisher-1"/>
+    <topic name="customer.updated" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="demo-publisher-2"/>
+    <topic name="customer.deleted" schema="Magento\Customer\Api\Data\CustomerInterface" publisher="demo-publisher-2"/>
+    <topic name="cart.created" schema="Magento\Quote\Api\Data\CartInterface" publisher="test-publisher-3"/>
+    <topic name="cart.created.one" schema="Magento\Quote\Api\Data\CartInterface" publisher="test-publisher-3"/>
+
+    <consumer name="demoConsumerQueueOne" queue="demo-queue-1" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    <consumer name="demoConsumerQueueOneWithException" queue="demo-queue-1" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessageWithException"/>
+    <consumer name="demoConsumerQueueTwo" queue="demo-queue-2" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    <consumer name="demoConsumerQueueThree" queue="demo-queue-3" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    <consumer name="demoConsumerQueueFour" queue="demo-queue-4" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    <consumer name="demoConsumerQueueFive" queue="demo-queue-5" connection="db" class="\Magento\MysqlMq\Model\Processor" method="processMessage"/>
+
+    <consumer name="customerCreatedListener" queue="test-queue-1" connection="amqp" class="Magento\MysqlMq\Model\Processor" method="processMessage"/>
+    <consumer name="customerDeletedListener" queue="test-queue-2" connection="db" class="Magento\MysqlMq\Model\Processor" method="processMessage" max_messages="98765"/>
+    <consumer name="cartCreatedListener" queue="test-queue-3" connection="amqp" class="Magento\MysqlMq\Model\Processor" method="processMessage"/>
+
+    <consumer name="delayedOperationConsumer" queue="demo-queue-6" connection="db" class="Magento\MysqlMq\Model\DataObjectRepository" method="delayedOperation"/>
+
+    <bind queue="demo-queue-1" exchange="magento" topic="demo.object.created"/>
+    <bind queue="demo-queue-2" exchange="magento" topic="demo.object.created"/>
+    <bind queue="demo-queue-2" exchange="magento" topic="demo.object.updated"/>
+    <bind queue="demo-queue-3" exchange="magento" topic="demo.object.*"/>
+    <bind queue="demo-queue-5" exchange="magento" topic="demo.object.#"/>
+
+    <bind queue="demo-queue-6" exchange="magento" topic="test.schema.defined.by.method"/>
+
+    <bind queue="test-queue-1" exchange="magento" topic="customer.created"/>
+    <bind queue="test-queue-1" exchange="magento" topic="customer.created.one"/>
+    <bind queue="test-queue-1" exchange="magento" topic="customer.created.one.two"/>
+    <bind queue="test-queue-1" exchange="magento" topic="customer.created.two"/>
+    <bind queue="test-queue-1" exchange="magento" topic="customer.updated"/>
+    <bind queue="test-queue-1" exchange="test-exchange-1" topic="cart.created"/>
+    <bind queue="test-queue-2" exchange="magento" topic="customer.created"/>
+    <bind queue="test-queue-2" exchange="magento" topic="customer.deleted"/>
+    <bind queue="test-queue-3" exchange="magento" topic="cart.created"/>
+    <bind queue="test-queue-3" exchange="magento" topic="cart.created.one"/>
+    <bind queue="test-queue-3" exchange="test-exchange-1" topic="cart.created"/>
+    <bind queue="test-queue-4" exchange="magento" topic="customer.*"/>
+    <bind queue="test-queue-5" exchange="magento" topic="customer.#"/>
+    <bind queue="test-queue-7" exchange="magento" topic="*.created.*"/>
+    <bind queue="test-queue-8" exchange="magento" topic="*.created.#"/>
+    <bind queue="test-queue-9" exchange="magento" topic="#"/>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml
index 68a01658214..3eeb141c2e6 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="reference_table" resource="sales">
         <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
         <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log.php
new file mode 100644
index 00000000000..0ad786b67b8
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+return ['CREATE TABLE `reference_table` (
+`tinyint_ref` tinyint(7)  NOT NULL  AUTO_INCREMENT , 
+`tinyint_without_padding` tinyint(2)  NOT NULL DEFAULT 0  , 
+`bigint_without_padding` bigint(20)  NOT NULL DEFAULT 0  , 
+`smallint_without_padding` smallint(5)  NOT NULL DEFAULT 0  , 
+`integer_without_padding` int(11)  NOT NULL DEFAULT 0  , 
+`smallint_with_big_padding` smallint(254)  NOT NULL DEFAULT 0  , 
+`smallint_without_default` smallint(2)  NULL   , 
+`int_without_unsigned` int(2)  NULL   , 
+`int_unsigned` int(2) UNSIGNED NULL   , 
+`bigint_default_nullable` bigint(2) UNSIGNED NULL DEFAULT 1  , 
+`bigint_not_default_not_nullable` bigint(2) UNSIGNED NOT NULL   , 
+CONSTRAINT  PRIMARY KEY (`tinyint_ref`)
+) ENGINE=innodb 
+
+CREATE TABLE `auto_increment_test` (
+`int_auto_increment_with_nullable` int(12) UNSIGNED NOT NULL  AUTO_INCREMENT , 
+`int_disabled_auto_increment` smallint(12) UNSIGNED NULL DEFAULT 0  , 
+CONSTRAINT `unique_null_key` UNIQUE KEY (`int_auto_increment_with_nullable`)
+) ENGINE=innodb 
+
+CREATE TABLE `test_table` (
+`smallint` smallint(3)  NOT NULL  AUTO_INCREMENT , 
+`tinyint` tinyint(7)  NULL   , 
+`bigint` bigint(13)  NULL DEFAULT 0  , 
+`float` float(12, 4)  NULL DEFAULT 0 , 
+`double` decimal(14, 6)  NULL DEFAULT 11111111.111111 , 
+`decimal` decimal(15, 4)  NULL DEFAULT 0 , 
+`date` date NULL , 
+`timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP , 
+`datetime` datetime NULL DEFAULT 0  , 
+`longtext` longtext NULL , 
+`mediumtext` mediumtext NULL , 
+`varchar` varchar(254) NULL  , 
+`mediumblob` mediumblob NULL , 
+`blob` blob NULL , 
+`boolean` BOOLEAN NULL  , 
+CONSTRAINT `some_unique_key` UNIQUE KEY (`smallint`,`bigint`), 
+CONSTRAINT `some_foreign_key` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`)  ON DELETE NO ACTION, 
+INDEX `speedup_index` (`tinyint`,`bigint`)
+) ENGINE=innodb 
+
+CREATE TABLE `patch_list` (
+`patch_id` int(11)  NOT NULL  AUTO_INCREMENT COMMENT "Patch Auto Increment", 
+`patch_name` varchar(1024) NOT NULL  COMMENT "Patch Class Name", 
+CONSTRAINT  PRIMARY KEY (`patch_id`)
+) ENGINE=innodb COMMENT="List of data/schema patches"
+
+'];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.php
new file mode 100644
index 00000000000..ccc2d5b7929
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+return ['ALTER TABLE `reference_table` MODIFY COLUMN `tinyint_without_padding` tinyint(2)  NOT NULL   , MODIFY COLUMN `bigint_default_nullable` bigint(2) UNSIGNED NULL DEFAULT 123  , MODIFY COLUMN `bigint_not_default_not_nullable` bigint(20)  NOT NULL   
+
+ALTER TABLE `auto_increment_test` MODIFY COLUMN `int_auto_increment_with_nullable` int(15) UNSIGNED NULL   
+
+ALTER TABLE `test_table` MODIFY COLUMN `float` float(12, 10)  NULL DEFAULT 0 , MODIFY COLUMN `double` double(245, 10)  NULL  , MODIFY COLUMN `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP  , MODIFY COLUMN `varchar` varchar(100) NULL  , MODIFY COLUMN `boolean` BOOLEAN NULL DEFAULT 1 
+
+'];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml
index 59dc94bf5e0..0929fe8db8c 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_modifications/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="reference_table" resource="sales">
         <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
         <column xsi:type="tinyint" name="tinyint_without_padding" nullable="false" unsigned="false"/>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml
index fcb3a7b5fa0..e7361dd28fc 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/column_removals/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="reference_table" resource="default">
         <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
         <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml
index 353760b450a..97f1862e140 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/constraint_modifications/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="reference_table" resource="default">
         <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
         <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml
index 4206ddc16be..57403cbea3f 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/drop_table/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="auto_increment_test" resource="default">
         <column xsi:type="int" name="int_auto_increment_with_nullable" identity="true" padding="12" unsigned="true"
                 nullable="true"/>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_column_declaration/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_column_declaration/db_schema.xml
index fac0e4011e9..b79f9d5beb5 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_column_declaration/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_column_declaration/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="test_table" resource="sales">
         <!--Columns-->
         <column xsi:type="smallint" name="smallint" default="0" scale="1" padding="3"/>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_unique_key_declaration/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_unique_key_declaration/db_schema.xml
index d98b3c7358d..787d6d9ce5a 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_unique_key_declaration/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/fail_on_unique_key_declaration/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="test_table" resource="sales">
         <!--Columns-->
         <column xsi:type="smallint" name="smallint" default="0" padding="3"/>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml
index 5cc5f4af124..a2895ee56d6 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/foreign_key_interpreter/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="reference_table" resource="sales">
         <column xsi:type="tinyint" name="tinyint_ref" default="0" padding="7" nullable="true" unsigned="false"/>
     </table>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml
index f5989c1af90..97b375d228e 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="reference_table" resource="default" comment="Reference table">
         <column xsi:type="smallint" name="smallint_ref" padding="6" nullable="false" unsigned="false" identity="true" comment="Smallint"/>
         <constraint xsi:type="primary" name="tinyint_primary">
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff_before/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff_before/db_schema.xml
index ab3d5c0f97d..7598fbd5429 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff_before/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/old_diff_before/db_schema.xml
@@ -6,5 +6,5 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
 </schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml
index 21691d23b6d..00b5d6f9bb2 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="reference_table" resource="default">
         <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
         <column xsi:type="int" name="some_integer" default="0" nullable="false" unsigned="false"/>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/BicPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/BicPatch.php
index bcff205a268..d12e8feda26 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/BicPatch.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/BicPatch.php
@@ -6,9 +6,9 @@
 namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchRevertableInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * @package Magento\TestSetupDeclarationModule3\Setup
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/RefBicPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/RefBicPatch.php
index 379b38ef1b8..a2db3bc8f41 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/RefBicPatch.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/cyclomatic_and_bic_revision/RefBicPatch.php
@@ -6,9 +6,9 @@
 namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchRevertableInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * @package Magento\TestSetupDeclarationModule3\Setup
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/IncrementalSomeIntegerPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/IncrementalSomeIntegerPatch.php
index 37e976f1a51..b0ddae1a12c 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/IncrementalSomeIntegerPatch.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/IncrementalSomeIntegerPatch.php
@@ -6,9 +6,9 @@
 namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchRevertableInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallData
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/LlNextChainPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/LlNextChainPatch.php
index 02d200851f0..341da3bf7f3 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/LlNextChainPatch.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/LlNextChainPatch.php
@@ -6,9 +6,9 @@
 namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchRevertableInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * @package Magento\TestSetupDeclarationModule3\Setup
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/NextChainPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/NextChainPatch.php
index c953663a857..cdb594d548f 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/NextChainPatch.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/NextChainPatch.php
@@ -6,9 +6,9 @@
 namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchRevertableInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * @package Magento\TestSetupDeclarationModule3\Setup
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ReferenceIncrementalSomeIntegerPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ReferenceIncrementalSomeIntegerPatch.php
index f1095459363..493cb0375bc 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ReferenceIncrementalSomeIntegerPatch.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ReferenceIncrementalSomeIntegerPatch.php
@@ -6,9 +6,9 @@
 namespace Magento\TestSetupDeclarationModule3\Setup\Patch\Data;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchRevertableInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class ReferenceIncrementalSomeIntegerPatch
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ZFirstPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ZFirstPatch.php
index f0d457fa843..d26e35879ca 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ZFirstPatch.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/patches_revision/ZFirstPatch.php
@@ -7,9 +7,9 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Setup\Exception;
-use Magento\Setup\Model\Patch\DataPatchInterface;
-use Magento\Setup\Model\Patch\PatchRevertableInterface;
-use Magento\Setup\Model\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class InstallData
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml
index 351a14e5509..4520cd9e4d4 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/etc/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="test_table" resource="default" comment="Test Table">
         <column xsi:type="int" name="page_id" nullable="false" />
         <column xsi:type="varchar" name="email" nullable="false" />
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/fixture/safe_data_provider.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/fixture/safe_data_provider.php
index f753e0b633c..e0179967736 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/fixture/safe_data_provider.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/fixture/safe_data_provider.php
@@ -5,22 +5,22 @@
  */
 return [
     [
-        'page_id' => 1,
+        'page_id' => '1',
         'email' => '1@gmail.com',
         'title' => 'Title1'
     ],
     [
-        'page_id' => 2,
+        'page_id' => '2',
         'email' => '2@gmail.com',
         'title' => 'Title2'
     ],
     [
-        'page_id' => 3,
+        'page_id' => '3',
         'email' => '3@gmail.com',
         'title' => 'Title3'
     ],
     [
-        'page_id' => 4,
+        'page_id' => '4',
         'email' => '4@gmail.com',
         'title' => 'Title4'
     ]
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml
index a119c3452db..9d868c01688 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/remove_title_column/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="test_table" resource="default" comment="Test Table">
         <column xsi:type="int" name="page_id" nullable="false"  />
         <column xsi:type="varchar" name="email" nullable="false" />
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml
index 351a14e5509..4520cd9e4d4 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule4/revisions/restore_title_column/db_schema.xml
@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="test_table" resource="default" comment="Test Table">
         <column xsi:type="int" name="page_id" nullable="false" />
         <column xsi:type="varchar" name="email" nullable="false" />
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/db_schema.xml
new file mode 100644
index 00000000000..00b5d6f9bb2
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/db_schema.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="default">
+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
+        <column xsi:type="int" name="some_integer" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="varchar" name="for_patch_testing" comment="For patch testing" />
+        <constraint xsi:type="primary" name="tinyint_primary">
+            <column name="tinyint_ref"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
+        <column xsi:type="varbinary" name="varbinary" default="10101" />
+        <constraint xsi:type="foreign" name="some_foreign_key" column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="CASCADE"/>
+        <constraint xsi:type="primary" name="PRIMARY">
+            <column name="smallint" />
+        </constraint>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/module.xml
new file mode 100644
index 00000000000..e383b81bc5c
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule5" setup_version="1.0.4" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/registration.php
new file mode 100644
index 00000000000..3bc0eee128e
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule5') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule5', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/module-without-version/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/module-without-version/module.xml
new file mode 100644
index 00000000000..d5731572270
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/module-without-version/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule5" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/old-scripts/UpgradeData.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/old-scripts/UpgradeData.php
new file mode 100644
index 00000000000..5ce7ce9fc85
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/old-scripts/UpgradeData.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule5\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+
+/**
+ * Class InstallData
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $adapter = $setup->getConnection();
+        $setup->startSetup();
+
+        if (version_compare($context->getVersion(), '1.0.2') < 0) {
+            $adapter->insertArray('reference_table', ['some_integer'], [6, 12, 7]);
+        }
+
+        if (version_compare($context->getVersion(), '1.0.3') < 0) {
+            $adapter->delete('reference_table', 'some_integer = 7');
+        }
+
+        $setup->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomePatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomePatch.php
new file mode 100644
index 00000000000..b98e35a01e1
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomePatch.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule5\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class SomePatch
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class SomePatch implements
+    DataPatchInterface,
+    PatchRevertableInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '1.0.5';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $adapter->insert('test_table', ['varchar' => "_ref", 'varbinary' => 0101010]);
+    }
+
+    public function revert()
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomeSkippedPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomeSkippedPatch.php
new file mode 100644
index 00000000000..833545ce88b
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule5/revisions/patches/SomeSkippedPatch.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule5\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class SomePatch
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class SomeSkippedPatch implements
+    DataPatchInterface,
+    PatchRevertableInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '1.0.2';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        throw new \Exception('This patch should be skipped!');
+    }
+
+    public function revert()
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema.xml
new file mode 100644
index 00000000000..3eeb141c2e6
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" resource="sales">
+        <column xsi:type="tinyint" name="tinyint_ref" padding="7" nullable="false" identity="true" unsigned="false"/>
+        <column xsi:type="tinyint" name="tinyint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="int" name="integer_without_padding" default="0" nullable="false" unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_with_big_padding" padding="254" default="0" nullable="false"
+                unsigned="false"/>
+        <column xsi:type="smallint" name="smallint_without_default" padding="2" nullable="true" unsigned="false"/>
+        <column xsi:type="int" name="int_without_unsigned" padding="2" nullable="true"/>
+        <column xsi:type="int" name="int_unsigned" padding="2" nullable="true" unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_default_nullable" padding="2" nullable="true" default="1"
+                unsigned="true"/>
+        <column xsi:type="bigint" name="bigint_not_default_not_nullable" padding="2" nullable="false" unsigned="true"/>
+        <constraint xsi:type="primary" name="tinyint_primary">
+            <column name="tinyint_ref"/>
+        </constraint>
+    </table>
+    <table name="auto_increment_test" resource="default">
+        <column xsi:type="int" name="int_auto_increment_with_nullable" identity="true" padding="12" unsigned="true"
+                nullable="true"/>
+        <column xsi:type="smallint" name="int_disabled_auto_increment" default="0" identity="false" padding="12"
+                unsigned="true" nullable="true"/>
+        <constraint xsi:type="unique" name="unique_null_key">
+            <column name="int_auto_increment_with_nullable"/>
+        </constraint>
+    </table>
+    <table name="test_table" resource="default">
+        <!--Columns-->
+        <column xsi:type="smallint" identity="true" name="smallint" padding="3" nullable="true"/>
+        <column xsi:type="tinyint" name="tinyint" padding="7" nullable="true" unsigned="false"/>
+        <column xsi:type="bigint" name="bigint" default="0" padding="13" nullable="true" unsigned="false"/>
+        <column xsi:type="float" name="float" default="0" scale="4" precision="12"/>
+        <column xsi:type="decimal" name="double" default="11111111.111111" precision="14" scale="6"/>
+        <column xsi:type="decimal" name="decimal" default="0" scale="4" precision="15"/>
+        <column xsi:type="date" name="date"/>
+        <column xsi:type="timestamp" name="timestamp" default="CURRENT_TIMESTAMP" on_update="true"/>
+        <column xsi:type="datetime" name="datetime" default="0"/>
+        <column xsi:type="longtext" name="longtext"/>
+        <column xsi:type="mediumtext" name="mediumtext"/>
+        <column xsi:type="varchar" name="varchar" length="254" nullable="true"/>
+        <column xsi:type="mediumblob" name="mediumblob"/>
+        <column xsi:type="blob" name="blob"/>
+        <column xsi:type="boolean" name="boolean"/>
+        <column xsi:type="varbinary" name="varbinary_rename" default="10101" disabled="true"/>
+        <!--Constraints-->
+        <constraint xsi:type="unique" name="some_unique_key">
+            <column name="smallint"/>
+            <column name="bigint"/>
+        </constraint>
+        <constraint xsi:type="foreign" name="some_foreign_key" column="tinyint" table="test_table"
+                    referenceTable="reference_table" referenceColumn="tinyint_ref" onDelete="NO ACTION"/>
+        <!--Indexes-->
+        <index name="speedup_index" indexType="btree">
+            <column name="tinyint"/>
+            <column name="bigint"/>
+        </index>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema_whitelist.json
new file mode 100644
index 00000000000..890fea33106
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/db_schema_whitelist.json
@@ -0,0 +1,56 @@
+{
+  "reference_table": {
+    "column": {
+      "tinyint_ref": true,
+      "tinyint_without_padding": true,
+      "bigint_without_padding": true,
+      "integer_without_padding": true,
+      "smallint_with_big_padding": true,
+      "smallint_without_default": true,
+      "int_without_unsigned": true,
+      "int_unsigned": true,
+      "bigint_default_nullable": true,
+      "bigint_not_default_not_nullable": true,
+      "smallint_without_padding": true
+    },
+    "constraint": {
+      "tinyint_primary": true
+    }
+  },
+  "auto_increment_test": {
+    "column": {
+      "int_auto_increment_with_nullable": true,
+      "int_disabled_auto_increment": true
+    },
+    "constraint": {
+      "unique_null_key": true
+    }
+  },
+  "test_table": {
+    "column": {
+      "smallint": true,
+      "tinyint": true,
+      "bigint": true,
+      "float": true,
+      "double": true,
+      "decimal": true,
+      "date": true,
+      "timestamp": true,
+      "datetime": true,
+      "longtext": true,
+      "mediumtext": true,
+      "varchar": true,
+      "mediumblob": true,
+      "blob": true,
+      "boolean": true,
+      "varbinary_rename": true
+    },
+    "index": {
+      "speedup_index": true
+    },
+    "constraint": {
+      "some_unique_key": true,
+      "some_foreign_key": true
+    }
+  }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/module.xml
new file mode 100644
index 00000000000..af44654afd8
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule6" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/registration.php
new file mode 100644
index 00000000000..a107dc24984
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule6') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule6', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/InstallSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/InstallSchema.php
new file mode 100644
index 00000000000..e7b9b22c5a2
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/InstallSchema.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestSetupDeclarationModule7\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * InstallSchema mock class
+ */
+class InstallSchema implements InstallSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+        $installer->startSetup();
+        $installer
+            ->getConnection()
+            ->modifyColumn('test_table', 'float', ['type' => 'float', 'default' => 25]);
+        $installer->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeData.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeData.php
new file mode 100644
index 00000000000..68016d959bb
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeData.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule7\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+
+/**
+ * Class UpgradeData
+ * @package Magento\TestSetupDeclarationModule7\Setup
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $adapter = $setup->getConnection();
+        $setup->startSetup();
+
+        if (version_compare($context->getVersion(), '2.0.0') < 0) {
+            $adapter->insertArray('reference_table', ['bigint_without_padding'], [6, 12, 7]);
+        }
+
+        $setup->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeSchema.php
new file mode 100644
index 00000000000..8381dd3f245
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/Setup/UpgradeSchema.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestSetupDeclarationModule7\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
+
+/**
+ * UpgradeSchema mock class
+ */
+class UpgradeSchema implements UpgradeSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+        $installer->startSetup();
+
+        if (version_compare($context->getVersion(), '2.0.1') < 0) {
+            $installer
+                ->getConnection()
+                ->modifyColumn('test_table', 'float', ['type' => 'float', 'default' => 29]);
+        }
+
+        $installer->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/etc/module.xml
new file mode 100644
index 00000000000..7affd773fd0
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/etc/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule7" setup_version="2.0.1">
+        <sequence>
+            <module name="Magento_TestSetupDeclarationModule6" />
+        </sequence>
+    </module>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/registration.php
new file mode 100644
index 00000000000..e357c5171da
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule7') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule7', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomePatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomePatch.php
new file mode 100644
index 00000000000..9f66308cbab
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomePatch.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule7\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchRevertableInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class SomePatch
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class SomePatch implements
+    DataPatchInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '2.0.4';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $adapter = $this->resourceConnection->getConnection();
+        $adapter->insert('test_table', ['varchar' => "_ref"]);
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomeSkippedPatch.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomeSkippedPatch.php
new file mode 100644
index 00000000000..7a598905a82
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/SomeSkippedPatch.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule7\Setup\Patch\Data;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class SomePatch
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class SomeSkippedPatch implements
+    DataPatchInterface,
+    PatchVersionInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * IncrementalSomeIntegerPatch constructor.
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getVersion()
+    {
+        return '2.0.2';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        throw new \Exception('This patch should be skipped!');
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/db_schema.xml
new file mode 100644
index 00000000000..4e4d65baec2
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/db_schema.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table">
+        <column xsi:type="float" name="float" default="35" />
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/module.xml
new file mode 100644
index 00000000000..7affd773fd0
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/swap_with_declaration/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule7" setup_version="2.0.1">
+        <sequence>
+            <module name="Magento_TestSetupDeclarationModule6" />
+        </sequence>
+    </module>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeData.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeData.php
new file mode 100644
index 00000000000..6dd52909ec2
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeData.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestSetupDeclarationModule7\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+
+/**
+ * Class UpgradeData
+ * @package Magento\TestSetupDeclarationModule3\Setup
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $adapter = $setup->getConnection();
+        $setup->startSetup();
+
+        if (version_compare($context->getVersion(), '2.0.0') < 0) {
+            $adapter->insertArray('reference_table', ['bigint_without_padding'], [6, 12, 7]);
+        }
+
+        if (version_compare($context->getVersion(), '2.0.2') < 0) {
+            $adapter->delete('reference_table', 'bigint_without_padding = 7');
+        }
+
+        $setup->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeSchema.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeSchema.php
new file mode 100644
index 00000000000..8a91d136a1f
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/UpgradeSchema.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\TestSetupDeclarationModule7\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
+
+/**
+ * UpgradeSchema mock class
+ */
+class UpgradeSchema implements UpgradeSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+        $installer->startSetup();
+
+        if (version_compare($context->getVersion(), '2.0.1') < 0) {
+            $installer
+                ->getConnection()
+                ->modifyColumn('test_table', 'float', ['type' => 'float', 'default' => 29]);
+        }
+        //Create table and check, that Magento can`t delete it
+        if (version_compare($context->getVersion(), '2.0.2') < 0) {
+            $table = $setup->getConnection()->newTable(
+                $setup->getTable('custom_table')
+            )->addColumn(
+                'custom_id',
+                \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+                null,
+                ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+                'Custom Id'
+            )->addColumn(
+                'name',
+                \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                255,
+                [],
+                'Custom Name'
+            )->setComment(
+                'Custom Table'
+            );
+            $setup->getConnection()->createTable($table);
+        }
+
+        $installer->endSetup();
+    }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/module.xml
new file mode 100644
index 00000000000..b4957234be1
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule7" setup_version="2.0.2">
+        <sequence>
+            <module name="Magento_TestSetupDeclarationModule6" />
+        </sequence>
+    </module>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/wl_remove_table/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/wl_remove_table/db_schema_whitelist.json
new file mode 100644
index 00000000000..c5547523442
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/wl_remove_table/db_schema_whitelist.json
@@ -0,0 +1,5 @@
+{
+  "custom_table": {
+    "column": {}
+  }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/etc/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/etc/module.xml
new file mode 100644
index 00000000000..96a09ad477d
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule8" setup_version="1.0.0" />
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/registration.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/registration.php
new file mode 100644
index 00000000000..cb8e645f177
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule8') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule8', __DIR__);
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/incosistence_reference_definition/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/incosistence_reference_definition/db_schema.xml
new file mode 100644
index 00000000000..e39f0a04bcf
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/incosistence_reference_definition/db_schema.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="int" name="page_id" nullable="false" unsigned="false" identity="true"/>
+        <constraint xsi:type="primary" name="PRIMARY">
+            <column name="page_id"/>
+        </constraint>
+    </table>
+    <table name="dependent" resource="default" comment="Lol">
+        <column xsi:type="int" name="page_id_on" nullable="true" unsigned="true"/>
+        <constraint xsi:type="foreign" name="FOREIGN" table="dependent" column="page_id_on" referenceColumn="page_id"
+                    referenceTable="test_table"/>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_auto_increment/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_auto_increment/db_schema.xml
new file mode 100644
index 00000000000..bc889c5fdbe
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_auto_increment/db_schema.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="int" name="page_id" nullable="false" identity="true" />
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_primary_key/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_primary_key/db_schema.xml
new file mode 100644
index 00000000000..4ecee622864
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/invalid_primary_key/db_schema.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="test_table" resource="default" comment="Test Table">
+        <column xsi:type="int" name="page_id" nullable="false" identity="true" />
+        <column xsi:type="varchar" name="email" nullable="true" />
+        <column xsi:type="varchar" name="title" />
+        <constraint xsi:type="primary" name="PRIMARY">
+            <column name="page_id" />
+            <column name="email" />
+        </constraint>
+    </table>
+</schema>
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/CopyModules.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/CopyModules.php
index 390dc595c6b..be503e6de91 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/CopyModules.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/CopyModules.php
@@ -6,6 +6,7 @@
 
 namespace Magento\TestFramework\Annotation;
 
+use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Filesystem\Io\File;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\TestModuleManager;
@@ -45,10 +46,14 @@ public function startTest(\PHPUnit\Framework\TestCase $test)
         $annotations = $test->getAnnotations();
         //This annotation can be declared only on method level
         if (isset($annotations['method']['moduleName'])) {
-            $moduleName = $annotations['method']['moduleName'][0];
-            $this->cliCommand->introduceModule($moduleName);
-            $path = MAGENTO_MODULES_PATH . explode("_", $moduleName)[1] . '/registration.php';
-            include_once $path;
+            $moduleNames = $annotations['method']['moduleName'];
+
+            foreach ($moduleNames as $moduleName) {
+                $this->cliCommand->introduceModule($moduleName);
+                //Include module`s registration.php to load it
+                $path = MAGENTO_MODULES_PATH . explode("_", $moduleName)[1] . '/registration.php';
+                include $path;
+            }
         }
     }
 
@@ -61,12 +66,33 @@ public function endTest(\PHPUnit\Framework\TestCase $test)
     {
         $annotations = $test->getAnnotations();
         //This annotation can be declared only on method level
-        if (isset($annotations['method']['moduleName'])) {
-            $path = MAGENTO_MODULES_PATH .
-                //Take only module name from Magento_ModuleName
-                explode("_", $annotations['method']['moduleName'][0])[1];
-
-            File::rmdirRecursive($path);
+        if (!empty($annotations['method']['moduleName'])) {
+            foreach ($annotations['method']['moduleName'] as $moduleName) {
+                $path = MAGENTO_MODULES_PATH .
+                    //Take only module name from Magento_ModuleName
+                    explode("_", $moduleName)[1];
+                File::rmdirRecursive($path);
+                $this->unsergisterModuleFromComponentRegistrar($moduleName);
+            }
         }
     }
+
+    /**
+     * Unregister module from component registrar.
+     * The component registrar uses static private variable and does not provide unregister method,
+     * however unregister is required to remove registered modules after they are deleted from app/code.
+     *
+     * @param $moduleName
+     *
+     * @return void
+     */
+    private function unsergisterModuleFromComponentRegistrar($moduleName)
+    {
+        $reflection = new \ReflectionClass(ComponentRegistrar::class);
+        $reflectionProperty = $reflection->getProperty('paths');
+        $reflectionProperty->setAccessible(true);
+        $value = $reflectionProperty->getValue();
+        unset($value[ComponentRegistrar::MODULE][$moduleName]);
+        $reflectionProperty->setValue($value);
+    }
 }
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/ReinstallInstance.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/ReinstallInstance.php
index 0bfc7ba969f..e97ba3f3bcb 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/ReinstallInstance.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/ReinstallInstance.php
@@ -6,6 +6,8 @@
 
 namespace Magento\TestFramework\Annotation;
 
+use Magento\Framework\Module\ModuleResource;
+
 /**
  * Handler for applying reinstallMagento annotation.
  */
@@ -26,6 +28,11 @@ public function __construct(\Magento\TestFramework\Application $application)
         $this->application = $application;
     }
 
+    public function startTest()
+    {
+        $this->application->reinitialize();
+    }
+
     /**
      * Handler for 'endTest' event.
      *
@@ -34,5 +41,7 @@ public function __construct(\Magento\TestFramework\Application $application)
     public function endTest()
     {
         $this->application->cleanup();
+        $this->application->reinitialize();
+        ModuleResource::flush();
     }
 }
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php
index 6732a8de4eb..8e212289eb1 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Bootstrap/SetupDocBlock.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\TestFramework\Bootstrap;
 
+use Magento\TestFramework\Annotation\AppIsolation;
+
 /**
  * Bootstrap of the custom DocBlock annotations.
  *
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php
index 3b3ef08ac86..a659c82d871 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php
@@ -65,7 +65,7 @@ public function enableModule($moduleName)
     {
         $initParams = $this->parametersHolder->getInitParams();
         $enableModuleCommand = 'php -f ' . BP . '/bin/magento module:enable ' . $moduleName
-            . ' -n -vvv --magento-init-params=' . $initParams['magento-init-params'];
+            . ' -n -vvv --magento-init-params="' . $initParams['magento-init-params'] . '"';
         return $this->shell->execute($enableModuleCommand);
     }
 
@@ -78,10 +78,10 @@ public function enableModule($moduleName)
     public function upgrade($installParams = [])
     {
         $initParams = $this->parametersHolder->getInitParams();
-        $upgradeCommand = 'php -f ' . BP . '/bin/magento setup:upgrade -vvv -n --magento-init-params='
-            . $initParams['magento-init-params'];
-
-        $upgradeCommand .= ' ' . implode(" ", $this->toCliArguments(array_keys($installParams)));
+        $upgradeCommand = 'php -f ' . BP . '/bin/magento setup:upgrade -vvv -n --magento-init-params="'
+            . $initParams['magento-init-params'] . '"';
+        $installParams = $this->toCliArguments($installParams);
+        $upgradeCommand .= ' ' . implode(" ", array_keys($installParams));
 
         return $this->shell->execute($upgradeCommand, array_values($installParams));
     }
@@ -160,8 +160,8 @@ public function uninstallModule($moduleName)
     {
         $initParams = $this->parametersHolder->getInitParams();
         $command = 'php -f ' . BP . '/bin/magento module:uninstall ' . $moduleName . ' --remove-data ' .
-            ' -vvv --non-composer --magento-init-params=' .
-            $initParams['magento-init-params'];
+            ' -vvv --non-composer --magento-init-params="' .
+            $initParams['magento-init-params'] . '"';
 
         $this->shell->execute($command);
     }
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/DescribeTable.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/DescribeTable.php
index 640a25c151c..fe008da2466 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/DescribeTable.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/DescribeTable.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\TestFramework\Deploy;
 
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\DbSchemaReader;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DbSchemaReader;
 
 /**
  * The purpose of this class is adding test modules files to Magento code base.
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/ParametersHolder.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/ParametersHolder.php
index badbddf23fa..894bab3dfa2 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/ParametersHolder.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/ParametersHolder.php
@@ -63,8 +63,10 @@ private function getCustomDirs()
     {
         $installDir = TESTS_TEMP_DIR;
         $path = DirectoryList::PATH;
+        $var = "{$installDir}/var";
         $customDirs = [
             DirectoryList::CONFIG => [$path => "{$installDir}/etc"],
+            DirectoryList::VAR_DIR => [$path => $var],
         ];
         return $customDirs;
     }
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TableData.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TableData.php
index bb1e743e7c0..1d9026acd21 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TableData.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TableData.php
@@ -28,13 +28,16 @@ public function __construct(ResourceConnection $resourceConnection)
 
     /**
      * @param string $tableName
+     * @param string $columnName
      * @return array
      */
-    public function describeTableData($tableName)
+    public function describeTableData($tableName, $columnName = null)
     {
         $adapter = $this->resourceConnection->getConnection();
-        return $adapter->fetchAll(
-            $adapter->select()->from($tableName)
-        );
+        $cols = $columnName ?: '*';
+        $select = $adapter
+            ->select()
+            ->from($tableName, $cols);
+        return $columnName ? $adapter->fetchCol($select) : $adapter->fetchAll($select);
     }
 }
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TestModuleManager.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TestModuleManager.php
index e33c84e1400..fcf8695dc85 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TestModuleManager.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TestModuleManager.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\TestFramework\Deploy;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Module\ModuleList;
+use Magento\Framework\Module\ModuleListInterface;
+
 /**
  * The purpose of this class is adding test modules files to Magento code base.
  */
@@ -130,6 +134,21 @@ public function removeModuleFiles($moduleName)
         }
     }
 
+    /**
+     * There can be situation when config version of module can be cached
+     * So proposed to clean shared instance of
+     * @see ModuleList in order to achieve clean installation
+     */
+    public function cleanModuleList()
+    {
+        /**
+         * @var \Magento\TestFramework\ObjectManager $objectManager
+         */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager->removeSharedInstance(ModuleList::class);
+        $objectManager->removeSharedInstance(ModuleListInterface::class);
+    }
+
     /**
      * Update module files.
      *
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/BCMultiModuleTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/BCMultiModuleTest.php
new file mode 100644
index 00000000000..6ea79f9628e
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/BCMultiModuleTest.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Module\DbVersionInfo;
+use Magento\Framework\Module\ModuleList;
+use Magento\Framework\Module\ModuleResource;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TableData;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is to check whether whole declarative installation is work
+ * in mixed mode
+ */
+class BCMultiModuleTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommand;
+
+    /**
+     * @var DbVersionInfo
+     */
+    private $dbVersionInfo;
+
+    /**
+     * @var TableData
+     */
+    private $tableData;
+
+    /**
+     * @var ModuleResource
+     */
+    private $moduleResource;
+
+    /**
+     * @var DbSchemaReaderInterface
+     */
+    private $dbSchemaReader;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommand = $objectManager->get(CliCommand::class);
+        $this->dbVersionInfo = $objectManager->get(DbVersionInfo::class);
+        $this->tableData = $objectManager->get(TableData::class);
+        $this->moduleResource = $objectManager->get(ModuleResource::class);
+        $this->dbSchemaReader = $objectManager->get(DbSchemaReaderInterface::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule6
+     * @moduleName Magento_TestSetupDeclarationModule7
+     */
+    public function testFirstCleanInstall()
+    {
+        $this->cliCommand->install([
+            'Magento_TestSetupDeclarationModule6',
+            'Magento_TestSetupDeclarationModule7'
+        ]);
+        //Check if declaration is applied
+        $indexes = $this->dbSchemaReader->readIndexes('test_table', 'default');
+        self::assertCount(1, $indexes);
+        self::assertArrayHasKey('speedup_index', $indexes);
+        //Check UpgradeSchema old format, that modify declaration
+        $columns = $this->dbSchemaReader->readColumns('test_table', 'default');
+        $floatColumn = $columns['float'];
+        self::assertEquals(29, $floatColumn['default']);
+    }
+
+    private function doUsToUsRevision()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'us_to_us',
+            'UpgradeSchema.php',
+            'Setup'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'us_to_us',
+            'module.xml',
+            'etc'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'us_to_us',
+            'UpgradeData.php',
+            'Setup'
+        );
+    }
+
+    private function doUsToDsRevision()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'swap_with_declaration',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'swap_with_declaration',
+            'SomePatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'swap_with_declaration',
+            'SomeSkippedPatch.php',
+            'Setup/Patch/Data'
+        );
+    }
+
+    /**
+     * Assert that data and schema of 2 modules are installed successfully
+     */
+    private function assertUsToUsUpgrade()
+    {
+        $usToUsTables = $this->dbSchemaReader->readTables('default');
+        self::assertContains('custom_table', $usToUsTables);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule7'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule7'));
+        self::assertEquals(
+            [6,12],
+            $this->tableData->describeTableData('reference_table', 'bigint_without_padding')
+        );
+    }
+
+    /**
+     * Assert that data and schema of 2 modules are installed successfully
+     */
+    private function assertUsToDsUpgrade()
+    {
+        //Check UpgradeSchema old format, that modify declaration
+        $columns = $this->dbSchemaReader->readColumns('test_table', 'default');
+        $floatColumn = $columns['float'];
+        //Check whether declaration will be applied
+        self::assertEquals(35, $floatColumn['default']);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule7'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule7'));
+        self::assertEquals(
+            [6,12],
+            $this->tableData->describeTableData('reference_table', 'bigint_without_padding')
+        );
+        self::assertEquals(
+            ['_ref'],
+            $this->tableData->describeTableData('test_table', 'varchar')
+        );
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule6
+     * @moduleName Magento_TestSetupDeclarationModule7
+     */
+    public function testDSFirstRelease()
+    {
+        $this->cliCommand->install([
+            'Magento_TestSetupDeclarationModule6',
+            'Magento_TestSetupDeclarationModule7'
+        ]);
+        //Check no change upgrade with US
+        $this->cliCommand->upgrade();
+
+        $this->doUsToUsRevision();
+        //Check US to US upgrade
+        $this->cliCommand->upgrade();
+        $this->assertUsToUsUpgrade();
+
+        $this->doUsToDsRevision();
+        //Check US to declarative schema upgrade
+        $this->cliCommand->upgrade();
+        $this->assertUsToDsUpgrade();
+
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule7',
+            'wl_remove_table',
+            'db_schema_whitelist.json',
+            'etc'
+        );
+        //Check removal case, when we need to remove table with declaration and table was created in old scripts
+        $this->cliCommand->upgrade();
+        $tables = $this->dbSchemaReader->readTables('default');
+        self::assertNotContains('custom_table', $tables);
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/BCPatchTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/BCPatchTest.php
new file mode 100644
index 00000000000..c74f07cd80a
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/BCPatchTest.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Module\DbVersionInfo;
+use Magento\Framework\Module\ModuleList;
+use Magento\Framework\Module\ModuleResource;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TableData;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is to check whether patch changes in Magento are backward compatible
+ */
+class BCPatchTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommand;
+
+    /**
+     * @var DbVersionInfo
+     */
+    private $dbVersionInfo;
+
+    /**
+     * @var TableData
+     */
+    private $tableData;
+
+    /**
+     * @var ModuleResource
+     */
+    private $moduleResource;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommand = $objectManager->get(CliCommand::class);
+        $this->dbVersionInfo = $objectManager->get(DbVersionInfo::class);
+        $this->tableData = $objectManager->get(TableData::class);
+        $this->moduleResource = $objectManager->get(ModuleResource::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule5
+     */
+    public function testSuccessfullInstall()
+    {
+        $this->cliCommand->install(['Magento_TestSetupDeclarationModule5']);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule5'));
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule5
+     */
+    public function testDataMixedMode()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'old-scripts',
+            'UpgradeData.php',
+            'Setup'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'patches',
+            'SomePatch.php',
+            'Setup/Patch/Data'
+        );
+        
+        $this->cliCommand->install(['Magento_TestSetupDeclarationModule5']);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertEquals(
+            [6,12],
+            $this->tableData->describeTableData('reference_table', 'some_integer')
+        );
+        self::assertEquals(
+            ['_ref'],
+            $this->tableData->describeTableData('test_table', 'varchar')
+        );
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule5
+     */
+    public function testSkippedPatch()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'patches',
+            'SomePatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'patches',
+            'SomeSkippedPatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->cliCommand->install(['Magento_TestSetupDeclarationModule5']);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertEquals(
+            ['_ref'],
+            $this->tableData->describeTableData('test_table', 'varchar')
+        );
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule5
+     */
+    public function testDataInstallationWithoutVersion()
+    {
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'module-without-version',
+            'module.xml',
+            'etc'
+        );
+        $this->cliCommand->install(['Magento_TestSetupDeclarationModule5']);
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule5'));
+        $this->moduleResource->setDataVersion('Magento_TestSetupDeclarationModule5', '1.0.2');
+        $this->moduleResource->setDataVersion('Magento_TestSetupDeclarationModule5', '1.0.2');
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'old-scripts',
+            'UpgradeData.php',
+            'Setup'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'patches',
+            'SomePatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule5',
+            'patches',
+            'SomeSkippedPatch.php',
+            'Setup/Patch/Data'
+        );
+        $this->cliCommand->upgrade();
+        self::assertTrue($this->dbVersionInfo->isDataUpToDate('Magento_TestSetupDeclarationModule5'));
+        self::assertTrue($this->dbVersionInfo->isSchemaUpToDate('Magento_TestSetupDeclarationModule5'));
+        //Old scripts should be skipped because we do not have version
+        self::assertEquals(
+            [],
+            $this->tableData->describeTableData('reference_table', 'some_integer')
+        );
+        self::assertEquals(
+            ['_ref'],
+            $this->tableData->describeTableData('test_table', 'varchar')
+        );
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DataPatchInstallationTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DataPatchInstallationTest.php
index d819e3e45b2..a781972b858 100644
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/DataPatchInstallationTest.php
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DataPatchInstallationTest.php
@@ -7,7 +7,7 @@
 namespace Magento\Setup;
 
 use Magento\Framework\Module\ModuleResource;
-use Magento\Setup\Model\Patch\PatchHistory;
+use Magento\Framework\Setup\Patch\PatchHistory;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\TableData;
 use Magento\TestFramework\Deploy\TestModuleManager;
@@ -78,7 +78,7 @@ public function testDataPatchesInstallation()
             'etc'
         );
         $this->movePatches();
-        $this->moduleResource->flush();
+        ModuleResource::flush();
         $this->cliCommad->upgrade();
         self::assertEquals(
             '0.0.3',
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
index 58a50ecc376..f0b74670cee 100644
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
@@ -7,9 +7,9 @@
 namespace Magento\Setup;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Diff\SchemaDiff;
-use Magento\Setup\Model\Declaration\Schema\SchemaConfigInterface;
-use Magento\Setup\Model\Declaration\Schema\Sharding;
+use Magento\Framework\Setup\Declaration\Schema\Diff\SchemaDiff;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\DescribeTable;
 use Magento\TestFramework\Deploy\TestModuleManager;
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeSchemaBuilderTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeSchemaBuilderTest.php
index 4e27f400ebc..07544c25c45 100644
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeSchemaBuilderTest.php
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeSchemaBuilderTest.php
@@ -6,16 +6,17 @@
 
 namespace Magento\Setup;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
-use Magento\Setup\Model\Declaration\Schema\SchemaConfig;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\TestModuleManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\SetupTestCase;
 
 /**
+ * @magentoAppIsolation enabled
  * The purpose of this test is verifying initial InstallSchema, InstallData scripts.
  */
 class DeclarativeSchemaBuilderTest extends SetupTestCase
@@ -38,7 +39,7 @@ class DeclarativeSchemaBuilderTest extends SetupTestCase
     public function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->schemaConfig = $objectManager->get(SchemaConfig::class);
+        $this->schemaConfig = $objectManager->create(SchemaConfig::class);
         $this->moduleManager = $objectManager->get(TestModuleManager::class);
         $this->cliCommad = $objectManager->get(CliCommand::class);
     }
@@ -60,24 +61,24 @@ public function testSchemaBuilder()
         //Test primary key and renaming
         $referenceTable = $schemaTables['reference_table'];
         /**
-        * @var Internal $primaryKey
-        */
+         * @var Internal $primaryKey
+         */
         $primaryKey = $referenceTable->getPrimaryConstraint();
         $columns = $primaryKey->getColumns();
         self::assertEquals('tinyint_ref', reset($columns)->getName());
         //Test column
         $testTable = $schemaTables['test_table'];
         /**
-        * @var Timestamp $timestampColumn
-        */
+         * @var Timestamp $timestampColumn
+         */
         $timestampColumn = $testTable->getColumnByName('timestamp');
         self::assertEquals('CURRENT_TIMESTAMP', $timestampColumn->getOnUpdate());
         //Test disabled
         self::assertArrayNotHasKey('varbinary_rename', $testTable->getColumns());
         //Test foreign key
         /**
-        * @var Reference $foreignKey
-        */
+         * @var Reference $foreignKey
+         */
         $foreignKey = $testTable->getConstraintByName('some_foreign_key');
         self::assertEquals('NO ACTION', $foreignKey->getOnDelete());
         self::assertEquals('tinyint_ref', $foreignKey->getReferenceColumn()->getName());
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DiffOldSchemaTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DiffOldSchemaTest.php
index 1d428a2cf59..3fb117896ea 100644
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/DiffOldSchemaTest.php
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DiffOldSchemaTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Setup;
 
-use Magento\Setup\Model\Declaration\Schema\Diff\DiffFactory;
-use Magento\Setup\Model\Declaration\Schema\Diff\SchemaDiff;
-use Magento\Setup\Model\Declaration\Schema\SchemaConfigInterface;
+use Magento\Framework\Setup\Declaration\Schema\Diff\DiffFactory;
+use Magento\Framework\Setup\Declaration\Schema\Diff\SchemaDiff;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\TestModuleManager;
 use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DryRunTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DryRunTest.php
new file mode 100644
index 00000000000..562f88cea75
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DryRunTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is verifying declarative installation works.
+ */
+class DryRunTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommad;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommad = $objectManager->get(CliCommand::class);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/dry_run_log.php
+     */
+    public function testDryRunOnCleanDatabase()
+    {
+        $logFileName = TESTS_TEMP_DIR . '/var/log/' . DryRunLogger::FILE_NAME;
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule1'],
+            ['dry-run' => true]
+        );
+        self::assertFileExists($logFileName);
+        $data = file_get_contents($logFileName);
+        self::assertEquals($data, $this->getData()[0]);
+    }
+
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.php
+     */
+    public function testDryRunOnUpgrade()
+    {
+        $logFileName = TESTS_TEMP_DIR . '/var/log/' . DryRunLogger::FILE_NAME;
+        $this->cliCommad->install(['Magento_TestSetupDeclarationModule1']);
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule1',
+            'column_modifications',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->cliCommad->upgrade(['dry-run' => true]);
+        self::assertFileExists($logFileName);
+        $data = file_get_contents($logFileName);
+        self::assertEquals($data, $this->getData()[0]);
+    }
+}
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/SafeInstallerTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/SafeInstallerTest.php
index 9b953bfdca3..5b42e6cf43e 100644
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/SafeInstallerTest.php
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/SafeInstallerTest.php
@@ -7,9 +7,9 @@
 namespace Magento\Setup;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Diff\SchemaDiff;
-use Magento\Setup\Model\Declaration\Schema\SchemaConfigInterface;
-use Magento\Setup\Model\Declaration\Schema\Sharding;
+use Magento\Framework\Setup\Declaration\Schema\Diff\SchemaDiff;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\DescribeTable;
 use Magento\TestFramework\Deploy\TestModuleManager;
@@ -69,7 +69,7 @@ public function testInstallation()
         );
         $this->cliCommad->upgrade(
             [
-                '--safe-mode' => true,
+                'safe-mode' => true,
             ]
         );
         //Move new db_schema.xml with restored title field
@@ -81,7 +81,7 @@ public function testInstallation()
         );
         $this->cliCommad->upgrade(
             [
-                '--data-restore' => true,
+                'data-restore' => true,
             ]
         );
         $testTableSelect = $adapter->select()->from($testTableName);
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/SchemaReaderTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/SchemaReaderTest.php
index 903e217b4a2..72f91052774 100644
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/SchemaReaderTest.php
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/SchemaReaderTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Setup;
 
-use Magento\Setup\Model\Declaration\Schema\Declaration\ReaderComposite;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
 use Magento\TestFramework\Deploy\TestModuleManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\SetupTestCase;
@@ -17,7 +17,7 @@
 class SchemaReaderTest extends SetupTestCase
 {
     /**
-     * @var  \Magento\Setup\Model\Declaration\Schema\FileSystem\XmlReader
+     * @var  \Magento\Framework\Setup\Declaration\Schema\FileSystem\XmlReader
      */
     private $reader;
 
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/ValidationRulesTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/ValidationRulesTest.php
new file mode 100644
index 00000000000..a8709b2eee3
--- /dev/null
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/ValidationRulesTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup;
+
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
+use Magento\TestFramework\Deploy\CliCommand;
+use Magento\TestFramework\Deploy\TestModuleManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\SetupTestCase;
+
+/**
+ * The purpose of this test is verifying initial InstallSchema, InstallData scripts.
+ */
+class ValidationRulesTest extends SetupTestCase
+{
+    /**
+     * @var  TestModuleManager
+     */
+    private $moduleManager;
+
+    /**
+     * @var SchemaConfig
+     */
+    private $schemaConfig;
+
+    /**
+     * @var CliCommand
+     */
+    private $cliCommad;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->schemaConfig = $objectManager->create(SchemaConfig::class);
+        $this->moduleManager = $objectManager->get(TestModuleManager::class);
+        $this->cliCommad = $objectManager->get(CliCommand::class);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Setup\Exception
+     * @expectedExceptionMessageRegExp
+     * /Primary key can`t be applied on table "test_table". All columns should be not nullable/
+     * @moduleName Magento_TestSetupDeclarationModule8
+     */
+    public function testFailOnInvalidPrimaryKey()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule8']
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule8',
+            'invalid_primary_key',
+            'db_schema.xml',
+            'etc'
+        );
+
+        $this->schemaConfig->getDeclarationConfig();
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Setup\Exception
+     * @expectedExceptionMessageRegExp
+     * /Column definition "page_id_on" and reference column definition "page_id"
+     * are different in tables "dependent" and "test_table"/
+     * @moduleName Magento_TestSetupDeclarationModule8
+     */
+    public function testFailOnIncosistentReferenceDefinition()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule8']
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule8',
+            'incosistence_reference_definition',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->schemaConfig->getDeclarationConfig();
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Setup\Exception
+     * @expectedExceptionMessageRegExp /Auto Increment column do not have index. Column - "page_id"/
+     * @moduleName Magento_TestSetupDeclarationModule8
+     */
+    public function testFailOnInvalidAutoIncrementField()
+    {
+        $this->cliCommad->install(
+            ['Magento_TestSetupDeclarationModule8']
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule8',
+            'invalid_auto_increment',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->schemaConfig->getDeclarationConfig();
+    }
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
index e240e5037fb..2df84c579cc 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
@@ -88,39 +88,67 @@ public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
             return [];
         }
 
-        $pattern = '~\b(?<class>(?<module>(' . implode(
-            '_|',
-            Files::init()->getNamespaces()
-        ) . '[_\\\\])[a-zA-Z0-9]+)[a-zA-Z0-9_\\\\]*)\b~';
+        $dependenciesInfo = [];
+        $dependenciesInfo = $this->considerCaseDependencies(
+            $dependenciesInfo,
+            $this->caseClassesAndIdentifiers($currentModule, $file, $contents)
+        );
+        $dependenciesInfo = $this->considerCaseDependencies(
+            $dependenciesInfo,
+            $this->_caseGetUrl($currentModule, $contents)
+        );
+        $dependenciesInfo = $this->considerCaseDependencies(
+            $dependenciesInfo,
+            $this->_caseLayoutBlock($currentModule, $fileType, $file, $contents)
+        );
+        return $dependenciesInfo;
+    }
+
+    /**
+     * Check references to classes and identifiers defined in other modules
+     *
+     * @param string $currentModule
+     * @param string $file
+     * @param string $contents
+     * @return array
+     */
+    private function caseClassesAndIdentifiers($currentModule, $file, &$contents)
+    {
+        $pattern = '~\b(?<class>(?<module>('
+            . implode(
+                '_|',
+                Files::init()->getNamespaces()
+            )
+            . '[_\\\\])[a-zA-Z0-9]+)'
+            . '(?<class_inside_module>[a-zA-Z0-9_\\\\]*))\b(?:::(?<module_scoped_key>[a-z0-9_]+)[\'"])?~';
+
+        if (!preg_match_all($pattern, $contents, $matches)) {
+            return [];
+        }
 
         $dependenciesInfo = [];
-        if (preg_match_all($pattern, $contents, $matches)) {
-            $matches['module'] = array_unique($matches['module']);
-            foreach ($matches['module'] as $i => $referenceModule) {
-                $referenceModule = str_replace('_', '\\', $referenceModule);
-                if ($currentModule == $referenceModule) {
-                    continue;
-                }
-                $dependencyClass = trim($matches['class'][$i]);
+        $matches['module'] = array_unique($matches['module']);
+        foreach ($matches['module'] as $i => $referenceModule) {
+            $referenceModule = str_replace('_', '\\', $referenceModule);
+            if ($currentModule == $referenceModule) {
+                continue;
+            }
+
+            $dependencyClass = trim($matches['class'][$i]);
+            if (empty($matches['class_inside_module'][$i]) && !empty($matches['module_scoped_key'][$i])) {
+                $dependencyType = RuleInterface::TYPE_SOFT;
+            } else {
                 $currentClass = $this->getClassFromFilepath($file, $currentModule);
                 $dependencyType = $this->isPluginDependency($currentClass, $dependencyClass)
                     ? RuleInterface::TYPE_SOFT
                     : RuleInterface::TYPE_HARD;
-
-                $dependenciesInfo[] = [
-                    'module' => $referenceModule,
-                    'type' => $dependencyType,
-                    'source' => $dependencyClass,
-                ];
             }
-        }
-        $result = $this->_caseGetUrl($currentModule, $contents);
-        if (count($result)) {
-            $dependenciesInfo = array_merge($dependenciesInfo, $result);
-        }
-        $result = $this->_caseLayoutBlock($currentModule, $fileType, $file, $contents);
-        if (count($result)) {
-            $dependenciesInfo = array_merge($dependenciesInfo, $result);
+
+            $dependenciesInfo[] = [
+                'module' => $referenceModule,
+                'type' => $dependencyType,
+                'source' => $dependencyClass,
+            ];
         }
 
         return $dependenciesInfo;
@@ -366,4 +394,14 @@ protected function _getUniqueDependencies($dependencies = [])
         }
         return $result;
     }
+
+    /**
+     * @param array $known
+     * @param array $new
+     * @return array
+     */
+    private function considerCaseDependencies($known, $new)
+    {
+        return array_merge($known, $new);
+    }
 }
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
index fde892877ef..269eff8087a 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
@@ -70,7 +70,7 @@ public function getDependencyInfoDataProvider()
                 'any',
                 '/app/some/path/etc/db_schema.xml',
                 '<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                    xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+                    xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
                     <table name="some_table">
                         <constraint xsi:type="foreign" 
                         name="FK_NAME" 
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index add61e67222..87da2f13e1e 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -35,12 +35,42 @@ class ComposerTest extends \PHPUnit\Framework\TestCase
      */
     private static $objectManager;
 
+    /**
+     * @var string[]
+     */
+    private static $rootComposerModuleBlacklist = [];
+
+    /**
+     * @var string[]
+     */
+    private static $moduleNameBlacklist;
+
     public static function setUpBeforeClass()
     {
         self::$root = BP;
         self::$rootJson = json_decode(file_get_contents(self::$root . '/composer.json'), true);
         self::$dependencies = [];
         self::$objectManager = Bootstrap::create(BP, $_SERVER)->getObjectManager();
+        // A block can be whitelisted and thus not be required to be public
+        self::$rootComposerModuleBlacklist = self::getBlacklist(
+            __DIR__ . '/_files/blacklist/composer_root_modules*.txt'
+        );
+        self::$moduleNameBlacklist = self::getBlacklist(__DIR__ . '/_files/blacklist/composer_module_names*.txt');
+    }
+
+    /**
+     * Return aggregated blacklist
+     *
+     * @param string $pattern
+     * @return string[]
+     */
+    public static function getBlacklist(string $pattern)
+    {
+        $blacklist = [];
+        foreach (glob($pattern) as $list) {
+            $blacklist = array_merge($blacklist, file($list, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES));
+        }
+        return $blacklist;
     }
 
     public function testValidComposerJson()
@@ -222,13 +252,15 @@ private function assertNoMap(\StdClass $json)
      */
     private function assertConsistentModuleName(\SimpleXMLElement $xml, $packageName)
     {
-        $moduleName = (string)$xml->module->attributes()->name;
-        $expectedPackageName = $this->convertModuleToPackageName($moduleName);
-        $this->assertEquals(
-            $expectedPackageName,
-            $packageName,
-            "For the module '{$moduleName}', the expected package name is '{$expectedPackageName}'"
-        );
+        if (!in_array($packageName, self::$moduleNameBlacklist)) {
+            $moduleName = (string)$xml->module->attributes()->name;
+            $expectedPackageName = $this->convertModuleToPackageName($moduleName);
+            $this->assertEquals(
+                $expectedPackageName,
+                $packageName,
+                "For the module '{$moduleName}', the expected package name is '{$expectedPackageName}'"
+            );
+        }
     }
 
     /**
@@ -277,36 +309,48 @@ private function assertPhpVersionInSync($name, $phpVersion)
      * Make sure requirements of components are reflected in root composer.json
      *
      * @param \StdClass $json
+     * @return void
      */
     private function assertRequireInSync(\StdClass $json)
     {
-        $name = $json->name;
         if (preg_match('/magento\/project-*/', self::$rootJson['name']) == 1) {
             return;
         }
-        if (isset($json->require)) {
-            $errors = [];
-            foreach (array_keys((array)$json->require) as $depName) {
-                if ($depName == 'magento/magento-composer-installer') {
-                    // Magento Composer Installer is not needed for already existing components
-                    continue;
-                }
-                if (!isset(self::$rootJson['require-dev'][$depName]) && !isset(self::$rootJson['require'][$depName])
-                    && !isset(self::$rootJson['replace'][$depName])) {
-                    $errors[] = "'$name' depends on '$depName'";
-                }
+        if (!in_array($json->name, self::$rootComposerModuleBlacklist) && isset($json->require)) {
+            $this->checkPackageInRootComposer($json);
+        }
+    }
+
+    /**
+     * Check if package is reflected in root composer.json
+     *
+     * @param \StdClass $json
+     * @return void
+     */
+    private function checkPackageInRootComposer(\StdClass $json)
+    {
+        $name = $json->name;
+        $errors = [];
+        foreach (array_keys((array)$json->require) as $depName) {
+            if ($depName == 'magento/magento-composer-installer') {
+                // Magento Composer Installer is not needed for already existing components
+                continue;
             }
-            if (!empty($errors)) {
-                $this->fail(
-                    "The following dependencies are missing in root 'composer.json',"
-                    . " while declared in child components.\n"
-                    . "Consider adding them to 'require-dev' section (if needed for child components only),"
-                    . " to 'replace' section (if they are present in the project),"
-                    . " to 'require' section (if needed for the skeleton).\n"
-                    . join("\n", $errors)
-                );
+            if (!isset(self::$rootJson['require-dev'][$depName]) && !isset(self::$rootJson['require'][$depName])
+                && !isset(self::$rootJson['replace'][$depName])) {
+                $errors[] = "'$name' depends on '$depName'";
             }
         }
+        if (!empty($errors)) {
+            $this->fail(
+                "The following dependencies are missing in root 'composer.json',"
+                . " while declared in child components.\n"
+                . "Consider adding them to 'require-dev' section (if needed for child components only),"
+                . " to 'replace' section (if they are present in the project),"
+                . " to 'require' section (if needed for the skeleton).\n"
+                . join("\n", $errors)
+            );
+        }
     }
 
     /**
@@ -401,7 +445,11 @@ private function checkProject()
                 }
             }
             sort($dependenciesListed);
-            $nonDeclaredDependencies = array_diff(self::$dependencies, $dependenciesListed);
+            $nonDeclaredDependencies = array_diff(
+                self::$dependencies,
+                $dependenciesListed,
+                self::$rootComposerModuleBlacklist
+            );
             $nonexistentDependencies = array_diff($dependenciesListed, self::$dependencies);
             $this->assertEmpty(
                 $nonDeclaredDependencies,
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index e2439a4d2d8..3e7f7804222 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -423,7 +423,10 @@ public function collectRedundant()
     {
         foreach (array_keys(self::$_mapDependencies) as $module) {
             $declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
-            $found = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND);
+            $found = array_merge(
+                $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND),
+                $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND)
+            );
             $found['Magento\Framework'] = 'Magento\Framework';
             $this->_setDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT, array_diff($declared, $found));
         }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
index ec255b90a34..42ef12072a9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
@@ -62,6 +62,11 @@ class CompilerTest extends \PHPUnit\Framework\TestCase
      */
     protected $pluginValidator;
 
+    /**
+     * @var string[]|null
+     */
+    private $pluginBlacklist;
+
     protected function setUp()
     {
         $this->_shell = new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer());
@@ -107,6 +112,31 @@ protected function setUp()
         $this->pluginValidator = new PluginValidator(new InterfaceValidator());
     }
 
+    /**
+     * Return plugin blacklist class names
+     *
+     * @return string[]
+     */
+    private function getPluginBlacklist(): array
+    {
+        if ($this->pluginBlacklist === null) {
+            $blacklistFiles = str_replace(
+                '\\',
+                '/',
+                realpath(__DIR__) . '/../_files/blacklist/compiler_plugins*.txt'
+            );
+            $blacklistItems = [];
+            foreach (glob($blacklistFiles) as $fileName) {
+                $blacklistItems = array_merge(
+                    $blacklistItems,
+                    file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+                );
+            }
+            $this->pluginBlacklist = $blacklistItems;
+        }
+        return $this->pluginBlacklist;
+    }
+
     /**
      * Validate DI config file
      *
@@ -360,6 +390,7 @@ protected function validatePlugins($plugin, $type)
      * Get application plugins
      *
      * @return array
+     * @throws \Exception
      */
     protected function pluginDataProvider()
     {
@@ -376,8 +407,10 @@ protected function pluginDataProvider()
                 $type = \Magento\Framework\App\Utility\Classes::resolveVirtualType($type);
                 if ($node->attributes->getNamedItem('type')) {
                     $plugin = $node->attributes->getNamedItem('type')->nodeValue;
-                    $plugin = \Magento\Framework\App\Utility\Classes::resolveVirtualType($plugin);
-                    $plugins[] = ['plugin' => $plugin, 'intercepted type' => $type];
+                    if (!in_array($plugin, $this->getPluginBlacklist())) {
+                        $plugin = \Magento\Framework\App\Utility\Classes::resolveVirtualType($plugin);
+                        $plugins[] = ['plugin' => $plugin, 'intercepted type' => $type];
+                    }
                 }
             }
         }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
index 505d3e5c327..175a9aadbea 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
@@ -148,10 +148,10 @@ private function getAclResources()
         if ($this->aclResources !== null) {
             return $this->aclResources;
         }
-        $aclFiles = array_keys(Files::init()->getConfigFiles('acl.xml', []));
+        $aclFiles = Files::init()->getConfigFiles('acl.xml', []);
         $xmlResources = [];
         array_map(function ($file) use (&$xmlResources) {
-            $config = simplexml_load_file($file);
+            $config = simplexml_load_file($file[0]);
             $nodes = $config->xpath('.//resource/@id') ?: [];
             foreach ($nodes as $node) {
                 $xmlResources[(string)$node] = $node;
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt
index 1563abcaf8b..0fd245561e6 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/_files/ExtensibleInterfacesTest/blacklist_ce.txt
@@ -1,2 +1,3 @@
 module Magento_Payment Model/Info.php
-module Magento_Customer Model/Address/AbstractAddress.php
\ No newline at end of file
+module Magento_Customer Model/Address/AbstractAddress.php
+library magento/framework MessageQueue/Rpc/Publisher.php
\ No newline at end of file
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
index 56d00bc725d..6dd9d2f2bdd 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
@@ -22,33 +22,53 @@ class PublicCodeTest extends \PHPUnit\Framework\TestCase
         '$this', 'void', 'string', 'int', 'bool', 'boolean', 'integer', 'null'
     ];
 
+    /**
+     * @var string[]|null
+     */
+    private $blockWhitelist;
+
+    /**
+     * Return whitelist class names
+     *
+     * @return string[]
+     */
+    private function getWhitelist(): array
+    {
+        if ($this->blockWhitelist === null) {
+            $whiteListFiles = str_replace(
+                '\\',
+                '/',
+                realpath(__DIR__) . '/_files/whitelist/public_code*.txt'
+            );
+            $whiteListItems = [];
+            foreach (glob($whiteListFiles) as $fileName) {
+                $whiteListItems = array_merge(
+                    $whiteListItems,
+                    file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+                );
+            }
+            $this->blockWhitelist = $whiteListItems;
+        }
+        return $this->blockWhitelist;
+    }
+
     /**
      * Since blocks can be referenced from templates, they should be stable not to break theme customizations.
      * So all blocks should be @api annotated. This test checks that all blocks declared in layout files are public
      *
      * @param $layoutFile
+     * @throws \ReflectionException
      * @dataProvider layoutFilesDataProvider
      */
     public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
     {
-        // A block can be whitelisted and thus not be required to be public
-        $whiteListFiles = str_replace('\\', '/', realpath(__DIR__))
-            . '/_files/whitelist/public_code*.txt';
-        $whiteListBlocks = [];
-        foreach (glob($whiteListFiles) as $fileName) {
-            $whiteListBlocks = array_merge(
-                $whiteListBlocks,
-                file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
-            );
-        }
-
         $nonPublishedBlocks = [];
         $xml = simplexml_load_file($layoutFile);
         $elements = $xml->xpath('//block | //referenceBlock') ?: [];
         /** @var $node \SimpleXMLElement */
         foreach ($elements as $node) {
             $class = (string) $node['class'];
-            if ($class && \class_exists($class) && !in_array($class, $whiteListBlocks)) {
+            if ($class && \class_exists($class) && !in_array($class, $this->getWhitelist())) {
                 $reflection = (new \ReflectionClass($class));
                 if (strpos($reflection->getDocComment(), '@api') === false) {
                     $nonPublishedBlocks[] = $class;
@@ -58,7 +78,7 @@ public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
         if (count($nonPublishedBlocks)) {
             $this->fail(
                 "Layout file '$layoutFile' uses following blocks that are not marked with @api annotation:\n"
-                . implode(",\n", $nonPublishedBlocks)
+                . implode(",\n", array_unique($nonPublishedBlocks))
             );
         }
     }
@@ -67,6 +87,7 @@ public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
      * Find all layout update files in magento modules and themes.
      *
      * @return array
+     * @throws \Exception
      */
     public function layoutFilesDataProvider()
     {
@@ -79,8 +100,8 @@ public function layoutFilesDataProvider()
      * This test walks through all public PHP types and makes sure that all their method arguments
      * and return values are public types.
      *
-     *
      * @param string $class
+     * @throws \ReflectionException
      * @dataProvider publicPHPTypesDataProvider
      */
     public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
@@ -113,7 +134,7 @@ public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
         if (count($nonPublishedClasses)) {
             $this->fail(
                 "Public type '" . $class . "' references following non-public types:\n"
-                . implode("\n", $nonPublishedClasses)
+                . implode("\n", array_unique($nonPublishedClasses))
             );
         }
     }
@@ -121,6 +142,7 @@ public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
     /**
      * Retrieve list of all interfaces and classes in Magento codebase that are marked with @api annotation.
      * @return array
+     * @throws \Exception
      */
     public function publicPHPTypesDataProvider()
     {
@@ -130,7 +152,9 @@ public function publicPHPTypesDataProvider()
             $fileContents = \file_get_contents($file);
             if (strpos($fileContents, '@api') !== false) {
                 foreach ($this->getDeclaredClassesAndInterfaces($file) as $class) {
-                    if (class_exists($class->getName()) || interface_exists($class->getName())) {
+                    if (!in_array($class->getName(), $this->getWhitelist())
+                        && (class_exists($class->getName()) || interface_exists($class->getName()))
+                    ) {
                         $result[$class->getName()] = [$class->getName()];
                     }
                 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/exception_hierarchy.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/exception_hierarchy.txt
index 1c96bbce724..8eb33924764 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/exception_hierarchy.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/exception_hierarchy.txt
@@ -12,3 +12,4 @@
 \Magento\Catalog\Model\Product\Image\NotLoadInfoImageException
 \Magento\Signifyd\Model\SignifydGateway\GatewayException
 \Magento\Signifyd\Model\SignifydGateway\ApiCallException
+\Magento\Framework\MessageQueue\ConnectionLostException
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
index d859cb5b117..50fe1e32329 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
@@ -300,4 +300,5 @@
     'theme_files'                                 => 'Magento\Theme',
     'variable'                                    => 'Magento\Variable',
     'variable_value'                              => 'Magento\Variable',
+    'job_queue'                                   => 'Magento\Queue',
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
index a7c0385a30c..1ee599a0446 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
@@ -355,7 +355,9 @@ public function getAllowedActionNodeMethods()
             'unsetChild',
             'unsetChildren',
             'updateButton',
-            'setIsProductListingContext'
+            'setIsProductListingContext',
+            'checkCompanyStatus', // MAGETWO-88965
+            'setRendererType', // MAGETWO-88965
         ];
     }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
index 8a00037d251..2a6079d619d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -112,7 +112,7 @@ public function testPhpFiles()
         $changedFiles = ChangedFiles::getPhpFiles(__DIR__ . '/../_files/changed_files*');
         $blacklistFiles = $this->getBlacklistFiles();
         foreach ($blacklistFiles as $blacklistFile) {
-            unset($changedFiles[BP . $blacklistFile]);
+            unset($changedFiles[$blacklistFile]);
         }
         $invoker(
             function ($file) {
@@ -920,7 +920,7 @@ private function processPattern($appPath, $pattern)
 
         $fileSet = glob($appPath . DIRECTORY_SEPARATOR . $pattern, GLOB_NOSORT);
         foreach ($fileSet as $file) {
-            $files[] = substr($file, $relativePathStart);
+            $files[] = ltrim(substr($file, $relativePathStart), '/');
         }
 
         return $files;
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index bf107fed055..dea45d5f7f8 100755
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -4212,4 +4212,12 @@
     ['Magento\Framework\Acl\CacheInterface'],
     ['Magento\Framework\Acl\Test\Unit\CacheTest'],
     ['Magento\Eav\Model\Entity\Attribute\Backend\Serialized'],
+    ['Magento\Fmework\MessageQueue\Config\Reader\Xml\Converter\DeprecatedFormat'],
+    [
+        'Magento\Framework\MessageQueue\Config\Converter',
+        'Magento\Framework\MessageQueue\Config\Reader\Xml\CompositeConverter'
+    ],
+    ['Magento\Framework\MessageQueue\Config\Reader', 'Magento\Framework\MessageQueue\Config\Reader\Xml'],
+    ['Magento\Framework\MessageQueue\PublisherFactory'],
+    ['Magento\Framework\MessageQueue\PublisherProxy'],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index 90d4b465d36..cbf499c8dad 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -950,4 +950,8 @@
     ],
     ['TAB_GENERAL_CODE', 'Magento\Eav\Model\ResourceModel\Entity\Attribute\Group'],
     ['TAB_IMAGE_MANAGEMENT_CODE', 'Magento\Eav\Model\ResourceModel\Entity\Attribute\Group'],
+    [
+        'CALLBACK',
+        'Magento\Framework\MessageQueue\ConsumerConfiguration'
+    ],
 ];
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 3b72ea5e0a4..ee91c34002f 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
@@ -2529,4 +2529,42 @@
     ['var_dump', ''],
     ['each', ''],
     ['create_function', ''],
+    ['configure', 'Magento\Framework\MessageQueue\BatchConsumer'],
+    [
+            'getExchangeByTopic',
+            'Magento\Framework\MessageQueue\Config\Data',
+            '\Magento\Framework\MessageQueue\ConfigInterface::getExchangeByTopic'
+        ],
+    [
+            'getQueuesByTopic',
+            'Magento\Framework\MessageQueue\Config\Data',
+            '\Magento\Framework\MessageQueue\ConfigInterface::getQueuesByTopic'
+        ],
+    [
+            'getConnectionByTopic',
+            'Magento\Framework\MessageQueue\Config\Data',
+            '\Magento\Framework\MessageQueue\ConfigInterface::getConnectionByTopic'
+        ],
+    [
+            'getConnectionByConsumer',
+            'Magento\Framework\MessageQueue\Config\Data',
+            '\Magento\Framework\MessageQueue\ConfigInterface::getConnectionByConsumer'
+        ],
+    [
+            'getMessageSchemaType',
+            'Magento\Framework\MessageQueue\Config\Data',
+            '\Magento\Framework\MessageQueue\ConfigInterface::getMessageSchemaType'
+        ],
+    [
+            'getCallback',
+            'Magento\Framework\MessageQueue\ConsumerConfiguration'
+        ],
+    [
+            'getCallback',
+            'Magento\Framework\MessageQueue\ConsumerConfigurationInterface'
+        ],
+    [
+            'configure',
+            'Magento\Framework\MessageQueue\ConsumerInterface'
+        ],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
index 169ecd42098..0d9da334ea3 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
@@ -197,5 +197,7 @@
         'Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super',
         'Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations',
     ],
-    ['Magento\BraintreeTwo', 'Magento\Braintree']
+    ['Magento\BraintreeTwo', 'Magento\Braintree'],
+    ['Magento\MysqlMq\Model\Resource', 'Magento\MysqlMq\Model\ResourceModel'],
+    ['Magento\BulkOperations', 'Magento\AsynchronousOperations'],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
index 1c8c2d77ffb..1c23f8d8ccf 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
@@ -39,7 +39,32 @@
     ],
     'md5' => [
         'replacement' => '',
-        'exclude' => []
+        'exclude' => [
+            /*
+             * Usage of md5 in MessageQueue key generation algorithm
+             * added to exclude list to avoid backward incompatible changes
+             */
+            [
+                'type' => 'library',
+                'name' => 'magento/framework',
+                'path' => 'MessageQueue/Rpc/Publisher.php',
+            ],
+            [
+                'type' => 'library',
+                'name' => 'magento/framework',
+                'path' => 'MessageQueue/MessageController.php',
+            ],
+            [
+                'type' => 'library',
+                'name' => 'magento/framework',
+                'path' => 'MessageQueue/Publisher.php',
+            ],
+            [
+                'type' => 'module',
+                'name' => 'Magento_AsynchronousOperations',
+                'path' => 'Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php'
+            ]
+        ]
     ],
     'srand' => [
         'replacement' => '',
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 0ab8e0216c2..c831239bed4 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -199,3 +199,4 @@ Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem
 IntegrationConfig.php
 *Test.php
 setup/performance-toolkit/aggregate-report
+Magento/MessageQueue/Setup
diff --git a/lib/internal/Magento/Framework/Amqp/Bulk/Exchange.php b/lib/internal/Magento/Framework/Amqp/Bulk/Exchange.php
new file mode 100644
index 00000000000..3e4b9fdf670
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Bulk/Exchange.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Bulk;
+
+use Magento\Framework\MessageQueue\Bulk\ExchangeInterface;
+use PhpAmqpLib\Message\AMQPMessage;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+
+/**
+ * Used to send messages in bulk in AMQP queue.
+ */
+class Exchange implements ExchangeInterface
+{
+    /**
+     * @var \Magento\Framework\Amqp\Config
+     */
+    private $amqpConfig;
+
+    /**
+     * @var CommunicationConfigInterface
+     */
+    private $communicationConfig;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\Amqp\Exchange
+     */
+    private $exchange;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Amqp\Config $amqpConfig
+     * @param PublisherConfig $publisherConfig
+     * @param CommunicationConfigInterface $communicationConfig
+     * @param \Magento\Framework\Amqp\Exchange $exchange
+     */
+    public function __construct(
+        \Magento\Framework\Amqp\Config $amqpConfig,
+        PublisherConfig $publisherConfig,
+        CommunicationConfigInterface $communicationConfig,
+        \Magento\Framework\Amqp\Exchange $exchange
+    ) {
+        $this->amqpConfig = $amqpConfig;
+        $this->communicationConfig = $communicationConfig;
+        $this->publisherConfig = $publisherConfig;
+        $this->exchange = $exchange;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enqueue($topic, array $envelopes)
+    {
+        $topicData = $this->communicationConfig->getTopic($topic);
+        $isSync = $topicData[CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS];
+
+        if ($isSync) {
+            $responses = [];
+            foreach ($envelopes as $envelope) {
+                $responses[] = $this->exchange->enqueue($topic, $envelope);
+            }
+            return $responses;
+        }
+
+        $channel = $this->amqpConfig->getChannel();
+        $publisher = $this->publisherConfig->getPublisher($topic);
+        $exchange = $publisher->getConnection()->getExchange();
+
+        foreach ($envelopes as $envelope) {
+            $msg = new AMQPMessage($envelope->getBody(), $envelope->getProperties());
+            $channel->batch_basic_publish($msg, $exchange, $topic);
+        }
+        $channel->publish_batch();
+
+        return null;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Config.php b/lib/internal/Magento/Framework/Amqp/Config.php
new file mode 100644
index 00000000000..89f7922daae
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Config.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+use Magento\Framework\App\DeploymentConfig;
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+use PhpAmqpLib\Channel\AMQPChannel;
+use PhpAmqpLib\Connection\AMQPSSLConnection;
+
+/**
+ * Reads the Amqp config in the deployed environment configuration
+ *
+ * @api
+ * @since 100.0.0
+ */
+class Config
+{
+    /**
+     * Queue config key
+     */
+    const QUEUE_CONFIG = 'queue';
+
+    /**
+     * Amqp config key
+     */
+    const AMQP_CONFIG = 'amqp';
+
+    const HOST = 'host';
+    const PORT = 'port';
+    const USERNAME = 'user';
+    const PASSWORD = 'password';
+    const VIRTUALHOST = 'virtualhost';
+    const SSL = 'ssl';
+    const SSL_OPTIONS = 'ssl_options';
+
+    /**
+     * Deployment configuration
+     *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var AMQPStreamConnection
+     */
+    private $connection;
+
+    /**
+     * @var AMQPChannel
+     */
+    private $channel;
+
+    /**
+     * Associative array of Amqp configuration
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * AMQP connection name.
+     *
+     * @var string
+     */
+    private $connectionName;
+
+    /**
+     * Initialize dependencies.
+     *
+     * Example environment config:
+     * <code>
+     * 'queue' =>
+     *     [
+     *         'amqp' => [
+     *             'host' => 'localhost',
+     *             'port' => 5672,
+     *             'username' => 'guest',
+     *             'password' => 'guest',
+     *             'virtual_host' => '/',
+     *             'ssl' => false,
+     *             'ssl_options' => [],
+     *         ],
+     *     ],
+     * </code>
+     *
+     * @param DeploymentConfig $config
+     * @param string $connectionName
+     * @since 100.0.0
+     */
+    public function __construct(DeploymentConfig $config, $connectionName = 'amqp')
+    {
+        $this->deploymentConfig = $config;
+        $this->connectionName = $connectionName;
+    }
+
+    /**
+     * Destructor
+     *
+     * @return void
+     * @since 100.0.0
+     */
+    public function __destruct()
+    {
+        $this->closeConnection();
+    }
+
+    /**
+     * Returns the configuration set for the key.
+     *
+     * @param string $key
+     * @return string
+     * @throws \LogicException
+     * @since 100.0.0
+     */
+    public function getValue($key)
+    {
+        $this->load();
+        return isset($this->data[$key]) ? $this->data[$key] : null;
+    }
+
+    /**
+     * Return Amqp channel
+     *
+     * @return AMQPChannel
+     * @throws \LogicException
+     * @since 100.0.0
+     */
+    public function getChannel()
+    {
+        if (!isset($this->connection) || !isset($this->channel)) {
+            $this->connection = $this->getValue(self::SSL) ? $this->createSecureConnection() :
+                $this->createUnsecureConnection();
+
+            $this->channel = $this->connection->channel();
+        }
+        return $this->channel;
+    }
+
+    /**
+     * Load the configuration for Amqp
+     *
+     * @return void
+     * @throws \LogicException
+     */
+    private function load()
+    {
+        if (null === $this->data) {
+            $queueConfig = $this->deploymentConfig->getConfigData(self::QUEUE_CONFIG);
+            if ($this->connectionName == self::AMQP_CONFIG) {
+                $this->data = isset($queueConfig[self::AMQP_CONFIG]) ? $queueConfig[self::AMQP_CONFIG] : [];
+            } else {
+                $this->data = isset($queueConfig['connections'][$this->connectionName])
+                    ? $queueConfig['connections'][$this->connectionName]
+                    : [];
+            }
+            if (empty($this->data)) {
+                throw  new \LogicException('Unknown connection name ' . $this->connectionName);
+            }
+        }
+    }
+
+    /**
+     * Close Amqp connection and Channel
+     *
+     * @return void
+     */
+    private function closeConnection()
+    {
+        if (isset($this->channel)) {
+            $this->channel->close();
+            unset($this->channel);
+        }
+
+        if (isset($this->connection)) {
+            $this->connection->close();
+            unset($this->connection);
+        }
+    }
+
+    /**
+     * @return AMQPStreamConnection
+     */
+    private function createUnsecureConnection()
+    {
+        return new AMQPStreamConnection(
+            $this->getValue(self::HOST),
+            $this->getValue(self::PORT),
+            $this->getValue(self::USERNAME),
+            $this->getValue(self::PASSWORD),
+            $this->getValue(self::VIRTUALHOST)
+        );
+    }
+
+    /**
+     * Create secure connection to AMQP server.
+     *
+     * Note: when you are passing empty array of SSL options PHP-AMQPLIB will actually create unsecure connection.
+     *
+     * @return AMQPSSLConnection
+     */
+    private function createSecureConnection()
+    {
+        $sslOptions = $this->getValue(self::SSL_OPTIONS);
+
+        if (empty($sslOptions)) {
+            $sslOptions = ['verify_peer' => true];
+        }
+
+        return new AMQPSSLConnection(
+            $this->getValue(self::HOST),
+            $this->getValue(self::PORT),
+            $this->getValue(self::USERNAME),
+            $this->getValue(self::PASSWORD),
+            $this->getValue(self::VIRTUALHOST),
+            $sslOptions
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/ConfigFactory.php b/lib/internal/Magento/Framework/Amqp/ConfigFactory.php
new file mode 100644
index 00000000000..c1a85541447
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/ConfigFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+/**
+ * Factory class for @see Config
+ */
+class ConfigFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $_objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    protected $_instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = Config::class
+    ) {
+        $this->_objectManager = $objectManager;
+        $this->_instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return Config
+     */
+    public function create(array $data = [])
+    {
+        return $this->_objectManager->create($this->_instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/ConfigPool.php b/lib/internal/Magento/Framework/Amqp/ConfigPool.php
new file mode 100644
index 00000000000..c3d565bc996
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/ConfigPool.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+/**
+ * AMQP connections pool.
+ */
+class ConfigPool
+{
+    /**
+     * @var ConfigFactory
+     */
+    private $configFactory;
+
+    /**
+     * @var Config[]
+     */
+    private $pool = [];
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConfigFactory $configFactory
+     */
+    public function __construct(ConfigFactory $configFactory)
+    {
+        $this->configFactory = $configFactory;
+    }
+
+    /**
+     * Get connection by name.
+     *
+     * @param string $connectionName
+     * @return Config
+     */
+    public function get($connectionName)
+    {
+        if (!isset($this->pool[$connectionName])) {
+            $this->pool[$connectionName] = $this->configFactory->create(['connectionName' => $connectionName]);
+        }
+        return $this->pool[$connectionName];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php b/lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php
new file mode 100644
index 00000000000..9b600278144
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+use Magento\Framework\MessageQueue\ConnectionTypeResolverInterface;
+use Magento\Framework\App\DeploymentConfig;
+
+/**
+ * Amqp connection type resolver.
+ *
+ * @api
+ * @since 100.0.0
+ */
+class ConnectionTypeResolver implements ConnectionTypeResolverInterface
+{
+    /**
+     * Amqp connection names.
+     *
+     * @var string[]
+     */
+    private $amqpConnectionName = [];
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param DeploymentConfig $deploymentConfig
+     * @since 100.0.0
+     */
+    public function __construct(DeploymentConfig $deploymentConfig)
+    {
+        $queueConfig = $deploymentConfig->getConfigData(Config::QUEUE_CONFIG);
+        if (isset($queueConfig['connections']) && is_array($queueConfig['connections'])) {
+            $this->amqpConnectionName = array_keys($queueConfig['connections']);
+        }
+        if (isset($queueConfig[Config::AMQP_CONFIG])) {
+            $this->amqpConnectionName[] = Config::AMQP_CONFIG;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function getConnectionType($connectionName)
+    {
+        return in_array($connectionName, $this->amqpConnectionName) ? 'amqp' : null;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Exchange.php b/lib/internal/Magento/Framework/Amqp/Exchange.php
new file mode 100644
index 00000000000..e57fa09b83d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Exchange.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Amqp;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+use Magento\Framework\MessageQueue\ExchangeInterface;
+use PhpAmqpLib\Message\AMQPMessage;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+
+/**
+ * Class message exchange.
+ *
+ * @api
+ * @since 100.0.0
+ */
+class Exchange implements ExchangeInterface
+{
+    const RPC_CONNECTION_TIMEOUT = 30;
+
+    /**
+     * @var Config
+     */
+    private $amqpConfig;
+
+    /**
+     * @var CommunicationConfigInterface
+     */
+    private $communicationConfig;
+
+    /**
+     * @var int
+     */
+    private $rpcConnectionTimeout;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * @var ResponseQueueNameBuilder
+     */
+    private $responseQueueNameBuilder;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Config $amqpConfig
+     * @param PublisherConfig $publisherConfig
+     * @param ResponseQueueNameBuilder $responseQueueNameBuilder
+     * @param CommunicationConfigInterface $communicationConfig
+     * @param int $rpcConnectionTimeout
+     * @since 100.0.0
+     */
+    public function __construct(
+        Config $amqpConfig,
+        PublisherConfig $publisherConfig,
+        ResponseQueueNameBuilder $responseQueueNameBuilder,
+        CommunicationConfigInterface $communicationConfig,
+        $rpcConnectionTimeout = self::RPC_CONNECTION_TIMEOUT
+    ) {
+        $this->amqpConfig = $amqpConfig;
+        $this->communicationConfig = $communicationConfig;
+        $this->rpcConnectionTimeout = $rpcConnectionTimeout;
+        $this->publisherConfig = $publisherConfig;
+        $this->responseQueueNameBuilder = $responseQueueNameBuilder;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function enqueue($topic, EnvelopeInterface $envelope)
+    {
+        $topicData = $this->communicationConfig->getTopic($topic);
+        $isSync = $topicData[CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS];
+
+        $channel = $this->amqpConfig->getChannel();
+        $exchange = $this->publisherConfig->getPublisher($topic)->getConnection()->getExchange();
+        $responseBody = null;
+
+        $msg = new AMQPMessage($envelope->getBody(), $envelope->getProperties());
+        if ($isSync) {
+            $correlationId = $envelope->getProperties()['correlation_id'];
+            /** @var AMQPMessage $response */
+            $callback = function ($response) use ($correlationId, &$responseBody, $channel) {
+                if ($response->get('correlation_id') == $correlationId) {
+                    $responseBody = $response->body;
+                    $channel->basic_ack($response->get('delivery_tag'));
+                } else {
+                    //push message back to the queue
+                    $channel->basic_reject($response->get('delivery_tag'), true);
+                }
+            };
+            if ($envelope->getProperties()['reply_to']) {
+                $replyTo = $envelope->getProperties()['reply_to'];
+            } else {
+                $replyTo = $this->responseQueueNameBuilder->getQueueName($topic);
+            }
+            $channel->basic_consume(
+                $replyTo,
+                '',
+                false,
+                false,
+                false,
+                false,
+                $callback
+            );
+            $channel->basic_publish($msg, $exchange, $topic);
+            while ($responseBody === null) {
+                try {
+                    $channel->wait(null, false, $this->rpcConnectionTimeout);
+                } catch (\PhpAmqpLib\Exception\AMQPTimeoutException $e) {
+                    throw new LocalizedException(
+                        new \Magento\Framework\Phrase(
+                            "The RPC (Remote Procedure Call) failed. The connection timed out after %time_out. "
+                            . "Please try again later.",
+                            ['time_out' => $this->rpcConnectionTimeout]
+                        )
+                    );
+                }
+            }
+        } else {
+            $channel->basic_publish($msg, $exchange, $topic);
+        }
+        return $responseBody;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/ExchangeFactory.php b/lib/internal/Magento/Framework/Amqp/ExchangeFactory.php
new file mode 100644
index 00000000000..5291b3ab597
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/ExchangeFactory.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+/**
+ * Factory class for @see \Magento\Framework\Amqp\Exchange
+ *
+ * @api
+ * @since 100.0.0
+ */
+class ExchangeFactory implements \Magento\Framework\MessageQueue\ExchangeFactoryInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * @var ConfigPool
+     */
+    private $configPool;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ConfigPool $configPool
+     * @param string $instanceName
+     * @since 100.0.0
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        ConfigPool $configPool,
+        $instanceName = \Magento\Framework\Amqp\Exchange::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->configPool = $configPool;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function create($connectionName, array $data = [])
+    {
+        $data['amqpConfig'] = $this->configPool->get($connectionName);
+        return $this->objectManager->create(
+            $this->instanceName,
+            $data
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Queue.php b/lib/internal/Magento/Framework/Amqp/Queue.php
new file mode 100644
index 00000000000..edd57339b84
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Queue.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+use Magento\Framework\MessageQueue\ConnectionLostException;
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+use Magento\Framework\MessageQueue\QueueInterface;
+use PhpAmqpLib\Exception\AMQPProtocolConnectionException;
+use PhpAmqpLib\Message\AMQPMessage;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class Queue
+ *
+ * @api
+ * @since 100.0.0
+ */
+class Queue implements QueueInterface
+{
+    /**
+     * @var Config
+     */
+    private $amqpConfig;
+
+    /**
+     * @var string
+     */
+    private $queueName;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var LoggerInterface $logger
+     */
+    private $logger;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Config $amqpConfig
+     * @param EnvelopeFactory $envelopeFactory
+     * @param string $queueName
+     * @param LoggerInterface $logger
+     * @since 100.0.0
+     */
+    public function __construct(
+        Config $amqpConfig,
+        EnvelopeFactory $envelopeFactory,
+        $queueName,
+        LoggerInterface $logger
+    ) {
+        $this->amqpConfig = $amqpConfig;
+        $this->queueName = $queueName;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function dequeue()
+    {
+        $envelope = null;
+        $channel = $this->amqpConfig->getChannel();
+        // @codingStandardsIgnoreStart
+        /** @var AMQPMessage $message */
+        try {
+            $message = $channel->basic_get($this->queueName);
+        } catch (AMQPProtocolConnectionException $e) {
+            throw new ConnectionLostException(
+                $e->getMessage(),
+                $e->getCode(),
+                $e
+            );
+        }
+
+        if ($message !== null) {
+            $properties = array_merge(
+                $message->get_properties(),
+                [
+                    'topic_name' => $message->delivery_info['routing_key'],
+                    'delivery_tag' => $message->delivery_info['delivery_tag'],
+                ]
+            );
+            $envelope = $this->envelopeFactory->create(['body' => $message->body, 'properties' => $properties]);
+        }
+
+        // @codingStandardsIgnoreEnd
+        return $envelope;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function acknowledge(EnvelopeInterface $envelope)
+    {
+        $properties = $envelope->getProperties();
+        $channel = $this->amqpConfig->getChannel();
+        // @codingStandardsIgnoreStart
+        try {
+            $channel->basic_ack($properties['delivery_tag']);
+        } catch (AMQPProtocolConnectionException $e) {
+            throw new ConnectionLostException(
+                $e->getMessage(),
+                $e->getCode(),
+                $e
+            );
+        }
+        // @codingStandardsIgnoreEnd
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function subscribe($callback)
+    {
+        $callbackConverter = function (AMQPMessage $message) use ($callback) {
+            // @codingStandardsIgnoreStart
+            $properties = array_merge(
+                $message->get_properties(),
+                [
+                    'topic_name' => $message->delivery_info['routing_key'],
+                    'delivery_tag' => $message->delivery_info['delivery_tag'],
+                ]
+            );
+            // @codingStandardsIgnoreEnd
+            $envelope = $this->envelopeFactory->create(['body' => $message->body, 'properties' => $properties]);
+
+            if ($callback instanceof \Closure) {
+                $callback($envelope);
+            } else {
+                call_user_func($callback, $envelope);
+            }
+        };
+
+        $channel = $this->amqpConfig->getChannel();
+        // @codingStandardsIgnoreStart
+        $channel->basic_consume($this->queueName, '', false, false, false, false, $callbackConverter);
+        // @codingStandardsIgnoreEnd
+        while (count($channel->callbacks)) {
+            $channel->wait();
+        }
+    }
+
+    /**
+     * (@inheritdoc)
+     * @since 100.0.0
+     */
+    public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null)
+    {
+        $properties = $envelope->getProperties();
+
+        $channel = $this->amqpConfig->getChannel();
+        // @codingStandardsIgnoreStart
+        $channel->basic_reject($properties['delivery_tag'], $requeue);
+        // @codingStandardsIgnoreEnd
+        if ($rejectionMessage !== null) {
+            $this->logger->critical(
+                new \Magento\Framework\Phrase('Message has been rejected: %message', ['message' => $rejectionMessage])
+            );
+        }
+    }
+
+    /**
+     * (@inheritdoc)
+     * @since 100.0.0
+     */
+    public function push(EnvelopeInterface $envelope)
+    {
+        $messageProperties = $envelope->getProperties();
+        $msg = new AMQPMessage(
+            $envelope->getBody(),
+            [
+                'correlation_id' => $messageProperties['correlation_id'],
+                'delivery_mode' => 2
+            ]
+        );
+        $this->amqpConfig->getChannel()->basic_publish($msg, '', $this->queueName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/QueueFactory.php b/lib/internal/Magento/Framework/Amqp/QueueFactory.php
new file mode 100644
index 00000000000..9f1635a8797
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/QueueFactory.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+/**
+ * Factory class for @see \Magento\Framework\Amqp\Queue
+ *
+ * @api
+ * @since 100.0.0
+ */
+class QueueFactory implements \Magento\Framework\MessageQueue\QueueFactoryInterface
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * @var ConfigPool
+     */
+    private $configPool;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ConfigPool $configPool
+     * @param string $instanceName
+     * @since 100.0.0
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        ConfigPool $configPool,
+        $instanceName = \Magento\Framework\Amqp\Queue::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->configPool = $configPool;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.0.0
+     */
+    public function create($queueName, $connectionName)
+    {
+        return $this->objectManager->create(
+            $this->instanceName,
+            [
+                'amqpConfig' => $this->configPool->get($connectionName),
+                'queueName' => $queueName
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/README.md b/lib/internal/Magento/Framework/Amqp/README.md
new file mode 100644
index 00000000000..0951caead68
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/README.md
@@ -0,0 +1 @@
+AMQP library is designed to provide default implementation for Message Queue Framework.
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Bulk/ExchangeTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Bulk/ExchangeTest.php
new file mode 100644
index 00000000000..875d3088af6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Bulk/ExchangeTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Amqp\Test\Unit\Bulk;
+
+/**
+ * Unit test for Exchange model.
+ */
+class ExchangeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Amqp\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $amqpConfig;
+
+    /**
+     * @var \Magento\Framework\Communication\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $communicationConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\Amqp\Exchange|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exchange;
+
+    /**
+     * @var \Magento\Framework\Amqp\Bulk\Exchange
+     */
+    private $bulkExchange;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->amqpConfig = $this->getMockBuilder(\Magento\Framework\Amqp\Config::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->communicationConfig = $this->getMockBuilder(\Magento\Framework\Communication\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->exchange = $this->getMockBuilder(\Magento\Framework\Amqp\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->bulkExchange = $objectManager->getObject(
+            \Magento\Framework\Amqp\Bulk\Exchange::class,
+            [
+                'amqpConfig' => $this->amqpConfig,
+                'communicationConfig' => $this->communicationConfig,
+                'publisherConfig' => $this->publisherConfig,
+                'exchange' => $this->exchange,
+            ]
+        );
+    }
+
+    /**
+     * Test for enqueue method.
+     *
+     * @return void
+     */
+    public function testEnqueue()
+    {
+        $topicName = 'topic.name';
+        $exchangeName = 'exchangeName';
+        $envelopeBody = 'envelopeBody';
+        $envelopeProperties = ['property_key_1' => 'property_value_1'];
+        $topicData = [
+            \Magento\Framework\Communication\ConfigInterface::TOPIC_IS_SYNCHRONOUS => false
+        ];
+        $this->communicationConfig->expects($this->once())
+            ->method('getTopic')->with($topicName)->willReturn($topicData);
+        $channel = $this->getMockBuilder(\AMQPChannel::class)
+            ->setMethods(['batch_basic_publish', 'publish_batch'])
+            ->disableOriginalConstructor()->getMock();
+        $this->amqpConfig->expects($this->once())->method('getChannel')->willReturn($channel);
+        $publisher = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig->expects($this->once())
+            ->method('getPublisher')->with($topicName)->willReturn($publisher);
+        $connection = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $publisher->expects($this->once())->method('getConnection')->with()->willReturn($connection);
+        $connection->expects($this->once())->method('getExchange')->with()->willReturn($exchangeName);
+        $envelope = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $envelope->expects($this->once())->method('getBody')->willReturn($envelopeBody);
+        $envelope->expects($this->once())->method('getProperties')->willReturn($envelopeProperties);
+        $channel->expects($this->once())->method('batch_basic_publish')
+            ->with($this->isInstanceOf(\PhpAmqpLib\Message\AMQPMessage::class), $exchangeName, $topicName);
+        $channel->expects($this->once())->method('publish_batch');
+        $this->assertNull($this->bulkExchange->enqueue($topicName, [$envelope]));
+    }
+
+    /**
+     * Test for enqueue method with synchronous topic.
+     *
+     * @return void
+     */
+    public function testEnqueueWithSynchronousTopic()
+    {
+        $topicName = 'topic.name';
+        $response = 'responseBody';
+        $topicData = [
+            \Magento\Framework\Communication\ConfigInterface::TOPIC_IS_SYNCHRONOUS => true
+        ];
+        $this->communicationConfig->expects($this->once())
+            ->method('getTopic')->with($topicName)->willReturn($topicData);
+        $envelope = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->exchange->expects($this->once())->method('enqueue')->with($topicName, $envelope)->willReturn($response);
+        $this->assertEquals([$response], $this->bulkExchange->enqueue($topicName, [$envelope]));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigPoolTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigPoolTest.php
new file mode 100644
index 00000000000..5549eb39e54
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigPoolTest.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit;
+
+class ConfigPoolTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetConnection()
+    {
+        $factory = $this->createMock(\Magento\Framework\Amqp\ConfigFactory::class);
+        $config = $this->createMock(\Magento\Framework\Amqp\Config::class);
+        $factory->expects($this->once())->method('create')->with(['connectionName' => 'amqp'])->willReturn($config);
+        $model = new \Magento\Framework\Amqp\ConfigPool($factory);
+        $this->assertEquals($config, $model->get('amqp'));
+        //test that object is cached
+        $this->assertEquals($config, $model->get('amqp'));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigTest.php
new file mode 100644
index 00000000000..570a5c416d7
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit;
+
+use Magento\Framework\Amqp\Config;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Config
+     */
+    private $amqpConfig;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getConfigData'])
+            ->getMock();
+        $this->amqpConfig = $this->objectManager->getObject(
+            \Magento\Framework\Amqp\Config::class,
+            [
+                'config' => $this->deploymentConfigMock,
+            ]
+        );
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Unknown connection name amqp
+     */
+    public function testGetNullConfig()
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Config::QUEUE_CONFIG)
+            ->will($this->returnValue(null));
+
+        $this->amqpConfig->getValue(Config::HOST);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Unknown connection name amqp
+     */
+    public function testGetEmptyConfig()
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Config::QUEUE_CONFIG)
+            ->will($this->returnValue([]));
+
+        $this->amqpConfig->getValue(Config::HOST);
+    }
+
+    public function testGetStandardConfig()
+    {
+        $expectedHost = 'example.com';
+        $expectedPort = 5672;
+        $expectedUsername = 'guest_username';
+        $expectedPassword = 'guest_password';
+        $expectedVirtualHost = '/';
+        $expectedSsl = false;
+        $expectedSslOptions = ['some' => 'value'];
+
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Config::QUEUE_CONFIG)
+            ->will($this->returnValue(
+                [
+                    Config::AMQP_CONFIG => [
+                        'host' => $expectedHost,
+                        'port' => $expectedPort,
+                        'user' => $expectedUsername,
+                        'password' => $expectedPassword,
+                        'virtualhost' => $expectedVirtualHost,
+                        'ssl' => $expectedSsl,
+                        'ssl_options' => $expectedSslOptions,
+                        'randomKey' => 'randomValue',
+                    ]
+                ]
+            ));
+
+        $this->assertEquals($expectedHost, $this->amqpConfig->getValue(Config::HOST));
+        $this->assertEquals($expectedPort, $this->amqpConfig->getValue(Config::PORT));
+        $this->assertEquals($expectedUsername, $this->amqpConfig->getValue(Config::USERNAME));
+        $this->assertEquals($expectedPassword, $this->amqpConfig->getValue(Config::PASSWORD));
+        $this->assertEquals($expectedVirtualHost, $this->amqpConfig->getValue(Config::VIRTUALHOST));
+        $this->assertEquals($expectedSsl, $this->amqpConfig->getValue(Config::SSL));
+        $this->assertEquals($expectedSslOptions, $this->amqpConfig->getValue(Config::SSL_OPTIONS));
+        $this->assertEquals('randomValue', $this->amqpConfig->getValue('randomKey'));
+    }
+
+    public function testGetCustomConfig()
+    {
+        $amqpConfig = new \Magento\Framework\Amqp\Config($this->deploymentConfigMock, 'connection-01');
+        $expectedHost = 'example.com';
+        $expectedPort = 5672;
+        $expectedUsername = 'guest_username';
+        $expectedPassword = 'guest_password';
+        $expectedVirtualHost = '/';
+        $expectedSsl = ['some' => 'value'];
+
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Config::QUEUE_CONFIG)
+            ->will($this->returnValue(
+                [
+                    'connections' => [
+                        'connection-01' => [
+                            'host' => $expectedHost,
+                            'port' => $expectedPort,
+                            'user' => $expectedUsername,
+                            'password' => $expectedPassword,
+                            'virtualhost' => $expectedVirtualHost,
+                            'ssl' => $expectedSsl,
+                            'randomKey' => 'randomValue',
+                        ]
+                    ]
+                ]
+            ));
+
+        $this->assertEquals($expectedHost, $amqpConfig->getValue(Config::HOST));
+        $this->assertEquals($expectedPort, $amqpConfig->getValue(Config::PORT));
+        $this->assertEquals($expectedUsername, $amqpConfig->getValue(Config::USERNAME));
+        $this->assertEquals($expectedPassword, $amqpConfig->getValue(Config::PASSWORD));
+        $this->assertEquals($expectedVirtualHost, $amqpConfig->getValue(Config::VIRTUALHOST));
+        $this->assertEquals($expectedSsl, $amqpConfig->getValue(Config::SSL));
+        $this->assertEquals('randomValue', $amqpConfig->getValue('randomKey'));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/ConnectionTypeResolverTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConnectionTypeResolverTest.php
new file mode 100644
index 00000000000..491e323d6c5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/ConnectionTypeResolverTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit;
+
+use Magento\Framework\Amqp\ConnectionTypeResolver;
+use Magento\Framework\App\DeploymentConfig;
+
+class ConnectionTypeResolverTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetConnectionType()
+    {
+        $config = $this->createMock(DeploymentConfig::class);
+        $config->expects($this->once())
+            ->method('getConfigData')
+            ->with('queue')
+            ->will($this->returnValue(
+                [
+                    'amqp' => [
+                        'host' => '127.0.01',
+                        'port' => '8989',
+                        'user' => 'admin',
+                        'password' => 'admin',
+                        'virtualhost' => 'root',
+                        'ssl' => '',
+                        'randomKey' => 'randomValue',
+                    ],
+                    'connections' => [
+                        'connection-01' => [
+                            'host' => 'host',
+                            'port' => '1515',
+                            'user' => 'guest',
+                            'password' => 'guest',
+                            'virtualhost' => 'localhost',
+                            'ssl' => '',
+                            'randomKey' => 'randomValue',
+                        ]
+                    ]
+                ]
+            ));
+
+        $model = new ConnectionTypeResolver($config);
+        $this->assertEquals('amqp', $model->getConnectionType('connection-01'));
+        $this->assertEquals('amqp', $model->getConnectionType('amqp'));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerTest.php
new file mode 100644
index 00000000000..6233e9bf48b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit\Topology;
+
+use Magento\Framework\Amqp\Topology\BindingInstaller;
+use Magento\Framework\Amqp\Topology\BindingInstallerInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+class BindingInstallerTest extends \PHPUnit\Framework\TestCase
+{
+    public function testInstall()
+    {
+        $installerOne = $this->createMock(BindingInstallerInterface::class);
+        $installerTwo = $this->createMock(BindingInstallerInterface::class);
+        $model = new BindingInstaller(
+            [
+                'queue' => $installerOne,
+                'exchange' => $installerTwo,
+            ]
+        );
+        $channel = $this->createMock(AMQPChannel::class);
+        $binding = $this->createMock(BindingInterface::class);
+        $binding->expects($this->once())->method('getDestinationType')->willReturn('queue');
+        $installerOne->expects($this->once())->method('install')->with($channel, $binding, 'magento');
+        $installerTwo->expects($this->never())->method('install');
+        $model->install($channel, $binding, 'magento');
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Installer type [test] is not configured
+     */
+    public function testInstallInvalidType()
+    {
+        $installerOne = $this->createMock(BindingInstallerInterface::class);
+        $installerTwo = $this->createMock(BindingInstallerInterface::class);
+        $model = new BindingInstaller(
+            [
+                'queue' => $installerOne,
+                'exchange' => $installerTwo,
+            ]
+        );
+        $channel = $this->createMock(AMQPChannel::class);
+        $binding = $this->createMock(BindingInterface::class);
+        $binding->expects($this->once())->method('getDestinationType')->willReturn('test');
+        $installerOne->expects($this->never())->method('install');
+        $installerTwo->expects($this->never())->method('install');
+        $model->install($channel, $binding, 'magento');
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/ExchangeTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/ExchangeTest.php
new file mode 100644
index 00000000000..ec8176b7016
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/ExchangeTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit\Topology\BindingInstallerType;
+
+use Magento\Framework\Amqp\Topology\BindingInstallerType\Exchange;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+class ExchangeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Exchange
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new Exchange();
+    }
+
+    public function testInstall()
+    {
+        $channel = $this->createMock(AMQPChannel::class);
+        $binding = $this->createMock(BindingInterface::class);
+        $binding->expects($this->once())->method('getDestination')->willReturn('queue01');
+        $binding->expects($this->once())->method('getTopic')->willReturn('topic01');
+        $binding->expects($this->once())->method('getArguments')->willReturn(['some' => 'value']);
+
+        $channel->expects($this->once())
+            ->method('exchange_bind')
+            ->with(
+                'queue01',
+                'magento',
+                'topic01',
+                false,
+                ['some' => ['S', 'value']],
+                null
+            );
+        $this->model->install($channel, $binding, 'magento');
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/QueueTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/QueueTest.php
new file mode 100644
index 00000000000..88a49127109
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/BindingInstallerType/QueueTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit\Topology\BindingInstallerType;
+
+use Magento\Framework\Amqp\Topology\BindingInstallerType\Queue;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+class QueueTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Queue
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new Queue();
+    }
+
+    public function testInstall()
+    {
+        $channel = $this->createMock(AMQPChannel::class);
+        $binding = $this->createMock(BindingInterface::class);
+        $binding->expects($this->once())->method('getDestination')->willReturn('queue01');
+        $binding->expects($this->once())->method('getTopic')->willReturn('topic01');
+        $binding->expects($this->once())->method('getArguments')->willReturn(['some' => 'value']);
+
+        $channel->expects($this->once())
+            ->method('queue_bind')
+            ->with(
+                'queue01',
+                'magento',
+                'topic01',
+                false,
+                ['some' => ['S', 'value']],
+                null
+            );
+        $this->model->install($channel, $binding, 'magento');
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ExchangeInstallerTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ExchangeInstallerTest.php
new file mode 100644
index 00000000000..ac5faadb29c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ExchangeInstallerTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit\Topology;
+
+use Magento\Framework\Amqp\Topology\ExchangeInstaller;
+use Magento\Framework\Amqp\Topology\BindingInstallerInterface;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+class ExchangeInstallerTest extends \PHPUnit\Framework\TestCase
+{
+    public function testInstall()
+    {
+        $bindingInstaller = $this->createMock(BindingInstallerInterface::class);
+        $model = new ExchangeInstaller($bindingInstaller);
+        $channel = $this->createMock(AMQPChannel::class);
+
+        $binding = $this->createMock(BindingInterface::class);
+
+        $exchange = $this->createMock(ExchangeConfigItemInterface::class);
+        $exchange->expects($this->exactly(2))->method('getName')->willReturn('magento');
+        $exchange->expects($this->once())->method('getType')->willReturn('topic');
+        $exchange->expects($this->once())->method('isDurable')->willReturn(true);
+        $exchange->expects($this->once())->method('isAutoDelete')->willReturn(false);
+        $exchange->expects($this->once())->method('isInternal')->willReturn(false);
+        $exchange->expects($this->once())->method('getArguments')->willReturn(['some' => 'value']);
+        $exchange->expects($this->once())->method('getBindings')->willReturn(['bind01' => $binding]);
+
+        $channel->expects($this->once())
+            ->method('exchange_declare')
+            ->with('magento', 'topic', false, true, false, false, false, ['some' => ['S', 'value']], null);
+        $bindingInstaller->expects($this->once())->method('install')->with($channel, $binding, 'magento');
+        $model->install($channel, $exchange);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php
new file mode 100644
index 00000000000..f278952b832
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit\Topology;
+
+use Magento\Framework\Amqp\Topology\QueueInstaller;
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItemInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+
+class QueueInstallerTest extends \PHPUnit\Framework\TestCase
+{
+    public function testInstall()
+    {
+        $bindingInstaller = $this->createMock(QueueConfigItemInterface::class);
+        $model = new QueueInstaller($bindingInstaller);
+        $channel = $this->createMock(AMQPChannel::class);
+
+        $queue = $this->createMock(QueueConfigItemInterface::class);
+        $queue->expects($this->once())->method('getName')->willReturn('queue01');
+        $queue->expects($this->once())->method('isDurable')->willReturn(true);
+        $queue->expects($this->once())->method('isAutoDelete')->willReturn(false);
+        $queue->expects($this->once())->method('getArguments')->willReturn(['some' => 'value']);
+
+        $channel->expects($this->once())
+            ->method('queue_declare')
+            ->with('queue01', false, true, false, false, false, ['some' => ['S', 'value']], null);
+        $model->install($channel, $queue);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/TopologyInstallerTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/TopologyInstallerTest.php
new file mode 100644
index 00000000000..87253a15948
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/TopologyInstallerTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Test\Unit;
+
+use Magento\Framework\Amqp\TopologyInstaller;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\MessageQueue\Topology\ConfigInterface;
+use PhpAmqpLib\Exception\AMQPLogicException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Unit tests for @see \Magento\Framework\Amqp\TopologyInstaller
+ */
+class TopologyInstallerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Amqp\TopologyInstaller
+     */
+    private $topologyInstaller;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ConfigInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $topologyConfigMock;
+
+    /**
+     * @var LoggerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * Initialize topology installer.
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->topologyConfigMock = $this->createMock(ConfigInterface::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->topologyInstaller = $this->objectManager->getObject(
+            TopologyInstaller::class,
+            ['topologyConfig' => $this->topologyConfigMock, 'logger' => $this->loggerMock]
+        );
+        parent::setUp();
+    }
+
+    /**
+     * Make sure that topology creation errors in log contain actual error message.
+     */
+    public function testInstallException()
+    {
+        $exceptionMessage = "Exception message";
+
+        $this->topologyConfigMock
+            ->expects($this->once())
+            ->method('getQueues')
+            ->willThrowException(new AMQPLogicException($exceptionMessage));
+
+        $this->loggerMock
+            ->expects($this->once())
+            ->method('error')
+            ->with($this->stringContains("AMQP topology installation failed: {$exceptionMessage}"));
+
+        $this->topologyInstaller->install();
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php b/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php
new file mode 100644
index 00000000000..caa5db4e7ef
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology;
+
+/**
+ * @deprecated 100.0.0
+ * see: https://github.com/php-amqplib/php-amqplib/issues/405
+ */
+trait ArgumentProcessor
+{
+    /**
+     * Process arguments
+     *
+     * @param array $arguments
+     * @return array
+     */
+    public function processArguments($arguments)
+    {
+        $output = [];
+        foreach ($arguments as $key => $value) {
+            if (is_array($value)) {
+                $output[$key] = ['A', $value];
+            } elseif (is_int($value)) {
+                $output[$key] = ['I', $value];
+            } elseif (is_bool($value)) {
+                $output[$key] = ['t', $value];
+            } elseif (is_string($value)) {
+                $output[$key] = ['S', $value];
+            } else {
+                throw new \InvalidArgumentException('Unknown argument type ' . gettype($value));
+            }
+        }
+        return $output;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/BindingInstaller.php b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstaller.php
new file mode 100644
index 00000000000..58e43c0141e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstaller.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+
+/**
+ * {@inheritdoc}
+ */
+class BindingInstaller implements BindingInstallerInterface
+{
+    /**
+     * @var BindingInstallerInterface[]
+     */
+    private $installers;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param BindingInstallerInterface[] $installers
+     */
+    public function __construct(array $installers)
+    {
+        $this->installers = $installers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(AMQPChannel $channel, BindingInterface $binding, $exchangeName)
+    {
+        $this->getInstaller($binding->getDestinationType())->install($channel, $binding, $exchangeName);
+    }
+
+    /**
+     * Get binding installer by type.
+     *
+     * @param string $type
+     * @return BindingInstallerInterface
+     */
+    private function getInstaller($type)
+    {
+        if (!isset($this->installers[$type])) {
+            throw new \InvalidArgumentException(sprintf('Installer type [%s] is not configured', $type));
+        }
+        return $this->installers[$type];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerInterface.php b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerInterface.php
new file mode 100644
index 00000000000..d18b6b0ad73
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+
+/**
+ * Exchange binding installer.
+ */
+interface BindingInstallerInterface
+{
+    /**
+     * Install exchange bindings.
+     *
+     * @param AMQPChannel $channel
+     * @param BindingInterface $binding
+     * @param string $exchangeName
+     * @return void
+     */
+    public function install(AMQPChannel $channel, BindingInterface $binding, $exchangeName);
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Exchange.php b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Exchange.php
new file mode 100644
index 00000000000..9a5a653a2ce
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Exchange.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology\BindingInstallerType;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+use Magento\Framework\Amqp\Topology\BindingInstallerInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\Amqp\Topology\ArgumentProcessor;
+
+/**
+ * {@inheritdoc}
+ */
+class Exchange implements BindingInstallerInterface
+{
+    use ArgumentProcessor;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(AMQPChannel $channel, BindingInterface $binding, $exchangeName)
+    {
+        $channel->exchange_bind(
+            $binding->getDestination(),
+            $exchangeName,
+            $binding->getTopic(),
+            false,
+            $this->processArguments($binding->getArguments())
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Queue.php b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Queue.php
new file mode 100644
index 00000000000..a3ea48e727f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/BindingInstallerType/Queue.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology\BindingInstallerType;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+use Magento\Framework\Amqp\Topology\BindingInstallerInterface;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Magento\Framework\Amqp\Topology\ArgumentProcessor;
+
+/**
+ * {@inheritdoc}
+ */
+class Queue implements BindingInstallerInterface
+{
+    use ArgumentProcessor;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(AMQPChannel $channel, BindingInterface $binding, $exchangeName)
+    {
+        $channel->queue_bind(
+            $binding->getDestination(),
+            $exchangeName,
+            $binding->getTopic(),
+            false,
+            $this->processArguments($binding->getArguments())
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/ExchangeInstaller.php b/lib/internal/Magento/Framework/Amqp/Topology/ExchangeInstaller.php
new file mode 100644
index 00000000000..3951c219900
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/ExchangeInstaller.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemInterface;
+
+/**
+ * Exchange installer.
+ */
+class ExchangeInstaller
+{
+    use ArgumentProcessor;
+
+    /**
+     * @var BindingInstallerInterface
+     */
+    private $bindingInstaller;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param BindingInstallerInterface $bindingInstaller
+     */
+    public function __construct(BindingInstallerInterface $bindingInstaller)
+    {
+        $this->bindingInstaller = $bindingInstaller;
+    }
+
+    /**
+     * Install exchange.
+     *
+     * @param \PhpAmqpLib\Channel\AMQPChannel $channel
+     * @param ExchangeConfigItemInterface $exchange
+     * @return void
+     */
+    public function install(\PhpAmqpLib\Channel\AMQPChannel $channel, ExchangeConfigItemInterface $exchange)
+    {
+        $channel->exchange_declare(
+            $exchange->getName(),
+            $exchange->getType(),
+            false,
+            $exchange->isDurable(),
+            $exchange->isAutoDelete(),
+            $exchange->isInternal(),
+            false,
+            $this->processArguments($exchange->getArguments())
+        );
+
+        foreach ($exchange->getBindings() as $binding) {
+            $this->bindingInstaller->install($channel, $binding, $exchange->getName());
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/QueueInstaller.php b/lib/internal/Magento/Framework/Amqp/Topology/QueueInstaller.php
new file mode 100644
index 00000000000..83816bca9af
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Topology/QueueInstaller.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp\Topology;
+
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItemInterface;
+
+/**
+ * Queue installer.
+ */
+class QueueInstaller
+{
+    use ArgumentProcessor;
+
+    /**
+     * Install queue.
+     *
+     * @param \PhpAmqpLib\Channel\AMQPChannel $channel
+     * @param QueueConfigItemInterface $queue
+     * @return void
+     */
+    public function install(\PhpAmqpLib\Channel\AMQPChannel $channel, QueueConfigItemInterface $queue)
+    {
+        $channel->queue_declare(
+            $queue->getName(),
+            false,
+            $queue->isDurable(),
+            false,
+            $queue->isAutoDelete(),
+            false,
+            $this->processArguments($queue->getArguments())
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/TopologyInstaller.php b/lib/internal/Magento/Framework/Amqp/TopologyInstaller.php
new file mode 100644
index 00000000000..628974442eb
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/TopologyInstaller.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Amqp;
+
+use Magento\Framework\Amqp\Topology\ExchangeInstaller;
+use Magento\Framework\Amqp\Topology\QueueInstaller;
+use Magento\Framework\MessageQueue\Topology\ConfigInterface;
+
+/**
+ * Class Topology creates topology for Amqp messaging
+ */
+class TopologyInstaller
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $topologyConfig;
+
+    /**
+     * @var \Magento\Framework\Amqp\Topology\ExchangeInstaller
+     */
+    private $exchangeInstaller;
+
+    /**
+     * @var ConfigPool
+     */
+    private $configPool;
+
+    /**
+     * @var \Magento\Framework\Amqp\Topology\QueueInstaller
+     */
+    private $queueInstaller;
+
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConfigInterface $topologyConfig
+     * @param ExchangeInstaller $exchangeInstaller
+     * @param ConfigPool $configPool
+     * @param QueueInstaller $queueInstaller
+     * @param ConnectionTypeResolver $connectionTypeResolver
+     * @param \Psr\Log\LoggerInterface $logger
+     */
+    public function __construct(
+        ConfigInterface $topologyConfig,
+        ExchangeInstaller $exchangeInstaller,
+        ConfigPool $configPool,
+        QueueInstaller $queueInstaller,
+        ConnectionTypeResolver $connectionTypeResolver,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        $this->topologyConfig = $topologyConfig;
+        $this->exchangeInstaller = $exchangeInstaller;
+        $this->configPool = $configPool;
+        $this->queueInstaller = $queueInstaller;
+        $this->connectionTypeResolver = $connectionTypeResolver;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Install Amqp Exchanges, Queues and bind them
+     *
+     * @return void
+     */
+    public function install()
+    {
+        try {
+            foreach ($this->topologyConfig->getQueues() as $queue) {
+                if ($this->connectionTypeResolver->getConnectionType($queue->getConnection()) != 'amqp') {
+                    continue;
+                }
+                $amqpConfig = $this->configPool->get($queue->getConnection());
+                $this->queueInstaller->install($amqpConfig->getChannel(), $queue);
+            }
+            foreach ($this->topologyConfig->getExchanges() as $exchange) {
+                if ($this->connectionTypeResolver->getConnectionType($exchange->getConnection()) != 'amqp') {
+                    continue;
+                }
+                $amqpConfig = $this->configPool->get($exchange->getConnection());
+                $this->exchangeInstaller->install($amqpConfig->getChannel(), $exchange);
+            }
+        } catch (\PhpAmqpLib\Exception\AMQPExceptionInterface $e) {
+            $this->logger->error("AMQP topology installation failed: {$e->getMessage()}\n{$e->getTraceAsString()}");
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json
new file mode 100644
index 00000000000..7bcd2fe1b8b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/framework-amqp",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "type": "magento2-library",
+    "version": "100.1.0-dev",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "require": {
+        "magento/framework": "100.3.*",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php-amqplib/php-amqplib": "2.5.*"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\Framework\\Amqp\\": ""
+        },
+        "files": [
+            "registration.php"
+        ]
+    }
+}
diff --git a/lib/internal/Magento/Framework/Amqp/registration.php b/lib/internal/Magento/Framework/Amqp/registration.php
new file mode 100644
index 00000000000..ab14d5aab8e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::LIBRARY, 'magento/framework-amqp', __DIR__);
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index bae2b50a0ea..7e8d79eead7 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -162,7 +162,8 @@ public static function composeDataSets(array $files)
     {
         $result = [];
         foreach ($files as $file) {
-            $result[$file] = [$file];
+            $key = str_replace(BP . '/', '', $file);
+            $result[$key] = [$file];
         }
         return $result;
     }
diff --git a/lib/internal/Magento/Framework/Bulk/BulkManagementInterface.php b/lib/internal/Magento/Framework/Bulk/BulkManagementInterface.php
new file mode 100644
index 00000000000..9cfb2b1c97a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/BulkManagementInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Bulk;
+
+/**
+ * Interface BulkManagementInterface
+ * @api
+ * @since 100.2.0
+ */
+interface BulkManagementInterface
+{
+    /**
+     * Schedule new bulk
+     *
+     * @param string $bulkUuid
+     * @param OperationInterface[] $operations
+     * @param string $description
+     * @param int $userId
+     * @return boolean
+     * @since 100.2.0
+     */
+    public function scheduleBulk($bulkUuid, array $operations, $description, $userId = null);
+
+    /**
+     * Delete bulk
+     *
+     * @param string $bulkId
+     * @return boolean
+     * @since 100.2.0
+     */
+    public function deleteBulk($bulkId);
+}
diff --git a/lib/internal/Magento/Framework/Bulk/BulkStatusInterface.php b/lib/internal/Magento/Framework/Bulk/BulkStatusInterface.php
new file mode 100644
index 00000000000..0f1deb0ceee
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/BulkStatusInterface.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Bulk;
+
+/**
+ * Interface BulkStatusInterface
+ * @api
+ * @since 100.2.0
+ */
+interface BulkStatusInterface
+{
+    /**
+     * Get failed operations by bulk uuid
+     *
+     * @param string $bulkUuid
+     * @param int|null $failureType
+     * @return \Magento\Framework\Bulk\OperationInterface[]
+     * @since 100.2.0
+     */
+    public function getFailedOperationsByBulkId($bulkUuid, $failureType = null);
+
+    /**
+     * Get operations count by bulk uuid and status.
+     *
+     * @param string $bulkUuid
+     * @param int $status
+     * @return int
+     * @since 100.2.0
+     */
+    public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status);
+
+    /**
+     * Get all bulks created by user
+     *
+     * @param int $userId
+     * @return BulkSummaryInterface[]
+     * @since 100.2.0
+     */
+    public function getBulksByUser($userId);
+
+    /**
+     * Computational status based on statuses of belonging operations
+     *
+     * FINISHED_SUCCESFULLY - all operations are handled succesfully
+     * FINISHED_WITH_FAILURE - some operations are handled with failure
+     *
+     * @param string $bulkUuid
+     * @return int NOT_STARTED | IN_PROGRESS | FINISHED_SUCCESFULLY | FINISHED_WITH_FAILURE
+     * @since 100.2.0
+     */
+    public function getBulkStatus($bulkUuid);
+}
diff --git a/lib/internal/Magento/Framework/Bulk/BulkSummaryInterface.php b/lib/internal/Magento/Framework/Bulk/BulkSummaryInterface.php
new file mode 100644
index 00000000000..69e9b71ca00
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/BulkSummaryInterface.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Bulk;
+
+/**
+ * Interface BulkSummaryInterface
+ * @api
+ * @since 100.2.0
+ */
+interface BulkSummaryInterface
+{
+    /**#@+
+     * Constants for keys of data array. Identical to the name of the getter in snake case
+     */
+    const BULK_ID = 'uuid';
+    const DESCRIPTION = 'description';
+    const START_TIME = 'start_time';
+    const USER_ID = 'user_id';
+    const OPERATION_COUNT = 'operation_count';
+    /**#@-*/
+
+    /**#@+
+     * Bulk statuses constants
+     */
+    const NOT_STARTED = 0;
+    const IN_PROGRESS = 1;
+    const FINISHED_SUCCESSFULLY = 2;
+    const FINISHED_WITH_FAILURE = 3;
+    /**#@-*/
+
+    /**
+     * Get bulk uuid
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getBulkId();
+
+    /**
+     * Set bulk uuid
+     *
+     * @param string $bulkUuid
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setBulkId($bulkUuid);
+
+    /**
+     * Get bulk description
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getDescription();
+
+    /**
+     * Set bulk description
+     *
+     * @param string $description
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setDescription($description);
+
+    /**
+     * Get bulk scheduled time
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getStartTime();
+
+    /**
+     * Set bulk scheduled time
+     *
+     * @param string $timestamp
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setStartTime($timestamp);
+
+    /**
+     * Get user id
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getUserId();
+
+    /**
+     * Set user id
+     *
+     * @param int $userId
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setUserId($userId);
+
+    /**
+     * Get total number of operations scheduled in scope of this bulk
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getOperationCount();
+
+    /**
+     * Set total number of operations scheduled in scope of this bulk
+     *
+     * @param int $operationCount
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setOperationCount($operationCount);
+}
diff --git a/lib/internal/Magento/Framework/Bulk/OperationInterface.php b/lib/internal/Magento/Framework/Bulk/OperationInterface.php
new file mode 100644
index 00000000000..c6d714b0363
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/OperationInterface.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Bulk;
+
+/**
+ * Interface OperationInterface
+ * @api
+ * @since 100.2.0
+ */
+interface OperationInterface
+{
+    /**#@+
+     * Constants for keys of data array. Identical to the name of the getter in snake case
+     */
+    const ID = 'id';
+    const BULK_ID = 'bulk_uuid';
+    const TOPIC_NAME = 'topic_name';
+    const SERIALIZED_DATA = 'serialized_data';
+    const STATUS = 'status';
+    const RESULT_MESSAGE = 'result_message';
+    const ERROR_CODE = 'error_code';
+    /**#@-*/
+
+    /**#@+
+     * Status types
+     */
+    const STATUS_TYPE_COMPLETE = 1;
+    const STATUS_TYPE_RETRIABLY_FAILED = 2;
+    const STATUS_TYPE_NOT_RETRIABLY_FAILED = 3;
+    const STATUS_TYPE_OPEN = 4;
+    /**#@-*/
+
+    /**
+     * Operation id
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getId();
+
+    /**
+     * Set operation id
+     *
+     * @param int $id
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setId($id);
+
+    /**
+     * Get bulk uuid
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getBulkUuid();
+
+    /**
+     * Set bulk uuid
+     *
+     * @param string $bulkId
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setBulkUuid($bulkId);
+
+    /**
+     * Message Queue Topic
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getTopicName();
+
+    /**
+     * Set message queue topic
+     *
+     * @param string $topic
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setTopicName($topic);
+
+    /**
+     * Serialized Data
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getSerializedData();
+
+    /**
+     * Set serialized data
+     *
+     * @param string $serializedData
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setSerializedData($serializedData);
+
+    /**
+     * Get operation status
+     *
+     * OPEN | COMPLETE | RETRIABLY_FAILED | NOT_RETRIABLY_FAILED
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getStatus();
+
+    /**
+     * Set status
+     *
+     * @param int $status
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setStatus($status);
+
+    /**
+     * Get result message
+     *
+     * @return string
+     * @since 100.2.0
+     */
+    public function getResultMessage();
+
+    /**
+     * Set result message
+     *
+     * @param string $resultMessage
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setResultMessage($resultMessage);
+
+    /**
+     * Get error code
+     *
+     * @return int
+     * @since 100.2.0
+     */
+    public function getErrorCode();
+
+    /**
+     * Set error code
+     *
+     * @param int $errorCode
+     * @return $this
+     * @since 100.2.0
+     */
+    public function setErrorCode($errorCode);
+}
diff --git a/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php b/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php
new file mode 100644
index 00000000000..e86d3ca8c16
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Bulk;
+
+/**
+ * Interface OperationManagementInterface
+ * @api
+ * @since 100.2.0
+ */
+interface OperationManagementInterface
+{
+    /**
+     * Used by consumer to change status after processing operation
+     *
+     * @param int $operationId
+     * @param int $status
+     * @param int|null $errorCode
+     * @param string|null $message property to update Result Message
+     * @param string|null $data serialized data object of failed message
+     * @return boolean
+     * @since 100.2.0
+     */
+    public function changeOperationStatus($operationId, $status, $errorCode = null, $message = null, $data = null);
+}
diff --git a/lib/internal/Magento/Framework/Bulk/README.md b/lib/internal/Magento/Framework/Bulk/README.md
new file mode 100644
index 00000000000..8ddbc686147
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/README.md
@@ -0,0 +1 @@
+ This component is designed to provide Bulk Operations Framework.
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Bulk/composer.json b/lib/internal/Magento/Framework/Bulk/composer.json
new file mode 100644
index 00000000000..8cb9139ca0d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/framework-bulk",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "type": "magento2-library",
+    "version": "100.3.0-dev",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "require": {
+        "magento/framework": "100.3.*",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\Framework\\Bulk\\": ""
+        },
+        "files": [
+            "registration.php"
+        ]
+    }
+}
diff --git a/lib/internal/Magento/Framework/Bulk/registration.php b/lib/internal/Magento/Framework/Bulk/registration.php
new file mode 100644
index 00000000000..f9f5606b768
--- /dev/null
+++ b/lib/internal/Magento/Framework/Bulk/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::LIBRARY, 'magento/framework-bulk', __DIR__);
diff --git a/lib/internal/Magento/Framework/Code/Reader/ClassReader.php b/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
index 1bc71a342eb..fe96e9cc742 100644
--- a/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
@@ -27,10 +27,8 @@ public function getConstructor($className)
                     $result[] = [
                         $parameter->getName(),
                         $parameter->getClass() !== null ? $parameter->getClass()->getName() : null,
-                        !$parameter->isOptional(),
-                        $parameter->isOptional()
-                            ? ($parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null)
-                            : null,
+                        !$parameter->isOptional() && !$parameter->isDefaultValueAvailable(),
+                        $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null,
                     ];
                 } catch (\ReflectionException $e) {
                     $message = $e->getMessage();
diff --git a/lib/internal/Magento/Framework/Config/Data/ConfigDataFactory.php b/lib/internal/Magento/Framework/Config/Data/ConfigDataFactory.php
new file mode 100644
index 00000000000..655e624ff06
--- /dev/null
+++ b/lib/internal/Magento/Framework/Config/Data/ConfigDataFactory.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Config\Data;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for ConfigData.
+ */
+class ConfigDataFactory
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * Factory constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Returns a new instance of ConfigData on every call.
+     *
+     * @param string $fileKey
+     * @return ConfigData
+     */
+    public function create($fileKey)
+    {
+        return $this->objectManager->create(ConfigData::class, ['fileKey' => $fileKey]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php
index 79f9333a3b6..d497cef8ee7 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php
@@ -36,7 +36,7 @@ public function testGetRealPathNoUrn()
     public function testGetRealPathWithFrameworkUrn()
     {
         $xsdUrn = 'urn:magento:framework:Config/Test/Unit/_files/sample.xsd';
-        $xsdPath = realpath(dirname(__DIR__)) . '/_files/sample.xsd';
+        $xsdPath = str_replace('\\', '/', realpath(dirname(__DIR__)) . '/_files/sample.xsd');
         $result = $this->urnResolver->getRealPath($xsdUrn);
         $this->assertSame($xsdPath, $result, 'XSD paths does not match.');
     }
@@ -54,10 +54,10 @@ public function testGetRealPathWithModuleUrn()
 
     public function testGetRealPathWithSetupUrn()
     {
-        $xsdUrn = 'urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd';
+        $xsdUrn = 'urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd';
         $componentRegistrar = new ComponentRegistrar();
-        $xsdPath = $componentRegistrar->getPath(ComponentRegistrar::SETUP, 'magento/setup')
-            . '/Model/Declaration/Schema/etc/schema.xsd';
+        $xsdPath = $componentRegistrar->getPath(ComponentRegistrar::LIBRARY, 'magento/framework')
+            . '/Setup/Declaration/Schema/etc/schema.xsd';
 
         $result = $this->urnResolver->getRealPath($xsdUrn);
         $this->assertSame($xsdPath, $result, 'XSD paths does not match.');
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index f2368beadc5..39a0479f754 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -67,7 +67,7 @@ protected function getButtonTranslations()
      * @return bool|string
      * @throws \InvalidArgumentException
      */
-    private function getJsonConfig()
+    protected function getJsonConfig()
     {
         if (is_object($this->getConfig()) && method_exists($this->getConfig(), 'toJson')) {
             return $this->getConfig()->toJson();
diff --git a/lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php b/lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php
new file mode 100644
index 00000000000..e7dc12be40e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php
@@ -0,0 +1,305 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+
+/**
+ * Class BatchConsumer
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BatchConsumer implements ConsumerInterface
+{
+    /**
+     * @var ConsumerConfigurationInterface
+     */
+    private $configuration;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var QueueRepository
+     */
+    private $queueRepository;
+
+    /**
+     * @var MergerFactory
+     */
+    private $mergerFactory;
+
+    /**
+     * @var int
+     */
+    private $interval;
+
+    /**
+     * @var int
+     */
+    private $batchSize;
+
+    /**
+     * @var MessageProcessorLoader
+     */
+    private $messageProcessorLoader;
+
+    /**
+     * @var Resource
+     */
+    private $resource;
+
+    /**
+     * @var MessageController
+     */
+    private $messageController;
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * @param ConfigInterface $messageQueueConfig
+     * @param MessageEncoder $messageEncoder
+     * @param QueueRepository $queueRepository
+     * @param MergerFactory $mergerFactory
+     * @param ResourceConnection $resource
+     * @param ConsumerConfigurationInterface $configuration
+     * @param int $interval [optional]
+     * @param int $batchSize [optional]
+     * @param MessageProcessorLoader $messageProcessorLoader [optional]
+     * @param MessageController $messageController [optional]
+     * @param ConsumerConfig $consumerConfig [optional]
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        MessageQueueConfig $messageQueueConfig,
+        MessageEncoder $messageEncoder,
+        QueueRepository $queueRepository,
+        MergerFactory $mergerFactory,
+        ResourceConnection $resource,
+        ConsumerConfigurationInterface $configuration,
+        $interval = 5,
+        $batchSize = 0,
+        MessageProcessorLoader $messageProcessorLoader = null
+    ) {
+        $this->messageEncoder = $messageEncoder;
+        $this->queueRepository = $queueRepository;
+        $this->mergerFactory = $mergerFactory;
+        $this->interval = $interval;
+        $this->batchSize = $batchSize;
+        $this->resource = $resource;
+        $this->configuration = $configuration;
+        $this->messageProcessorLoader = $messageProcessorLoader
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(MessageProcessorLoader::class);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process($maxNumberOfMessages = null)
+    {
+        $queueName = $this->configuration->getQueueName();
+        $consumerName = $this->configuration->getConsumerName();
+        $connectionName = $this->getConsumerConfig()->getConsumer($consumerName)->getConnection();
+
+        $queue = $this->queueRepository->get($connectionName, $queueName);
+        $merger = $this->mergerFactory->create($consumerName);
+
+        if (!isset($maxNumberOfMessages)) {
+            $this->runDaemonMode($queue, $merger);
+        } else {
+            $this->run($queue, $merger, $maxNumberOfMessages);
+        }
+    }
+
+    /**
+     * Run process in a daemon mode.
+     *
+     * @param QueueInterface $queue
+     * @param MergerInterface $merger
+     * @return void
+     */
+    private function runDaemonMode(QueueInterface $queue, MergerInterface $merger)
+    {
+        $transactionCallback = $this->getTransactionCallback($queue, $merger);
+
+        while (true) {
+            $messages = $this->batchSize > 0
+                ? $this->getMessages($queue, $this->batchSize)
+                : $this->getAllMessages($queue);
+            $transactionCallback($messages);
+            sleep($this->interval);
+        }
+    }
+
+    /**
+     * Run short running process.
+     *
+     * @param QueueInterface $queue
+     * @param MergerInterface $merger
+     * @param int $maxNumberOfMessages
+     * @return void
+     */
+    private function run(QueueInterface $queue, MergerInterface $merger, $maxNumberOfMessages)
+    {
+        $count = $maxNumberOfMessages
+            ? $maxNumberOfMessages
+            : $this->configuration->getMaxMessages() ?: 1;
+        $transactionCallback = $this->getTransactionCallback($queue, $merger);
+
+        if ($this->batchSize) {
+            while ($count > 0) {
+                $messages = $this->getMessages($queue, $count > $this->batchSize ? $this->batchSize : $count);
+                $transactionCallback($messages);
+                $count -= $this->batchSize;
+            }
+        } else {
+            $messages = $this->getMessages($queue, $count);
+            $transactionCallback($messages);
+        }
+    }
+
+    /**
+     * Get all messages from a queue.
+     *
+     * @param QueueInterface $queue
+     * @return EnvelopeInterface[]
+     */
+    private function getAllMessages(QueueInterface $queue)
+    {
+        $messages = [];
+        while ($message = $queue->dequeue()) {
+            $messages[] = $message;
+        }
+
+        return $messages;
+    }
+
+    /**
+     * Get $count messages from a queue.
+     *
+     * @param QueueInterface $queue
+     * @param int $count
+     * @return EnvelopeInterface[]
+     */
+    private function getMessages(QueueInterface $queue, $count)
+    {
+        $messages = [];
+        for ($i = $count; $i > 0; $i--) {
+            $message = $queue->dequeue();
+            if ($message === null) {
+                break;
+            }
+            $messages[] = $message;
+        }
+
+        return $messages;
+    }
+
+    /**
+     * Decode provided messages.
+     *
+     * @param EnvelopeInterface[] $messages
+     * @return object[]
+     */
+    private function decodeMessages(array $messages)
+    {
+        $decodedMessages = [];
+        foreach ($messages as $messageId => $message) {
+            $properties = $message->getProperties();
+            $topicName = $properties['topic_name'];
+            $decodedMessages[$topicName][$messageId] = $this->messageEncoder->decode($topicName, $message->getBody());
+        }
+
+        return $decodedMessages;
+    }
+
+    /**
+     * Get transaction callback.
+     *
+     * @param QueueInterface $queue
+     * @param MergerInterface $merger
+     * @return \Closure
+     */
+    private function getTransactionCallback(QueueInterface $queue, MergerInterface $merger)
+    {
+        return function (array $messages) use ($queue, $merger) {
+            list($messages, $messagesToAcknowledge) = $this->lockMessages($messages);
+            $decodedMessages = $this->decodeMessages($messages);
+            $mergedMessages = $merger->merge($decodedMessages);
+            $messageProcessor = $this->messageProcessorLoader->load($mergedMessages);
+            $messageProcessor->process(
+                $queue,
+                $this->configuration,
+                $messages,
+                $messagesToAcknowledge,
+                $mergedMessages
+            );
+        };
+    }
+
+    /**
+     * Create lock for the messages.
+     *
+     * @param array $messages
+     * @return array
+     */
+    private function lockMessages(array $messages)
+    {
+        $toProcess = [];
+        $toAcknowledge = [];
+        foreach ($messages as $message) {
+            try {
+                $this->getMessageController()->lock($message, $this->configuration->getConsumerName());
+                $toProcess[] = $message;
+            } catch (MessageLockException $exception) {
+                $toAcknowledge[] = $message;
+            }
+        }
+        return [$toProcess, $toAcknowledge];
+    }
+
+    /**
+     * Get consumer config.
+     *
+     * This getter serves as a workaround to add this dependency to this class without breaking constructor structure
+     *
+     * @return ConsumerConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConsumerConfig()
+    {
+        if ($this->consumerConfig === null) {
+            $this->consumerConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(ConsumerConfig::class);
+        }
+        return $this->consumerConfig;
+    }
+
+    /**
+     * Get message controller.
+     *
+     * This getter serves as a workaround to add this dependency to this class without breaking constructor structure
+     *
+     * @return MessageController
+     *
+     * @deprecated 100.1.0
+     */
+    private function getMessageController()
+    {
+        if ($this->messageController === null) {
+            $this->messageController = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\MessageQueue\MessageController::class);
+        }
+        return $this->messageController;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactory.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactory.php
new file mode 100644
index 00000000000..47775ac857b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactory.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\ExchangeInterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+class ExchangeFactory implements ExchangeFactoryInterface
+{
+    /**
+     * @var ExchangeFactoryInterface[]
+     */
+    private $exchangeFactories;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     * @since 100.2.0
+     */
+    protected $objectManager = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\MessageQueue\ConnectionTypeResolver $connectionTypeResolver
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ExchangeFactoryInterface[] $exchangeFactories
+     * @since 100.2.0
+     */
+    public function __construct(
+        \Magento\Framework\MessageQueue\ConnectionTypeResolver $connectionTypeResolver,
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        array $exchangeFactories = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->exchangeFactories = $exchangeFactories;
+        $this->connectionTypeResolver = $connectionTypeResolver;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 100.2.0
+     */
+    public function create($connectionName, array $data = [])
+    {
+        $connectionType = $this->connectionTypeResolver->getConnectionType($connectionName);
+
+        if (!isset($this->exchangeFactories[$connectionType])) {
+            throw new \LogicException("Not found exchange for connection name '{$connectionName}' in config");
+        }
+
+        $factory = $this->exchangeFactories[$connectionType];
+        $exchange = $factory->create($connectionName, $data);
+
+        if (!$exchange instanceof ExchangeInterface) {
+            $exchangeInterface = \Magento\Framework\MessageQueue\Bulk\ExchangeInterface::class;
+            throw new \LogicException(
+                "Exchange for connection name '{$connectionName}' " .
+                "does not implement interface '{$exchangeInterface}'"
+            );
+        }
+        return $exchange;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactoryInterface.php
new file mode 100644
index 00000000000..dc691e632c9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactoryInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Bulk\ExchangeInterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ExchangeFactoryInterface
+{
+    /**
+     * Create exchange instance.
+     *
+     * @param string $connectionName
+     * @param array $data
+     * @return ExchangeInterface
+     * @throws \LogicException If exchange is not defined for the specified connection type
+     *                          or it doesn't implement ExchangeInterface
+     * @since 100.2.0
+     */
+    public function create($connectionName, array $data = []);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeInterface.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeInterface.php
new file mode 100644
index 00000000000..08b64689c29
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk;
+
+/**
+ * Interface for bulk exchange.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ExchangeInterface
+{
+    /**
+     * Send messages in bulk to the queue.
+     *
+     * @param string $topic
+     * @param \Magento\Framework\MessageQueue\EnvelopeInterface[] $envelopes
+     * @return mixed
+     * @since 100.2.0
+     */
+    public function enqueue($topic, array $envelopes);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeRepository.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeRepository.php
new file mode 100644
index 00000000000..dee0ba72c39
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeRepository.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk;
+
+/**
+ * Used to get exchange instance from the pool.
+ */
+class ExchangeRepository
+{
+    /**
+     * @var ExchangeFactoryInterface
+     */
+    private $exchangeFactory;
+
+    /**
+     * Pool of exchange instances.
+     *
+     * @var ExchangeInterface[]
+     */
+    private $exchangePool = [];
+
+    /**
+     * @param ExchangeFactoryInterface $exchangeFactory
+     */
+    public function __construct(ExchangeFactoryInterface $exchangeFactory)
+    {
+        $this->exchangeFactory = $exchangeFactory;
+    }
+
+    /**
+     * Get exchange from the pool for the specified connection type.
+     *
+     * @param string $connectionName
+     * @return ExchangeInterface
+     * @throws \LogicException
+     */
+    public function getByConnectionName($connectionName)
+    {
+        if (!isset($this->exchangePool[$connectionName])) {
+            $exchange = $this->exchangeFactory->create($connectionName);
+            $this->exchangePool[$connectionName] = $exchange;
+        }
+        return $this->exchangePool[$connectionName];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/Publisher.php
new file mode 100644
index 00000000000..7b71cc451b8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/Publisher.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk;
+
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+
+/**
+ * A MessageQueue Publisher to handle publishing messages in bulk.
+ */
+class Publisher implements PublisherInterface
+{
+    /**
+     * @var ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageIdGeneratorInterface
+     */
+    private $messageIdGenerator;
+
+    /**
+     * @param ExchangeRepository $exchangeRepository
+     * @param EnvelopeFactory $envelopeFactory
+     * @param MessageEncoder $messageEncoder
+     * @param MessageValidator $messageValidator
+     * @param PublisherConfig $publisherConfig
+     * @param \Magento\Framework\MessageQueue\MessageIdGeneratorInterface $messageIdGenerator
+     */
+    public function __construct(
+        ExchangeRepository $exchangeRepository,
+        EnvelopeFactory $envelopeFactory,
+        MessageEncoder $messageEncoder,
+        MessageValidator $messageValidator,
+        PublisherConfig $publisherConfig,
+        \Magento\Framework\MessageQueue\MessageIdGeneratorInterface $messageIdGenerator
+    ) {
+        $this->exchangeRepository = $exchangeRepository;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->messageEncoder = $messageEncoder;
+        $this->messageValidator = $messageValidator;
+        $this->publisherConfig = $publisherConfig;
+        $this->messageIdGenerator = $messageIdGenerator;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function publish($topicName, $data)
+    {
+        $envelopes = [];
+        foreach ($data as $message) {
+            $this->messageValidator->validate($topicName, $message);
+            $message = $this->messageEncoder->encode($topicName, $message);
+            $envelopes[] = $this->envelopeFactory->create(
+                [
+                    'body' => $message,
+                    'properties' => [
+                        'delivery_mode' => 2,
+                        'message_id' => $this->messageIdGenerator->generate($topicName),
+                    ]
+                ]
+            );
+        }
+        $publisher = $this->publisherConfig->getPublisher($topicName);
+        $connectionName = $publisher->getConnection()->getName();
+        $exchange = $this->exchangeRepository->getByConnectionName($connectionName);
+        $exchange->enqueue($topicName, $envelopes);
+        return null;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/Rpc/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/Rpc/Publisher.php
new file mode 100644
index 00000000000..d7570c26bfa
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/Rpc/Publisher.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Bulk\Rpc;
+
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Magento\Framework\MessageQueue\Bulk\ExchangeRepository;
+use PhpAmqpLib\Message\AMQPMessage;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+
+/**
+ * A MessageQueue Publisher to handle publishing a message.
+ */
+class Publisher implements PublisherInterface
+{
+    /**
+     * @var ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var ResponseQueueNameBuilder
+     */
+    private $responseQueueNameBuilder;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageIdGeneratorInterface
+     */
+    private $messageIdGenerator;
+
+    /**
+     * @param ExchangeRepository $exchangeRepository
+     * @param EnvelopeFactory $envelopeFactory
+     * @param MessageEncoder $messageEncoder
+     * @param MessageValidator $messageValidator
+     * @param ResponseQueueNameBuilder $responseQueueNameBuilder
+     * @param PublisherConfig $publisherConfig
+     * @param \Magento\Framework\MessageQueue\MessageIdGeneratorInterface $messageIdGenerator
+     */
+    public function __construct(
+        ExchangeRepository $exchangeRepository,
+        EnvelopeFactory $envelopeFactory,
+        MessageEncoder $messageEncoder,
+        MessageValidator $messageValidator,
+        ResponseQueueNameBuilder $responseQueueNameBuilder,
+        PublisherConfig $publisherConfig,
+        \Magento\Framework\MessageQueue\MessageIdGeneratorInterface $messageIdGenerator
+    ) {
+        $this->exchangeRepository = $exchangeRepository;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->messageEncoder = $messageEncoder;
+        $this->messageValidator = $messageValidator;
+        $this->responseQueueNameBuilder = $responseQueueNameBuilder;
+        $this->publisherConfig = $publisherConfig;
+        $this->messageIdGenerator = $messageIdGenerator;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function publish($topicName, $data)
+    {
+        $envelopes = [];
+        $replyTo = $this->responseQueueNameBuilder->getQueueName($topicName);
+        foreach ($data as $message) {
+            $this->messageValidator->validate($topicName, $message);
+            $message = $this->messageEncoder->encode($topicName, $message);
+            $envelope = $this->envelopeFactory->create(
+                [
+                    'body' => $message,
+                    'properties' => [
+                        'reply_to' => $replyTo,
+                        'delivery_mode' => 2,
+                        'correlation_id' => rand(),
+                        'message_id' => $this->messageIdGenerator->generate($topicName),
+                    ]
+                ]
+            );
+            $envelopes[] = $envelope;
+        }
+        $publisher = $this->publisherConfig->getPublisher($topicName);
+        $connectionName = $publisher->getConnection()->getName();
+        $exchange = $this->exchangeRepository->getByConnectionName($connectionName);
+        return $exchange->enqueue($topicName, $envelopes);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/BulkPublisherInterface.php b/lib/internal/Magento/Framework/MessageQueue/BulkPublisherInterface.php
new file mode 100644
index 00000000000..459966b2c91
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/BulkPublisherInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Producer to publish messages in bulk via a specific transport to a specific queue or exchange.
+ */
+interface BulkPublisherInterface
+{
+    /**
+     * Publishes messages in bulk to a specific queue or exchange.
+     *
+     * @param string $topicName
+     * @param array|object $data
+     * @return null|mixed
+     */
+    public function publish($topicName, $data);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
new file mode 100644
index 00000000000..cb80bc4beca
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Class CallbackInvoker to invoke callbacks for consumer classes
+ */
+class CallbackInvoker
+{
+    /**
+     * Run short running process
+     *
+     * @param QueueInterface $queue
+     * @param int $maxNumberOfMessages
+     * @param \Closure $callback
+     * @return void
+     */
+    public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
+    {
+        for ($i = $maxNumberOfMessages; $i > 0; $i--) {
+            do {
+                $message = $queue->dequeue();
+            } while ($message === null && (sleep(1) === 0));
+            $callback($message);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/Communication.php b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/Communication.php
new file mode 100644
index 00000000000..6219dbf29b1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/Communication.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader;
+
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\ObjectManager\ConfigInterface as ObjectManagerConfig;
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+use Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator;
+
+/**
+ * Remote service configuration reader.
+ */
+class Communication implements \Magento\Framework\Config\ReaderInterface
+{
+    /**
+     * @var ObjectManagerConfig
+     */
+    private $objectManagerConfig;
+
+    /**
+     * @var ReflectionGenerator
+     */
+    private $dataGenerator;
+
+    /**
+     * @var ServiceMethodsMap
+     */
+    private $serviceMethodsMap;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ObjectManagerConfig $objectManagerConfig
+     * @param ReflectionGenerator $dataGenerator
+     * @param ServiceMethodsMap $serviceMethodsMap
+     */
+    public function __construct(
+        ObjectManagerConfig $objectManagerConfig,
+        ReflectionGenerator $dataGenerator,
+        ServiceMethodsMap $serviceMethodsMap
+    ) {
+        $this->objectManagerConfig = $objectManagerConfig;
+        $this->dataGenerator = $dataGenerator;
+        $this->serviceMethodsMap = $serviceMethodsMap;
+    }
+
+    /**
+     * Generate communication configuration based on remote services declarations in di.xml
+     *
+     * @param string|null $scope
+     * @return array
+     * @throws \LogicException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function read($scope = null)
+    {
+        $preferences = $this->objectManagerConfig->getPreferences();
+        $remoteServices = [];
+        foreach ($preferences as $type => $preference) {
+            if ($preference == $type . RemoteServiceGenerator::REMOTE_SERVICE_SUFFIX) {
+                $remoteServices[$type] = $preference;
+            }
+        }
+        $result = [];
+        foreach ($remoteServices as $serviceInterface => $remoteImplementation) {
+            try {
+                $methodsMap = $this->serviceMethodsMap->getMethodsMap($serviceInterface);
+            } catch (\Exception $e) {
+                throw new \LogicException(sprintf('Service interface was expected, "%s" given', $serviceInterface));
+            }
+            foreach ($methodsMap as $methodName => $returnType) {
+                $topicName = $this->dataGenerator->generateTopicName($serviceInterface, $methodName);
+                $result[$topicName] = $this->dataGenerator->generateTopicConfigForServiceMethod(
+                    $topicName,
+                    $serviceInterface,
+                    $methodName
+                );
+                $result[$topicName][CommunicationConfig::TOPIC_HANDLERS] = [];
+            }
+        }
+        return [CommunicationConfig::TOPICS => $result];
+    }
+
+    /**
+     * Generate topic name based on service type and method name.
+     *
+     * Perform the following conversion:
+     * \Magento\Customer\Api\RepositoryInterface + getById => magento.customer.api.repositoryInterface.getById
+     *
+     * @param string $typeName
+     * @param string $methodName
+     * @return string
+     *
+     * @deprecated 100.2.0
+     * @see \Magento\Framework\Communication\Config\ReflectionGenerator::generateTopicName
+     */
+    public function generateTopicName($typeName, $methodName)
+    {
+        return $this->dataGenerator->generateTopicName($typeName, $methodName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/MessageQueue.php b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/MessageQueue.php
new file mode 100644
index 00000000000..9412e1c2384
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/MessageQueue.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Remote service configuration reader.
+ *
+ * @deprecated 100.2.0
+ */
+class MessageQueue implements \Magento\Framework\Config\ReaderInterface
+{
+    const DEFAULT_PUBLISHER = 'default';
+    const DEFAULT_CONNECTION = 'amqp';
+    const DEFAULT_EXCHANGE = 'magento';
+
+    /**
+     * @var Communication
+     */
+    private $communicationReader;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Communication $communicationReader
+     */
+    public function __construct(
+        Communication $communicationReader
+    ) {
+        $this->communicationReader = $communicationReader;
+    }
+
+    /**
+     * Generate communication configuration based on remote services declarations in di.xml
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $remoteServiceTopics = $this->communicationReader->read($scope);
+        $queueTopics = [];
+        $queueBinds = [];
+        $queueExchangeTopicToQueueMap = [];
+        foreach ($remoteServiceTopics[CommunicationConfig::TOPICS] as $topicName => $communicationConfig) {
+            $queueTopics[$topicName] = [
+                QueueConfig::TOPIC_NAME => $topicName,
+                QueueConfig::TOPIC_SCHEMA => [
+                    QueueConfig::TOPIC_SCHEMA_TYPE => QueueConfig::TOPIC_SCHEMA_TYPE_METHOD,
+                    QueueConfig::TOPIC_SCHEMA_VALUE => $communicationConfig[CommunicationConfig::TOPIC_REQUEST]
+                ],
+                QueueConfig::TOPIC_RESPONSE_SCHEMA => [
+                    QueueConfig::TOPIC_SCHEMA_TYPE => isset($communicationConfig[CommunicationConfig::TOPIC_RESPONSE])
+                        ? QueueConfig::TOPIC_SCHEMA_TYPE_OBJECT
+                        : null,
+                    QueueConfig::TOPIC_SCHEMA_VALUE => $communicationConfig[CommunicationConfig::TOPIC_RESPONSE]
+                ],
+                QueueConfig::TOPIC_PUBLISHER => self::DEFAULT_PUBLISHER
+            ];
+
+            $queueName = 'queue.' . $topicName;
+            $queueBinds[$topicName . '--' . self::DEFAULT_EXCHANGE . '--' . $queueName] = [
+                QueueConfig::BIND_TOPIC => $topicName,
+                QueueConfig::BIND_EXCHANGE => self::DEFAULT_EXCHANGE,
+                QueueConfig::BIND_QUEUE => $queueName,
+            ];
+
+            $queueExchangeTopicToQueueMap[self::DEFAULT_EXCHANGE . '--' . $topicName] = [$queueName];
+        }
+        $queuePublishers = [
+            self::DEFAULT_PUBLISHER => [
+                QueueConfig::PUBLISHER_NAME => self::DEFAULT_PUBLISHER,
+                QueueConfig::PUBLISHER_CONNECTION => self::DEFAULT_CONNECTION,
+                QueueConfig::PUBLISHER_EXCHANGE => self::DEFAULT_EXCHANGE
+            ]
+        ];
+        return [
+            QueueConfig::PUBLISHERS => $queuePublishers,
+            QueueConfig::TOPICS => $queueTopics,
+            QueueConfig::CONSUMERS => [],
+            QueueConfig::BINDS => $queueBinds,
+            QueueConfig::EXCHANGE_TOPIC_TO_QUEUES_MAP => $queueExchangeTopicToQueueMap,
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php
new file mode 100644
index 00000000000..0cd62963c54
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Code\Generator;
+
+use Magento\Framework\Code\Generator\DefinedClasses;
+use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader\Communication as RemoteServiceReader;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+use Zend\Code\Reflection\MethodReflection;
+
+/**
+ * Code generator for remote services.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class RemoteServiceGenerator extends \Magento\Framework\Code\Generator\EntityAbstract
+{
+    const ENTITY_TYPE = 'remote';
+    const REMOTE_SERVICE_SUFFIX = 'Remote';
+
+    /**
+     * @var CommunicationConfig
+     */
+    protected $communicationConfig;
+
+    /**
+     * @var ServiceMethodsMap
+     */
+    private $serviceMethodsMap;
+
+    /**
+     * @var ReflectionGenerator
+     */
+    private $reflectionGenerator;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param CommunicationConfig $communicationConfig
+     * @param ServiceMethodsMap $serviceMethodsMap
+     * @param RemoteServiceReader $communicationRemoteServiceReader
+     * @param string|null $sourceClassName
+     * @param string|null $resultClassName
+     * @param Io $ioObject
+     * @param \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator
+     * @param DefinedClasses $definedClasses
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        CommunicationConfig $communicationConfig,
+        ServiceMethodsMap $serviceMethodsMap,
+        RemoteServiceReader $communicationRemoteServiceReader,
+        $sourceClassName = null,
+        $resultClassName = null,
+        Io $ioObject = null,
+        \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator = null,
+        DefinedClasses $definedClasses = null
+    ) {
+        $this->communicationConfig = $communicationConfig;
+        $this->serviceMethodsMap = $serviceMethodsMap;
+        parent::__construct(
+            $sourceClassName,
+            $resultClassName,
+            $ioObject,
+            $classGenerator,
+            $definedClasses
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _getDefaultConstructorDefinition()
+    {
+        return [
+            'name' => '__construct',
+            'parameters' => [
+                ['name' => 'publisher', 'type' => '\\' . \Magento\Framework\MessageQueue\PublisherInterface::class],
+            ],
+            'body' => "\$this->publisher = \$publisher;",
+            'docblock' => [
+                'shortDescription' => 'Initialize dependencies.',
+                'tags' => [
+                    [
+                        'name' => 'param',
+                        'description' => '\Magento\Framework\MessageQueue\PublisherInterface $publisher',
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _getClassProperties()
+    {
+        return [
+            [
+                'name' => 'publisher',
+                'visibility' => 'protected',
+                'docblock' => [
+                    'shortDescription' => 'Publisher',
+                    'tags' => [
+                        [
+                            'name' => 'var',
+                            'description' => '\\' . \Magento\Framework\MessageQueue\PublisherInterface::class,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _getClassMethods()
+    {
+        $methods = [$this->_getDefaultConstructorDefinition()];
+        $interfaceMethodsMap = $this->serviceMethodsMap->getMethodsMap($this->getSourceClassName());
+        foreach (array_keys($interfaceMethodsMap) as $methodName) {
+            // Uses Zend Reflection instead MethodsMap service, because second does not support features of PHP 7.x
+            $methodReflection = new MethodReflection($this->getSourceClassName(), $methodName);
+            $sourceMethodParameters = $methodReflection->getParameters();
+            $methodParameters = [];
+            $topicParameters = [];
+            /** @var \Zend\Code\Reflection\ParameterReflection $methodParameter */
+            foreach ($sourceMethodParameters as $methodParameter) {
+                $parameterName = $methodParameter->getName();
+                $parameter = [
+                    'name' => $parameterName,
+                    'type' => $methodParameter->getType(),
+                ];
+                if ($methodParameter->isDefaultValueAvailable()) {
+                    $parameter['defaultValue'] = $methodParameter->getDefaultValue() !== null
+                        ? $methodParameter->getDefaultValue() : $this->_getNullDefaultValue();
+                }
+                $methodParameters[] = $parameter;
+                $topicParameters[] = "'{$parameterName}' => \${$parameterName}";
+            }
+            $topicName = $this->getReflectionGenerator()->generateTopicName($this->getSourceClassName(), $methodName);
+            $topicConfig = $this->communicationConfig->getTopic($topicName);
+            $methodBody = $topicConfig[CommunicationConfig::TOPIC_IS_SYNCHRONOUS] ? 'return ' : '';
+            $methodBody .= "\$this->publisher->publish(\n"
+                . "    '{$topicName}',\n"
+                . "    [" . implode(', ', $topicParameters) . "]\n"
+                . ");";
+            $annotations = [['name' => 'inheritdoc']];
+            $method = [
+                'name' => $methodName,
+                'returnType' => $methodReflection->getReturnType(),
+                'parameters' => $methodParameters,
+                'body' => $methodBody,
+                'docblock' => ['tags' => $annotations],
+            ];
+            $methods[] = $method;
+        }
+        return $methods;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _validateData()
+    {
+        $classNameValidationResults = $this->validateResultClassName();
+        return parent::_validateData() && $classNameValidationResults;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _generateCode()
+    {
+        $this->_classGenerator->setImplementedInterfaces([$this->getSourceClassName()]);
+        return parent::_generateCode();
+    }
+
+    /**
+     * Ensure that result class name corresponds to the source class name.
+     *
+     * @return bool
+     */
+    protected function validateResultClassName()
+    {
+        $result = true;
+        $sourceClassName = $this->getSourceClassName();
+        $resultClassName = $this->_getResultClassName();
+        $interfaceSuffix = 'Interface';
+        if (substr($sourceClassName, -strlen($interfaceSuffix)) !== $interfaceSuffix) {
+            $this->_addError(
+                sprintf(
+                    'Remote service class "%s" should be set as preference for an interface, "%s" given',
+                    $resultClassName,
+                    $sourceClassName
+                )
+            );
+        }
+        $expectedResultClassName = $sourceClassName . self::REMOTE_SERVICE_SUFFIX;
+        if ($resultClassName !== $expectedResultClassName) {
+            $this->_addError(
+                'Invalid remote service class name [' . $resultClassName . ']. Use ' . $expectedResultClassName
+            );
+            $result = false;
+        }
+        return $result;
+    }
+
+    /**
+     * Get reflection generator.
+     *
+     * @return ReflectionGenerator
+     *
+     * @deprecated 100.2.0
+     */
+    private function getReflectionGenerator()
+    {
+        if ($this->reflectionGenerator === null) {
+            $this->reflectionGenerator = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(ReflectionGenerator::class);
+        }
+        return $this->reflectionGenerator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config.php b/lib/internal/Magento/Framework/MessageQueue/Config.php
new file mode 100644
index 00000000000..e29b5d06bee
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Queue configuration.
+ *
+ * @deprecated 100.2.0
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Data
+     */
+    protected $queueConfigData;
+
+    /**
+     * @param Config\Data $queueConfigData
+     */
+    public function __construct(Config\Data $queueConfigData)
+    {
+        $this->queueConfigData = $queueConfigData;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getExchangeByTopic($topicName)
+    {
+        $publisherConfig = $this->getPublisherConfigByTopic($topicName);
+        return isset($publisherConfig[ConfigInterface::PUBLISHER_EXCHANGE])
+            ? $publisherConfig[ConfigInterface::PUBLISHER_EXCHANGE]
+            : null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueuesByTopic($topic)
+    {
+        $publisherConfig = $this->getPublisherConfigByTopic($topic);
+        $exchange = isset($publisherConfig[ConfigInterface::PUBLISHER_NAME])
+            ? $publisherConfig[ConfigInterface::PUBLISHER_NAME]
+            : null;
+        /**
+         * Exchange should be taken into account here to avoid retrieving queues, related to another exchange,
+         * which is not currently associated with topic, but is configured in binds
+         */
+        $bindKey = $exchange . '--' . $topic;
+        $output = $this->queueConfigData->get(ConfigInterface::EXCHANGE_TOPIC_TO_QUEUES_MAP . '/' . $bindKey);
+        if (!$output) {
+            throw new LocalizedException(
+                new Phrase(
+                    'No bindings configured for the "%topic" topic at "%exchange" exchange.',
+                    ['topic' => $topic, 'exchange' => $exchange]
+                )
+            );
+        }
+        return $output;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnectionByTopic($topic)
+    {
+        try {
+            $publisherConfig = $this->getPublisherConfigByTopic($topic);
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            return null;
+        }
+        return isset($publisherConfig[ConfigInterface::PUBLISHER_CONNECTION])
+            ? $publisherConfig[ConfigInterface::PUBLISHER_CONNECTION]
+            : null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnectionByConsumer($consumer)
+    {
+        $connection = $this->queueConfigData->get(
+            ConfigInterface::CONSUMERS . '/'. $consumer . '/'. ConfigInterface::CONSUMER_CONNECTION
+        );
+        if (!$connection) {
+            throw new LocalizedException(
+                new Phrase('Consumer "%consumer" has not connection.', ['consumer' => $consumer])
+            );
+        }
+        return $connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMessageSchemaType($topic)
+    {
+        return $this->queueConfigData->get(
+            ConfigInterface::TOPICS . '/' .
+            $topic . '/' . ConfigInterface::TOPIC_SCHEMA . '/' . ConfigInterface::TOPIC_SCHEMA_TYPE
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumerNames()
+    {
+        $queueConfig = $this->queueConfigData->get(ConfigInterface::CONSUMERS, []);
+        return array_keys($queueConfig);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumer($name)
+    {
+
+        return $this->queueConfigData->get(ConfigInterface::CONSUMERS . '/' . $name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBinds()
+    {
+        return $this->queueConfigData->get(ConfigInterface::BINDS, []);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPublishers()
+    {
+        return $this->queueConfigData->get(ConfigInterface::PUBLISHERS, []);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumers()
+    {
+        return $this->queueConfigData->get(ConfigInterface::CONSUMERS, []);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTopic($name)
+    {
+        return $this->queueConfigData->get(ConfigInterface::TOPICS . '/' . $name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPublisher($name)
+    {
+        return $this->queueConfigData->get(ConfigInterface::PUBLISHERS . '/' . $name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getResponseQueueName($topicName)
+    {
+        return ConfigInterface::RESPONSE_QUEUE_PREFIX . str_replace('-', '_', $topicName);
+    }
+
+    /**
+     * Get publisher config by topic
+     *
+     * @param string $topicName
+     * @return array|mixed|null
+     * @throws LocalizedException
+     */
+    protected function getPublisherConfigByTopic($topicName)
+    {
+        $publisherName = $this->queueConfigData->get(
+            ConfigInterface::TOPICS . '/' . $topicName . '/' . ConfigInterface::TOPIC_PUBLISHER
+        );
+
+        if (!$publisherName) {
+            throw new LocalizedException(
+                new Phrase('Message queue topic "%topic" is not configured.', ['topic' => $topicName])
+            );
+        }
+
+        $publisherConfig = $this->queueConfigData->get(ConfigInterface::PUBLISHERS . '/' . $publisherName);
+        if (!$publisherConfig) {
+            throw new LocalizedException(
+                new Phrase(
+                    'Message queue publisher "%publisher" is not configured.',
+                    ['publisher' => $publisherName]
+                )
+            );
+        }
+        return $publisherConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php b/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php
new file mode 100644
index 00000000000..37009617286
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/CompositeReader.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config;
+
+use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * Composite reader for communication config.
+ */
+class CompositeReader implements ReaderInterface
+{
+    /**
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param array $readers
+     */
+    public function __construct(array $readers)
+    {
+        $this->readers = [];
+        $readers = $this->sortReaders($readers);
+        foreach ($readers as $name => $readerInfo) {
+            if (!isset($readerInfo['reader']) || !($readerInfo['reader'] instanceof ReaderInterface)) {
+                throw new \InvalidArgumentException(
+                    new Phrase(
+                        'Reader [%name] must implement Magento\Framework\Config\ReaderInterface',
+                        ['name' => $name]
+                    )
+                );
+            }
+            $this->readers[] = $readerInfo['reader'];
+        }
+    }
+
+    /**
+     * Read config.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        foreach ($this->readers as $reader) {
+            $result = array_replace_recursive($result, $reader->read($scope));
+        }
+        return $result;
+    }
+
+    /**
+     * Sort readers according to param 'sortOrder'
+     *
+     * @param array $readers
+     * @return array
+     */
+    private function sortReaders(array $readers)
+    {
+        usort(
+            $readers,
+            function ($firstItem, $secondItem) {
+                $firstValue = 0;
+                $secondValue = 0;
+                if (isset($firstItem['sortOrder'])) {
+                    $firstValue = intval($firstItem['sortOrder']);
+                }
+
+                if (isset($secondItem['sortOrder'])) {
+                    $secondValue = intval($secondItem['sortOrder']);
+                }
+
+                if ($firstValue == $secondValue) {
+                    return 0;
+                }
+                return $firstValue < $secondValue ? -1 : 1;
+            }
+        );
+        return $readers;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
new file mode 100644
index 00000000000..c791baf4deb
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Consumer;
+
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Consumer\Config\CompositeReader as ConsumerConfigCompositeReader;
+
+/**
+ * Plugin which provides access to consumers declared in queue config using consumer config interface.
+ *
+ * @deprecated 100.2.0
+ */
+class ConfigReaderPlugin
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param ConfigInterface $config
+     */
+    public function __construct(ConfigInterface $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Read values from queue config and make them available via consumer config.
+     *
+     * @param ConsumerConfigCompositeReader $subject
+     * @param array $result
+     * @param string|null $scope
+     * @return array
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterRead(ConsumerConfigCompositeReader $subject, $result, $scope = null)
+    {
+        return array_merge($this->getConsumerConfigDataFromQueueConfig(), $result);
+    }
+
+    /**
+     * Get data from queue config in format compatible with consumer config data internal structure.
+     *
+     * @return array
+     */
+    private function getConsumerConfigDataFromQueueConfig()
+    {
+        $result = [];
+
+        foreach ($this->config->getConsumers() as $consumerData) {
+            $consumerName = $consumerData['name'];
+            $handlers = [];
+
+            foreach ($consumerData['handlers'] as $topicHandlers) {
+                foreach ($topicHandlers as $handlerConfig) {
+                    $handlers[] = $handlerConfig;
+                }
+            }
+
+            $result[$consumerName] = [
+                'name' => $consumerName,
+                'queue' => $consumerData['queue'],
+                'consumerInstance' => $consumerData['instance_type'],
+                'handlers' => $handlers,
+                'connection' => $consumerData['connection'],
+                'maxMessages' => $consumerData['max_messages']
+            ];
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Data.php b/lib/internal/Magento/Framework/MessageQueue/Config/Data.php
new file mode 100644
index 00000000000..03e01eda5ec
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Data.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Class for access to MessageQueue configuration data.
+ */
+class Data extends \Magento\Framework\Config\Data
+{
+    /**
+     * Data constructor
+     *
+     * @param CompositeReader $reader
+     * @param \Magento\Framework\Config\CacheInterface $cache
+     * @param Reader\Env $envReader
+     * @param Reader\Env\Validator $envValidator
+     * @param string|null $cacheId
+     * @param SerializerInterface|null $serializer
+     */
+    public function __construct(
+        \Magento\Framework\MessageQueue\Config\CompositeReader $reader,
+        \Magento\Framework\Config\CacheInterface $cache,
+        \Magento\Framework\MessageQueue\Config\Reader\Env $envReader,
+        \Magento\Framework\MessageQueue\Config\Reader\Env\Validator $envValidator,
+        $cacheId = 'message_queue_config_cache',
+        SerializerInterface $serializer = null
+    ) {
+        parent::__construct($reader, $cache, $cacheId, $serializer);
+        $envValidator->validate($envReader->read(), $this->get());
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Publisher/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Publisher/ConfigReaderPlugin.php
new file mode 100644
index 00000000000..78b82a67069
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Publisher/ConfigReaderPlugin.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Publisher;
+
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\Config\CompositeReader as PublisherConfigCompositeReader;
+
+/**
+ * Plugin which provides access to publishers declared in queue config using publisher config interface.
+ *
+ * @deprecated 100.2.0
+ */
+class ConfigReaderPlugin
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param ConfigInterface $config
+     */
+    public function __construct(ConfigInterface $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Read values from queue config and make them available via publisher config
+     *
+     * @param PublisherConfigCompositeReader $subject
+     * @param array $result
+     * @param string|null $scope
+     * @return array
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterRead(PublisherConfigCompositeReader $subject, $result, $scope = null)
+    {
+        return array_merge($this->getPublisherConfigDataFromQueueConfig(), $result);
+    }
+
+    /**
+     * Get data from queue config in format compatible with publisher config data internal structure
+     *
+     * @return array
+     */
+    private function getPublisherConfigDataFromQueueConfig()
+    {
+        $result = [];
+
+        foreach ($this->config->getBinds() as $bindingConfig) {
+            $topic = $bindingConfig['topic'];
+            $result[$topic] = [
+                'topic' => $topic,
+                'connection' => [
+                    'name' => $this->config->getConnectionByTopic($topic),
+                    'exchange' => $bindingConfig['exchange'],
+                    'disabled' => false
+                ],
+                'disabled' => false
+            ];
+        }
+
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env.php
new file mode 100644
index 00000000000..52e97e80e9d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Reader;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\MessageQueue\Config\Reader\Env\Converter\Publisher as PublisherConverter;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Communication configuration reader. Reads data from env.php.
+ */
+class Env implements \Magento\Framework\Config\ReaderInterface
+{
+    const ENV_QUEUE  = 'queue';
+    const ENV_PUBLISHERS  = 'publishers';
+    const ENV_TOPICS = 'topics';
+    const ENV_CONSUMERS = 'consumers';
+    const ENV_CONSUMER_CONNECTION = 'connection';
+    const ENV_CONSUMER_MAX_MESSAGES = 'max_messages';
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var PublisherConverter
+     */
+    private $publisherConverter;
+
+    /**
+     * @param DeploymentConfig $deploymentConfig
+     * @param PublisherConverter|null $publisherConverter
+     */
+    public function __construct(
+        DeploymentConfig $deploymentConfig,
+        PublisherConverter $publisherConverter = null
+    ) {
+        $this->deploymentConfig = $deploymentConfig;
+        $this->publisherConverter = $publisherConverter ?: ObjectManager::getInstance()->get(PublisherConverter::class);
+    }
+
+    /**
+     * Read communication configuration from env.php
+     *
+     * @param string|null $scope
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function read($scope = null)
+    {
+        $configData = $this->deploymentConfig->getConfigData(self::ENV_QUEUE) ?: [];
+        if (isset($configData['config'])) {
+            $configData = $this->publisherConverter->convert($configData = $configData['config']);
+        }
+        return $configData;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Converter/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Converter/Publisher.php
new file mode 100644
index 00000000000..3ea96bd577e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Converter/Publisher.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Config\Reader\Env\Converter;
+
+/**
+ * Converts publisher related data from env.php to MessageQueue config array
+ */
+class Publisher implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * Mapping between connection name and default exchange value
+     * @var array
+     */
+    private $connectionToExchangeMap;
+
+    /**
+     * @param array $connectionToExchangeMap
+     */
+    public function __construct(
+        $connectionToExchangeMap = []
+    ) {
+        $this->connectionToExchangeMap = $connectionToExchangeMap;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function convert($source)
+    {
+        $publishersConfig = isset($source[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_PUBLISHERS])
+            ? $source[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_PUBLISHERS]
+            : [];
+        $connections = [];
+        if (!empty($publishersConfig)) {
+            foreach ($publishersConfig as $configuration) {
+                if (isset($configuration['connections'])) {
+                    $publisherData = [];
+                    foreach ($configuration['connections'] as $connectionName => $config) {
+                        if (isset($this->connectionToExchangeMap[$connectionName])) {
+                            $publisherName = $connectionName . '-' . $this->connectionToExchangeMap[$connectionName];
+                            $config['connection'] = $config['name'];
+                            $config['name'] = $publisherName;
+                            $publisherData[$publisherName] = $config;
+                            $connections = array_replace_recursive($connections, $publisherData);
+                        }
+                    }
+                }
+            }
+            $source[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_PUBLISHERS] = $connections;
+        }
+        return $source;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Validator.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Validator.php
new file mode 100644
index 00000000000..43f788343fa
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Validator.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Reader\Env;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\MessageQueue\Config\Validator as ConfigValidator;
+use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Reflection\TypeProcessor;
+
+/**
+ * Communication configuration validator. Validates data, that have been read from env.php.
+ */
+class Validator extends ConfigValidator
+{
+    /**
+     * @var MethodsMap
+     */
+    private $methodsMap;
+
+    /**
+     * Initialize dependencies
+     *
+     * @param TypeProcessor $typeProcessor
+     * @param MethodsMap $methodsMap
+     */
+    public function __construct(
+        TypeProcessor $typeProcessor,
+        MethodsMap $methodsMap
+    ) {
+        $this->methodsMap = $methodsMap;
+        parent::__construct($typeProcessor, $methodsMap);
+    }
+
+    /**
+     * Validate config data
+     *
+     * @param array $configData
+     * @param array|null $xmlConfigData
+     * @return void
+     */
+    public function validate($configData, array $xmlConfigData = [])
+    {
+        if (isset($configData[QueueConfig::TOPICS])) {
+            foreach ($configData[QueueConfig::TOPICS] as $topicName => $configDataItem) {
+                $schemaType = $configDataItem[QueueConfig::TOPIC_SCHEMA][QueueConfig::TOPIC_SCHEMA_VALUE];
+                $responseSchemaType =
+                    $configDataItem[QueueConfig::TOPIC_RESPONSE_SCHEMA][QueueConfig::TOPIC_SCHEMA_VALUE];
+                $publisherName = $configDataItem[QueueConfig::TOPIC_PUBLISHER];
+                $this->validateSchemaType($schemaType, $topicName);
+                $this->validateResponseSchemaType($responseSchemaType, $topicName);
+                $this->validateTopicPublisher(
+                    $this->getAvailablePublishers($configData, $xmlConfigData),
+                    $publisherName,
+                    $topicName
+                );
+            }
+        }
+        if (isset($configData[QueueConfig::CONSUMERS])) {
+            foreach ($configData[QueueConfig::CONSUMERS] as $consumerName => $configDataItem) {
+                $handlers = isset($configDataItem[QueueConfig::CONSUMER_HANDLERS])
+                    ? $configDataItem[QueueConfig::CONSUMER_HANDLERS] : [];
+                foreach ($handlers as $handler) {
+                    $this->validateHandlerType(
+                        $handler[QueueConfig::CONSUMER_CLASS],
+                        $handler[QueueConfig::CONSUMER_METHOD],
+                        $consumerName
+                    );
+                }
+            }
+        }
+        if (isset($configData[QueueConfig::BINDS])) {
+            foreach ($configData[QueueConfig::BINDS] as $configDataItem) {
+                $this->validateBindTopic(
+                    $this->getAvailableTopics($configData, $xmlConfigData),
+                    $configDataItem[QueueConfig::BIND_TOPIC]
+                );
+            }
+        }
+    }
+
+    /**
+     * Return all available publishers from xml and env configs
+     *
+     * @param array $configData
+     * @param array $xmlConfigData
+     * @return array
+     */
+    private function getAvailablePublishers($configData, $xmlConfigData)
+    {
+        $envConfigPublishers = isset($configData[QueueConfig::PUBLISHERS]) ? $configData[QueueConfig::PUBLISHERS] : [];
+        $xmlConfigPublishers = isset($xmlConfigData[QueueConfig::PUBLISHERS])
+            ? $xmlConfigData[QueueConfig::PUBLISHERS] : [];
+        return array_unique(
+            array_merge(
+                array_keys($xmlConfigPublishers),
+                array_keys($envConfigPublishers)
+            )
+        );
+    }
+
+    /**
+     * Return all available topics from xml and env configs
+     *
+     * @param array $configData
+     * @param array $xmlConfigData
+     * @return array
+     */
+    private function getAvailableTopics($configData, $xmlConfigData)
+    {
+        $envConfigTopics = isset($configData[QueueConfig::TOPICS]) ? $configData[QueueConfig::TOPICS] : [];
+        $xmlConfigTopics = isset($xmlConfigData[QueueConfig::TOPICS]) ? $xmlConfigData[QueueConfig::TOPICS] : [];
+        return array_unique(
+            array_merge(
+                array_keys($xmlConfigTopics),
+                array_keys($envConfigTopics)
+            )
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml.php
new file mode 100644
index 00000000000..16efacf628d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Config\Reader;
+
+/**
+ * MessageQueue configuration filesystem loader. Loads all publisher configuration from XML file
+ *
+ * @deprecated 100.2.0
+ */
+class Xml extends \Magento\Framework\Config\Reader\Filesystem
+{
+    /**
+     * List of id attributes for merge
+     *
+     * @var array
+     */
+    protected $_idAttributes = [
+        '/config/publisher' => 'name',
+        '/config/consumer' => 'name',
+        '/config/topic' => 'name',
+        '/config/bind' => ['queue', 'exchange', 'topic'],
+        '/config/broker' => 'topic',
+        '/config/broker/consumer' => 'name'
+    ];
+
+    /**
+     * @param \Magento\Framework\Config\FileResolverInterface $fileResolver
+     * @param \Magento\Framework\MessageQueue\Config\Reader\Xml\CompositeConverter $converter
+     * @param \Magento\Framework\MessageQueue\Config\Reader\Xml\SchemaLocator $schemaLocator
+     * @param \Magento\Framework\Config\ValidationStateInterface $validationState
+     * @param string $fileName
+     * @param array $idAttributes
+     * @param string $domDocumentClass
+     * @param string $defaultScope
+     */
+    public function __construct(
+        \Magento\Framework\Config\FileResolverInterface $fileResolver,
+        \Magento\Framework\MessageQueue\Config\Reader\Xml\CompositeConverter $converter,
+        \Magento\Framework\MessageQueue\Config\Reader\Xml\SchemaLocator $schemaLocator,
+        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        $fileName = 'queue.xml',
+        $idAttributes = [],
+        $domDocumentClass = \Magento\Framework\Config\Dom::class,
+        $defaultScope = 'global'
+    ) {
+        parent::__construct(
+            $fileResolver,
+            $converter,
+            $schemaLocator,
+            $validationState,
+            $fileName,
+            $idAttributes,
+            $domDocumentClass,
+            $defaultScope
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php
new file mode 100644
index 00000000000..be375c1ac81
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Reader\Xml;
+
+use Magento\Framework\Config\ConverterInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * Converts MessageQueue config from \DOMDocument to array
+ *
+ * @deprecated 100.2.0
+ */
+class CompositeConverter implements ConverterInterface
+{
+    /**
+     * @var ConverterInterface[]
+     */
+    private $converters;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param array $converters
+     */
+    public function __construct(array $converters)
+    {
+        $this->converters = [];
+        $converters = $this->sortConverters($converters);
+        foreach ($converters as $name => $converterInfo) {
+            if (!isset($converterInfo['converter']) || !($converterInfo['converter'] instanceof ConverterInterface)) {
+                throw new \InvalidArgumentException(
+                    new Phrase(
+                        'Converter [%name] must implement Magento\Framework\Config\ConverterInterface',
+                        ['name' => $name]
+                    )
+                );
+            }
+            $this->converters[] = $converterInfo['converter'];
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convert($source)
+    {
+        $result = [];
+        foreach ($this->converters as $converter) {
+            $result = array_replace_recursive($result, $converter->convert($source));
+        }
+        return $result;
+    }
+
+    /**
+     * Sort converters according to param 'sortOrder'
+     *
+     * @param array $converters
+     * @return array
+     */
+    private function sortConverters(array $converters)
+    {
+        usort(
+            $converters,
+            function ($firstItem, $secondItem) {
+                $firstValue = 0;
+                $secondValue = 0;
+                if (isset($firstItem['sortOrder'])) {
+                    $firstValue = intval($firstItem['sortOrder']);
+                }
+
+                if (isset($secondItem['sortOrder'])) {
+                    $secondValue = intval($secondItem['sortOrder']);
+                }
+
+                if ($firstValue == $secondValue) {
+                    return 0;
+                }
+                return $firstValue < $secondValue ? -1 : 1;
+            }
+        );
+        return $converters;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php
new file mode 100644
index 00000000000..e33d6ab5b1f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php
@@ -0,0 +1,313 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Reader\Xml\Converter;
+
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Config\Validator;
+use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\MessageQueue\ConsumerInterface;
+
+/**
+ * Converts MessageQueue config from \DOMDocument to array
+ *
+ * @deprecated 100.2.0
+ */
+class TopicConfig implements \Magento\Framework\Config\ConverterInterface
+{
+    const DEFAULT_TYPE = 'amqp';
+    const DEFAULT_EXCHANGE = 'magento';
+    const DEFAULT_INSTANCE = ConsumerInterface::class;
+
+    /**
+     * @var Validator
+     */
+    private $xmlValidator;
+
+    /**
+     * @var MethodsMap
+     */
+    private $methodsMap;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param MethodsMap $methodsMap
+     * @param Validator $xmlValidator
+     * @param CommunicationConfig $communicationConfig
+     */
+    public function __construct(
+        MethodsMap $methodsMap,
+        Validator $xmlValidator,
+        CommunicationConfig $communicationConfig
+    ) {
+        $this->methodsMap = $methodsMap;
+        $this->xmlValidator = $xmlValidator;
+        $this->communicationConfig = $communicationConfig;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function convert($source)
+    {
+        $topics = $this->extractTopics($source);
+        $topics = $this->processWildcard($topics);
+        $publishers = $this->buildPublishers($topics);
+        $binds = $this->buildBinds($topics);
+        $map = $this->buildExchangeTopicToQueue($topics);
+        $consumers = $this->buildConsumers($topics);
+        return [
+            ConfigInterface::TOPICS => $this->buildTopicsConfiguration($topics),
+            ConfigInterface::PUBLISHERS => $publishers,
+            ConfigInterface::BINDS => $binds,
+            ConfigInterface::CONSUMERS => $consumers,
+            ConfigInterface::EXCHANGE_TOPIC_TO_QUEUES_MAP => $map,
+        ];
+    }
+
+    /**
+     * Generate list of topics.
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function buildTopicsConfiguration($topics)
+    {
+        $output = [];
+        foreach ($topics as $topicName => $topicConfig) {
+            $topicDefinition = $this->communicationConfig->getTopic($topicName);
+            $schemaType =
+                $topicDefinition['request_type'] == CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS
+                    ? QueueConfig::TOPIC_SCHEMA_TYPE_OBJECT
+                    : QueueConfig::TOPIC_SCHEMA_TYPE_METHOD;
+            $schemaValue = $topicDefinition[CommunicationConfig::TOPIC_REQUEST];
+            $output[$topicName] = [
+                'name' => $topicName,
+                'schema' => [
+                    'schema_type' => $schemaType,
+                    'schema_value' => $schemaValue
+                ],
+                'response_schema' => [
+                    'schema_type' => isset($topicDefinition['response']) ? QueueConfig::TOPIC_SCHEMA_TYPE_OBJECT : null,
+                    'schema_value' => $topicDefinition['response']
+                ],
+                'is_synchronous' => $topicDefinition[CommunicationConfig::TOPIC_IS_SYNCHRONOUS],
+                'publisher' => $topicConfig['type'] . '-' . $topicConfig['exchange']
+            ];
+        }
+        return $output;
+    }
+
+    /**
+     * Generate consumers.
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function buildConsumers($topics)
+    {
+        $output = [];
+        foreach ($topics as $topicName => $topicConfig) {
+            $topic = $this->communicationConfig->getTopic($topicName);
+            foreach ($topicConfig['queues'] as $queueName => $queueConfig) {
+                $handlers = [];
+                foreach ($queueConfig['handlers'] as $handler) {
+                    if (!isset($handler[QueueConfig::CONSUMER_CLASS])) {
+                        $handlerExploded = explode('::', $handler);
+                        unset($handler);
+                        $handler[QueueConfig::CONSUMER_CLASS] = $handlerExploded[0];
+                        $handler[QueueConfig::CONSUMER_METHOD] = $handlerExploded[1];
+                    }
+                    $handlers[] = $handler;
+                }
+                $queueConfig['handlers'] = $handlers;
+
+                $output[$queueConfig['consumer']] = [
+                    'name' => $queueConfig['consumer'],
+                    'queue' => $queueName,
+                    'handlers' => [$topicName => $queueConfig['handlers']],
+                    'instance_type' => $queueConfig['consumerInstance'] != null
+                        ? $queueConfig['consumerInstance'] : self::DEFAULT_INSTANCE,
+                    'consumer_type' => $topic[CommunicationConfig::TOPIC_IS_SYNCHRONOUS] ? 'sync' : 'async',
+                    'max_messages' => $queueConfig['maxMessages'],
+                    'connection' => $topicConfig['type']
+                ];
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * Generate topics list based on wildcards.
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function processWildcard($topics)
+    {
+        $topicDefinitions = $this->communicationConfig->getTopics();
+        $wildcardKeys = [];
+        $topicNames = array_keys($topics);
+        foreach ($topicNames as $topicName) {
+            if (strpos($topicName, '*') !== false || strpos($topicName, '#') !== false) {
+                $wildcardKeys[] = $topicName;
+            }
+        }
+        foreach (array_unique($wildcardKeys) as $wildcardKey) {
+            $pattern = $this->xmlValidator->buildWildcardPattern($wildcardKey);
+            foreach (array_keys($topicDefinitions) as $topicName) {
+                if (preg_match($pattern, $topicName)) {
+                    if (isset($topics[$topicName])) {
+                        $topics[$topicName] = array_merge($topics[$topicName], $topics[$wildcardKey]);
+                    } else {
+                        $topics[$topicName] = $topics[$wildcardKey];
+                    }
+                }
+            }
+            unset($topics[$wildcardKey]);
+        }
+        return $topics;
+    }
+
+    /**
+     * Generate publishers
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function buildPublishers($topics)
+    {
+        $output = [];
+        foreach ($topics as $topicConfig) {
+            $publisherName = $topicConfig['type'] . '-' . $topicConfig['exchange'];
+            $output[$publisherName] = [
+                'name' => $publisherName,
+                'connection' => $topicConfig['type'],
+                'exchange' => $topicConfig['exchange']
+            ];
+        }
+        return $output;
+    }
+
+    /**
+     * Generate binds
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function buildBinds($topics)
+    {
+        $output = [];
+        foreach ($topics as $topicName => $topicConfig) {
+            $queueNames = array_keys($topicConfig['queues']);
+            foreach ($queueNames as $queueName) {
+                $name = $topicName . '--' . $topicConfig['exchange']. '--' .$queueName;
+                $output[$name] = [
+                    'queue' => $queueName,
+                    'exchange' => $topicConfig['exchange'],
+                    'topic' => $topicName,
+                ];
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * Generate topic-to-queues map.
+     *
+     * @param array $topics
+     * @return array
+     */
+    private function buildExchangeTopicToQueue($topics)
+    {
+        $output = [];
+        foreach ($topics as $topicName => $topicConfig) {
+            $key = $topicConfig['type'] . '-' . $topicConfig['exchange'] . '--' . $topicName;
+            $queueNames = array_keys($topicConfig['queues']);
+            foreach ($queueNames as $queueName) {
+                $output[$key][] = $queueName;
+                $output[$key] = array_unique($output[$key]);
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * Extract topics configuration.
+     *
+     * @param \DOMDocument $config
+     * @return array
+     */
+    private function extractTopics($config)
+    {
+        $output = [];
+        /** @var $brokerNode \DOMElement */
+        foreach ($config->getElementsByTagName('broker') as $brokerNode) {
+            $topicName = $this->getAttributeValue($brokerNode, 'topic');
+            $output[$topicName] = [
+                ConfigInterface::TOPIC_NAME => $topicName,
+                'type' => $this->getAttributeValue($brokerNode, 'type', self::DEFAULT_TYPE),
+                'exchange' => $this->getAttributeValue($brokerNode, 'exchange', self::DEFAULT_EXCHANGE),
+                'consumerInstance' => $this->getAttributeValue($brokerNode, 'consumerInstance'),
+                'maxMessages' => $this->getAttributeValue($brokerNode, 'maxMessages'),
+                'queues' => $this->extractQueuesFromBroker($brokerNode, $topicName)
+            ];
+        }
+        return $output;
+    }
+
+    /**
+     * Extract queues configuration from the topic node.
+     *
+     * @param \DOMElement $brokerNode
+     * @param string $topicName
+     * @return array
+     */
+    protected function extractQueuesFromBroker(\DOMElement $brokerNode, $topicName)
+    {
+        $queues = [];
+        $topicConfig = $this->communicationConfig->getTopic($topicName);
+        /** @var $queueNode \DOMElement */
+        foreach ($brokerNode->getElementsByTagName('queue') as $queueNode) {
+            $handler = $this->getAttributeValue($queueNode, 'handler');
+            $queueName = $this->getAttributeValue($queueNode, 'name');
+            $queue = [
+               'name'=> $queueName,
+               'handlerName' => $this->getAttributeValue($queueNode, 'handlerName'),
+               'handlers' => $handler ? ['default' => $handler] : $topicConfig['handlers'],
+               'exchange' => $this->getAttributeValue($queueNode, 'exchange'),
+               'consumer' => $this->getAttributeValue($queueNode, 'consumer'),
+               'consumerInstance' => $this->getAttributeValue($queueNode, 'consumerInstance'),
+               'maxMessages' => $this->getAttributeValue($queueNode, 'maxMessages', null),
+               'type' => $this->getAttributeValue($queueNode, 'type')
+
+            ];
+            $queues[$queueName] = $queue;
+        }
+        return $queues;
+    }
+
+    /**
+     * Get attribute value of the given node
+     *
+     * @param \DOMNode $node
+     * @param string $attributeName
+     * @param mixed $default
+     * @return string|null
+     */
+    protected function getAttributeValue(\DOMNode $node, $attributeName, $default = null)
+    {
+        $item = $node->attributes->getNamedItem($attributeName);
+        return $item ? $item->nodeValue : $default;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/SchemaLocator.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/SchemaLocator.php
new file mode 100644
index 00000000000..613d564942e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/SchemaLocator.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Config\Reader\Xml;
+
+/**
+ * Schema locator for Publishers
+ *
+ * @deprecated 100.2.0
+ */
+class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    protected $schema;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     *
+     * @var string
+     */
+    protected $perFileSchema;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
+     */
+    public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
+    {
+        $this->schema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue_merged.xsd');
+        $this->perFileSchema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue.xsd');
+    }
+
+    /**
+     * Get path to merged config schema
+     *
+     * @return string|null
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * Get path to per file validation schema
+     *
+     * @return string|null
+     */
+    public function getPerFileSchema()
+    {
+        return $this->perFileSchema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php
new file mode 100644
index 00000000000..b5f8d179961
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config\Topology;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+
+/**
+ * Plugin which provides access to topology declared in queue config using topology config interface.
+ *
+ * @deprecated 100.2.0
+ */
+class ConfigReaderPlugin
+{
+    /**
+     * @var QueueConfig
+     */
+    private $queueConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueConfig $queueConfig
+     */
+    public function __construct(QueueConfig $queueConfig)
+    {
+        $this->queueConfig = $queueConfig;
+    }
+
+    /**
+     * Read values from queue config and make them available via topology config.
+     *
+     * @param \Magento\Framework\MessageQueue\Topology\Config\CompositeReader $subject
+     * @param array $result
+     * @param string|null $scope
+     * @return array
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterRead(
+        \Magento\Framework\MessageQueue\Topology\Config\CompositeReader $subject,
+        array $result,
+        $scope = null
+    ) {
+        $topologyConfigDataFromQueueConfig = $this->getTopologyConfigDataFromQueueConfig();
+        foreach ($topologyConfigDataFromQueueConfig as $exchangeKey => $exchangeConfig) {
+            if (isset($result[$exchangeKey])) {
+                $result[$exchangeKey]['bindings'] = array_merge(
+                    $exchangeConfig['bindings'],
+                    $result[$exchangeKey]['bindings']
+                );
+            } else {
+                $result[$exchangeKey] = $exchangeConfig;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Get data from queue config in format compatible with topology config data internal structure.
+     *
+     * @return array
+     */
+    private function getTopologyConfigDataFromQueueConfig()
+    {
+        $result = [];
+        foreach ($this->queueConfig->getBinds() as $queueConfigBinding) {
+            $topic = $queueConfigBinding['topic'];
+            $destinationType = 'queue';
+            $destination = $queueConfigBinding['queue'];
+            $bindingId = $destinationType . '--' . $destination . '--' . $topic;
+            $bindingData = [
+                'id' => $bindingId,
+                'destinationType' => $destinationType,
+                'destination' => $destination,
+                'disabled' => false,
+                'topic' => $topic,
+                'arguments' => []
+            ];
+
+            $exchangeName = $queueConfigBinding['exchange'];
+            $connection = $this->queueConfig->getConnectionByTopic($topic);
+            if (isset($result[$exchangeName . '--' . $connection])) {
+                $result[$exchangeName . '--' . $connection]['bindings'][$bindingId] = $bindingData;
+            } else {
+                $result[$exchangeName . '--' . $connection] = [
+                    'name' => $exchangeName,
+                    'type' => 'topic',
+                    'connection' => $connection,
+                    'durable' => true,
+                    'autoDelete' => false,
+                    'internal' => false,
+                    'bindings' => [$bindingId => $bindingData],
+                    'arguments' => [],
+                ];
+            }
+        }
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Validator.php b/lib/internal/Magento/Framework/MessageQueue/Config/Validator.php
new file mode 100644
index 00000000000..47a2a4b8eed
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Validator.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Config;
+
+use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Reflection\TypeProcessor;
+
+/**
+ * Communication configuration validator.
+ */
+class Validator
+{
+    /**
+     * @var MethodsMap
+     */
+    private $methodsMap;
+
+    /**
+     * @var TypeProcessor
+     */
+    private $typeProcessor;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param TypeProcessor $typeProcessor
+     * @param MethodsMap $methodsMap
+     */
+    public function __construct(
+        TypeProcessor $typeProcessor,
+        MethodsMap $methodsMap
+    ) {
+        $this->typeProcessor = $typeProcessor;
+        $this->methodsMap = $methodsMap;
+    }
+
+    /**
+     * Validate schema Method Type
+     *
+     * @param string $schemaType
+     * @param string $schemaMethod
+     * @param string $topicName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateSchemaMethodType($schemaType, $schemaMethod, $topicName)
+    {
+        try {
+            $this->methodsMap->getMethodParams($schemaType, $schemaMethod);
+        } catch (\Exception $e) {
+            throw new \LogicException(
+                sprintf(
+                    'Service method specified for topic "%s" is not available. Given "%s"',
+                    $topicName,
+                    $schemaType . '::' . $schemaMethod
+                )
+            );
+        }
+    }
+
+    /**
+     * Validate handler type
+     *
+     * @param string $serviceName
+     * @param string $methodName
+     * @param string $consumerName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateHandlerType($serviceName, $methodName, $consumerName)
+    {
+        try {
+            $this->methodsMap->getMethodParams($serviceName, $methodName);
+        } catch (\Exception $e) {
+            throw new \LogicException(
+                sprintf(
+                    'Service method specified in handler for consumer "%s"'
+                    . ' is not available. Given "%s"',
+                    $consumerName,
+                    $serviceName . '::' . $methodName
+                )
+            );
+        }
+    }
+
+    /**
+     * Validate topic in a bind
+     *
+     * @param string[] $topics
+     * @param string $topicName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateBindTopic($topics, $topicName)
+    {
+        $isDefined = false;
+        if (strpos($topicName, '#') === false && strpos($topicName, '*') === false) {
+            if (in_array($topicName, $topics)) {
+                $isDefined = true;
+            }
+        } else {
+            $pattern = $this->buildWildcardPattern($topicName);
+            if (count(preg_grep($pattern, $topics))) {
+                $isDefined = true;
+            }
+        }
+        if (!$isDefined) {
+            throw new \LogicException(
+                sprintf('Topic "%s" declared in binds must be defined in topics', $topicName)
+            );
+        }
+    }
+
+    /**
+     * Construct perl regexp pattern for matching topic names from wildcard key.
+     *
+     * @param string $wildcardKey
+     * @return string
+     */
+    public function buildWildcardPattern($wildcardKey)
+    {
+        $pattern = '/^' . str_replace('.', '\.', $wildcardKey);
+        $pattern = str_replace('#', '.+', $pattern);
+        $pattern = str_replace('*', '[^\.]+', $pattern);
+        if (strpos($wildcardKey, '#') === strlen($wildcardKey)) {
+            $pattern .= '/';
+        } else {
+            $pattern .= '$/';
+        }
+
+        return $pattern;
+    }
+
+    /**
+     * Validate publisher in the topic
+     *
+     * @param string[] $publishers
+     * @param string $publisherName
+     * @param string $topicName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateTopicPublisher($publishers, $publisherName, $topicName)
+    {
+        if (!in_array($publisherName, $publishers)) {
+            throw new \LogicException(
+                sprintf(
+                    'Publisher "%s", specified in env.php for topic "%s" is not declared.',
+                    $publisherName,
+                    $topicName
+                )
+            );
+        }
+    }
+
+    /**
+     * Validate response schema type
+     *
+     * @param string $responseSchema
+     * @param string $topicName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateResponseSchemaType($responseSchema, $topicName)
+    {
+        try {
+            $this->validateType($responseSchema);
+        } catch (\Exception $e) {
+            throw new \LogicException(
+                sprintf(
+                    'Response schema definition for topic "%s" should reference existing type or service class. '
+                    . 'Given "%s"',
+                    $topicName,
+                    $responseSchema
+                )
+            );
+        }
+    }
+
+    /**
+     * Validate schema type
+     *
+     * @param string $schema
+     * @param string $topicName
+     * @return void
+     * @throws \LogicException
+     */
+    public function validateSchemaType($schema, $topicName)
+    {
+        try {
+            $this->validateType($schema);
+        } catch (\Exception $e) {
+            throw new \LogicException(
+                sprintf(
+                    'Schema definition for topic "%s" should reference existing type or service class. '
+                    . 'Given "%s"',
+                    $topicName,
+                    $schema
+                )
+            );
+        }
+    }
+
+    /**
+     * Ensure that specified type is either a simple type or a valid service data type.
+     *
+     * @param string $typeName
+     * @return $this
+     * @throws \Exception In case when type is invalid
+     */
+    protected function validateType($typeName)
+    {
+        if ($this->typeProcessor->isTypeSimple($typeName)) {
+            return $this;
+        }
+        if ($this->typeProcessor->isArrayType($typeName)) {
+            $arrayItemType = $this->typeProcessor->getArrayItemType($typeName);
+            $this->methodsMap->getMethodsMap($arrayItemType);
+        } else {
+            $this->methodsMap->getMethodsMap($typeName);
+        }
+        return $this;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConfigInterface.php
new file mode 100644
index 00000000000..a88b5dedbd2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConfigInterface.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * @deprecated 100.2.0
+ */
+interface ConfigInterface
+{
+    const PUBLISHERS = 'publishers';
+    const PUBLISHER_NAME = 'name';
+    const PUBLISHER_CONNECTION = 'connection';
+    const PUBLISHER_EXCHANGE = 'exchange';
+
+    const TOPICS = 'topics';
+    const TOPIC_NAME = 'name';
+    const TOPIC_PUBLISHER = 'publisher';
+    const TOPIC_SCHEMA = 'schema';
+    const TOPIC_RESPONSE_SCHEMA = 'response_schema';
+    const TOPIC_SCHEMA_TYPE = 'schema_type';
+    const TOPIC_SCHEMA_VALUE = 'schema_value';
+
+    const TOPIC_SCHEMA_TYPE_OBJECT = 'object';
+    const TOPIC_SCHEMA_TYPE_METHOD = 'method_arguments';
+
+    const SCHEMA_METHOD_PARAM_NAME = 'param_name';
+    const SCHEMA_METHOD_PARAM_POSITION = 'param_position';
+    const SCHEMA_METHOD_PARAM_TYPE = 'param_type';
+    const SCHEMA_METHOD_PARAM_IS_REQUIRED = 'is_required';
+
+    const CONSUMERS = 'consumers';
+    const CONSUMER_NAME = 'name';
+    const CONSUMER_QUEUE = 'queue';
+    const CONSUMER_CONNECTION = 'connection';
+    const CONSUMER_INSTANCE_TYPE = 'instance_type';
+    const CONSUMER_CLASS = 'type';
+    const CONSUMER_METHOD = 'method';
+    const CONSUMER_MAX_MESSAGES = 'max_messages';
+    const CONSUMER_HANDLERS = 'handlers';
+    const CONSUMER_HANDLER_TYPE = 'type';
+    const CONSUMER_HANDLER_METHOD = 'method';
+    const CONSUMER_TYPE = 'consumer_type';
+    const CONSUMER_TYPE_SYNC = 'sync';
+    const CONSUMER_TYPE_ASYNC = 'async';
+
+    const RESPONSE_QUEUE_PREFIX = 'responseQueue.';
+
+    const BINDS = 'binds';
+    const BIND_QUEUE = 'queue';
+    const BIND_EXCHANGE = 'exchange';
+    const BIND_TOPIC = 'topic';
+
+    const BROKER_TOPIC = 'topic';
+    const BROKER_TYPE = 'type';
+    const BROKER_EXCHANGE = 'exchange';
+    const BROKER_CONSUMERS = 'consumers';
+    const BROKER_CONSUMER_NAME = 'name';
+    const BROKER_CONSUMER_QUEUE = 'queue';
+    const BROKER_CONSUMER_INSTANCE_TYPE = 'instance_type';
+    const BROKER_CONSUMER_MAX_MESSAGES = 'max_messages';
+    const BROKERS = 'brokers';
+
+    /**
+     * Map which allows optimized search of queues corresponding to the specified exchange and topic pair.
+     */
+    const EXCHANGE_TOPIC_TO_QUEUES_MAP = 'exchange_topic_to_queues_map';
+
+    /**
+     * Identify configured exchange for the provided topic.
+     *
+     * @param string $topicName
+     * @return string
+     * @throws LocalizedException
+     * @see \Magento\Framework\MessageQueue\Publisher\ConfigInterface::getPublisher
+     */
+    public function getExchangeByTopic($topicName);
+
+    /**
+     * Identify a list of all queue names corresponding to the specified topic (and implicitly exchange).
+     *
+     * @param string $topic
+     * @return string[]
+     * @throws LocalizedException
+     * @see \Magento\Framework\MessageQueue\Topology\ConfigInterface::getQueues
+     */
+    public function getQueuesByTopic($topic);
+
+    /**
+     * @param string $topic
+     * @return string
+     * @throws LocalizedException
+     * @see \Magento\Framework\MessageQueue\Publisher\ConfigInterface::getPublisher
+     */
+    public function getConnectionByTopic($topic);
+
+    /**
+     * @param string $consumer
+     * @return string
+     * @throws LocalizedException
+     * @see \Magento\Framework\MessageQueue\Consumer\ConfigInterface::getConsumer
+     */
+    public function getConnectionByConsumer($consumer);
+
+    /**
+     * Identify which option is used to define message schema: data interface or service method params
+     *
+     * @param string $topic
+     * @return string
+     * @see \Magento\Framework\Communication\ConfigInterface::getTopic
+     */
+    public function getMessageSchemaType($topic);
+
+    /**
+     * Get all consumer names
+     *
+     * @return string[]
+     * @see \Magento\Framework\MessageQueue\Consumer\ConfigInterface::getConsumers
+     */
+    public function getConsumerNames();
+
+    /**
+     * Get consumer configuration
+     *
+     * @param string $name
+     * @return array|null
+     * @see \Magento\Framework\MessageQueue\Consumer\ConfigInterface::getConsumer
+     */
+    public function getConsumer($name);
+
+    /**
+     * Get queue binds
+     *
+     * @return array
+     * @see \Magento\Framework\MessageQueue\Topology\ConfigInterface::getExchanges
+     */
+    public function getBinds();
+
+    /**
+     * Get publishers
+     *
+     * @return array
+     * @see \Magento\Framework\MessageQueue\Publisher\ConfigInterface::getPublishers
+     */
+    public function getPublishers();
+
+    /**
+     * Get consumers
+     *
+     * @return array
+     * @see \Magento\Framework\MessageQueue\Consumer\ConfigInterface::getConsumers
+     */
+    public function getConsumers();
+
+    /**
+     * Get topic config
+     *
+     * @param string $name
+     * @return array
+     * @see \Magento\Framework\Communication\ConfigInterface::getTopic
+     * @see \Magento\Framework\MessageQueue\Publisher\ConfigInterface::getPublisher
+     */
+    public function getTopic($name);
+
+    /**
+     * Get published config
+     * @param string $name
+     *
+     * @return array
+     * @see \Magento\Framework\MessageQueue\Publisher\ConfigInterface::getPublisher
+     */
+    public function getPublisher($name);
+
+    /**
+     * Get queue name for response
+     *
+     * @param string $topicName
+     * @return string
+     * @see \Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder::getQueueName
+     */
+    public function getResponseQueueName($topicName);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConnectionLostException.php b/lib/internal/Magento/Framework/MessageQueue/ConnectionLostException.php
new file mode 100644
index 00000000000..e22ac3184ae
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConnectionLostException.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Class ConnectionLostException
+ */
+class ConnectionLostException extends \Exception
+{
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolver.php b/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolver.php
new file mode 100644
index 00000000000..7d9756c9298
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolver.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * {@inheritdoc}
+ */
+class ConnectionTypeResolver
+{
+    /**
+     * @var ConnectionTypeResolverInterface[]
+     */
+    private $resolvers;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConnectionTypeResolverInterface[] $resolvers
+     */
+    public function __construct($resolvers)
+    {
+        $this->resolvers = $resolvers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnectionType($connectionName)
+    {
+        $type = null;
+
+        foreach ($this->resolvers as $resolver) {
+            $type = $resolver->getConnectionType($connectionName);
+            if ($type != null) {
+                break;
+            }
+        }
+
+        if ($type === null) {
+            throw new \LogicException('Unknown connection name ' . $connectionName);
+        }
+        return $type;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolverInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolverInterface.php
new file mode 100644
index 00000000000..20c1a8ebffe
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConnectionTypeResolverInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Message Queue connection type resolver.
+ */
+interface ConnectionTypeResolverInterface
+{
+    /**
+     * Get connection type by connection name.
+     *
+     * @param string $connectionName
+     * @return string|null
+     */
+    public function getConnectionType($connectionName);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
new file mode 100644
index 00000000000..9bdacfbc1ff
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
@@ -0,0 +1,331 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\QueueRepository;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class Consumer used to process a single message, unlike batch consumer.
+ *
+ * This could be used for both synchronous and asynchronous processing, depending on topic.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Consumer implements ConsumerInterface
+{
+    /**
+     * @var ConsumerConfigurationInterface
+     */
+    private $configuration;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var CallbackInvoker
+     */
+    private $invoker;
+
+    /**
+     * @var MessageController
+     */
+    private $messageController;
+
+    /**
+     * @var QueueRepository
+     */
+    private $queueRepository;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param CallbackInvoker $invoker
+     * @param MessageEncoder $messageEncoder
+     * @param ResourceConnection $resource
+     * @param ConsumerConfigurationInterface $configuration
+     * @param LoggerInterface $logger
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        CallbackInvoker $invoker,
+        MessageEncoder $messageEncoder,
+        ResourceConnection $resource,
+        ConsumerConfigurationInterface $configuration,
+        LoggerInterface $logger = null
+    ) {
+        $this->invoker = $invoker;
+        $this->messageEncoder = $messageEncoder;
+        $this->resource = $resource;
+        $this->configuration = $configuration;
+        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()->get(LoggerInterface::class);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process($maxNumberOfMessages = null)
+    {
+        $queue = $this->configuration->getQueue();
+
+        if (!isset($maxNumberOfMessages)) {
+            $queue->subscribe($this->getTransactionCallback($queue));
+        } else {
+            $this->invoker->invoke($queue, $maxNumberOfMessages, $this->getTransactionCallback($queue));
+        }
+    }
+
+    /**
+     * Decode message and invoke callback method, return reply back for sync processing.
+     *
+     * @param EnvelopeInterface $message
+     * @param boolean $isSync
+     * @return string|null
+     * @throws LocalizedException
+     */
+    private function dispatchMessage(EnvelopeInterface $message, $isSync = false)
+    {
+        $properties = $message->getProperties();
+        $topicName = $properties['topic_name'];
+        $handlers = $this->configuration->getHandlers($topicName);
+        $decodedMessage = $this->messageEncoder->decode($topicName, $message->getBody());
+
+        if (isset($decodedMessage)) {
+            $messageSchemaType = $this->configuration->getMessageSchemaType($topicName);
+            if ($messageSchemaType == CommunicationConfig::TOPIC_REQUEST_TYPE_METHOD) {
+                foreach ($handlers as $callback) {
+                    $result = call_user_func_array($callback, $decodedMessage);
+                    return $this->processSyncResponse($topicName, $result);
+                }
+            } else {
+                foreach ($handlers as $callback) {
+                    $result = call_user_func($callback, $decodedMessage);
+                    if ($isSync) {
+                        return $this->processSyncResponse($topicName, $result);
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Validate and encode synchronous handler output.
+     *
+     * @param string $topicName
+     * @param mixed $result
+     * @return string
+     * @throws LocalizedException
+     */
+    private function processSyncResponse($topicName, $result)
+    {
+        if (isset($result)) {
+            $this->getMessageValidator()->validate($topicName, $result, false);
+            return $this->messageEncoder->encode($topicName, $result, false);
+        } else {
+            throw new LocalizedException(new Phrase('No reply message resulted in RPC.'));
+        }
+    }
+
+    /**
+     * Send RPC response message.
+     *
+     * @param EnvelopeInterface $envelope
+     * @return void
+     */
+    private function sendResponse(EnvelopeInterface $envelope)
+    {
+        $messageProperties = $envelope->getProperties();
+        $connectionName = $this->getConsumerConfig()
+            ->getConsumer($this->configuration->getConsumerName())->getConnection();
+        $queue = $this->getQueueRepository()->get($connectionName, $messageProperties['reply_to']);
+        $queue->push($envelope);
+    }
+
+    /**
+     * Get transaction callback. This handles the case of both sync and async.
+     *
+     * @param QueueInterface $queue
+     * @return \Closure
+     */
+    private function getTransactionCallback(QueueInterface $queue)
+    {
+        return function (EnvelopeInterface $message) use ($queue) {
+            /** @var LockInterface $lock */
+            $lock = null;
+            try {
+                $topicName = $message->getProperties()['topic_name'];
+                $topicConfig = $this->getCommunicationConfig()->getTopic($topicName);
+                $lock = $this->getMessageController()->lock($message, $this->configuration->getConsumerName());
+
+                if ($topicConfig[CommunicationConfig::TOPIC_IS_SYNCHRONOUS]) {
+                    $responseBody = $this->dispatchMessage($message, true);
+                    $responseMessage = $this->getEnvelopeFactory()->create(
+                        ['body' => $responseBody, 'properties' => $message->getProperties()]
+                    );
+                    $this->sendResponse($responseMessage);
+                } else {
+                    $allowedTopics = $this->configuration->getTopicNames();
+                    if (in_array($topicName, $allowedTopics)) {
+                        $this->dispatchMessage($message);
+                    } else {
+                        $queue->reject($message);
+                        return;
+                    }
+                }
+                $queue->acknowledge($message);
+            } catch (MessageLockException $exception) {
+                $queue->acknowledge($message);
+            } catch (\Magento\Framework\MessageQueue\ConnectionLostException $e) {
+                if ($lock) {
+                    $this->resource->getConnection()
+                        ->delete($this->resource->getTableName('queue_lock'), ['id = ?' => $lock->getId()]);
+                }
+            } catch (\Magento\Framework\Exception\NotFoundException $e) {
+                $queue->acknowledge($message);
+                $this->logger->warning($e->getMessage());
+            } catch (\Exception $e) {
+                $queue->reject($message, false, $e->getMessage());
+                if ($lock) {
+                    $this->resource->getConnection()
+                        ->delete($this->resource->getTableName('queue_lock'), ['id = ?' => $lock->getId()]);
+                }
+            }
+        };
+    }
+
+    /**
+     * Get consumer config.
+     *
+     * @return ConsumerConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConsumerConfig()
+    {
+        if ($this->consumerConfig === null) {
+            $this->consumerConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(ConsumerConfig::class);
+        }
+        return $this->consumerConfig;
+    }
+
+    /**
+     * Get communication config.
+     *
+     * @return CommunicationConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getCommunicationConfig()
+    {
+        if ($this->communicationConfig === null) {
+            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(CommunicationConfig::class);
+        }
+        return $this->communicationConfig;
+    }
+
+    /**
+     * Get queue repository.
+     *
+     * @return QueueRepository
+     *
+     * @deprecated 100.2.0
+     */
+    private function getQueueRepository()
+    {
+        if ($this->queueRepository === null) {
+            $this->queueRepository = \Magento\Framework\App\ObjectManager::getInstance()->get(QueueRepository::class);
+        }
+        return $this->queueRepository;
+    }
+
+    /**
+     * Get message controller.
+     *
+     * @return MessageController
+     *
+     * @deprecated 100.1.0
+     */
+    private function getMessageController()
+    {
+        if ($this->messageController === null) {
+            $this->messageController = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(MessageController::class);
+        }
+        return $this->messageController;
+    }
+
+    /**
+     * Get message validator.
+     *
+     * @return MessageValidator
+     *
+     * @deprecated 100.2.0
+     */
+    private function getMessageValidator()
+    {
+        if ($this->messageValidator === null) {
+            $this->messageValidator = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(MessageValidator::class);
+        }
+        return $this->messageValidator;
+    }
+
+    /**
+     * Get envelope factory.
+     *
+     * @return EnvelopeFactory
+     *
+     * @deprecated 100.2.0
+     */
+    private function getEnvelopeFactory()
+    {
+        if ($this->envelopeFactory === null) {
+            $this->envelopeFactory = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(EnvelopeFactory::class);
+        }
+        return $this->envelopeFactory;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config.php
new file mode 100644
index 00000000000..4b97943bcc9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Iterator;
+use Magento\Framework\Phrase;
+
+/**
+ * {@inheritdoc}
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * Item iterator.
+     *
+     * @var Iterator
+     */
+    private $iterator;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Iterator $iterator
+     */
+    public function __construct(Iterator $iterator)
+    {
+        $this->iterator = $iterator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumer($name)
+    {
+        $consumer = $this->iterator[$name];
+        if (!$consumer) {
+            throw new LocalizedException(new Phrase("Consumer '%consumer' is not declared.", ['consumer' => $name]));
+        }
+        return $consumer;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumers()
+    {
+        return $this->iterator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeReader.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeReader.php
new file mode 100644
index 00000000000..fc2878cafd4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeReader.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ReaderInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+
+/**
+ * Composite reader for consumer config.
+ */
+class CompositeReader implements ReaderInterface
+{
+    /**
+     * @var ValidatorInterface
+     */
+    private $validator;
+
+    /**
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ValidatorInterface $validator
+     * @param ReaderInterface[] $readers
+     */
+    public function __construct(ValidatorInterface $validator, array $readers)
+    {
+        $this->validator = $validator;
+        $this->readers = $readers;
+    }
+
+    /**
+     * Read config.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        foreach ($this->readers as $reader) {
+            $result = array_replace_recursive($result, $reader->read($scope));
+        }
+        $this->validator->validate($result);
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeValidator.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeValidator.php
new file mode 100644
index 00000000000..c673b161107
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/CompositeValidator.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * Composite validator for consumer config.
+ */
+class CompositeValidator implements ValidatorInterface
+{
+    /**
+     * @var ValidatorInterface[]
+     */
+    private $validators;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ValidatorInterface[] $validators
+     */
+    public function __construct(array $validators)
+    {
+        $this->validators = $validators;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($this->validators as $validator) {
+            $validator->validate($configData);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem.php
new file mode 100644
index 00000000000..92242698a5b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\Iterator as HandlerIterator;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\IteratorFactory as HandlerIteratorFactory;
+
+/**
+ * {@inheritdoc}
+ */
+class ConsumerConfigItem implements ConsumerConfigItemInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $connection;
+
+    /**
+     * @var string
+     */
+    private $queue;
+
+    /**
+     * @var string
+     */
+    private $consumerInstance;
+
+    /**
+     * @var HandlerIterator
+     */
+    private $handlers;
+
+    /**
+     * @var string
+     */
+    private $maxMessages;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param HandlerIteratorFactory $handlerIteratorFactory
+     */
+    public function __construct(HandlerIteratorFactory $handlerIteratorFactory)
+    {
+        $this->handlers = $handlerIteratorFactory->create();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueue()
+    {
+        return $this->queue;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumerInstance()
+    {
+        return $this->consumerInstance;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHandlers()
+    {
+        return $this->handlers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMaxMessages()
+    {
+        return $this->maxMessages;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setData(array $data)
+    {
+        $this->name = $data['name'];
+        $this->connection = $data['connection'];
+        $this->queue = $data['queue'];
+        $this->consumerInstance = $data['consumerInstance'];
+        $this->maxMessages = $data['maxMessages'];
+        $this->handlers->setData($data['handlers']);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler.php
new file mode 100644
index 00000000000..1226fb79d38
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+
+/**
+ * {@inheritdoc}
+ */
+class Handler implements HandlerInterface
+{
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var string
+     */
+    private $method;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setData(array $data)
+    {
+        $this->type = $data['type'];
+        $this->method = $data['method'];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/Iterator.php
new file mode 100644
index 00000000000..94a36ef0f0b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/Iterator.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\HandlerFactory;
+
+/**
+ * Consumer handler config iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Consumer config handler item.
+     *
+     * @var Handler
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param HandlerFactory $itemFactory
+     */
+    public function __construct(HandlerFactory $itemFactory)
+    {
+        $this->object = $itemFactory->create();
+    }
+
+    /**
+     * Set data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return Handler
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset)) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/IteratorFactory.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/IteratorFactory.php
new file mode 100644
index 00000000000..b17f7deb417
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Handler/IteratorFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler;
+
+/**
+ * Factory class for @see Iterator
+ */
+class IteratorFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = Iterator::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return Iterator
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerFactory.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerFactory.php
new file mode 100644
index 00000000000..9028ea9d2ad
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+
+/**
+ * Factory type for @see Handler
+ */
+class HandlerFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = Handler::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create type instance with specified parameters
+     *
+     * @param array $data
+     * @return Handler
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerInterface.php
new file mode 100644
index 00000000000..2cbcb19ff74
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/HandlerInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+
+/**
+ * Representation of message queue handler configuration.
+ */
+interface HandlerInterface
+{
+    /**
+     * Get handler type name.
+     *
+     * @return string
+     */
+    public function getType();
+
+    /**
+     * Get handler method name.
+     *
+     * @return string
+     */
+    public function getMethod();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Iterator.php
new file mode 100644
index 00000000000..d60b54a6897
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/Iterator.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemFactory;
+use Magento\Framework\MessageQueue\Consumer\Config\Data;
+
+/**
+ * Consumer config item iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Consumer config item.
+     *
+     * @var ConsumerConfigItem
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Data $configData
+     * @param ConsumerConfigItemFactory $itemFactory
+     */
+    public function __construct(Data $configData, ConsumerConfigItemFactory $itemFactory)
+    {
+        $this->data = $configData->get();
+        $this->object = $itemFactory->create();
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return ConsumerConfigItem
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset)) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemFactory.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemFactory.php
new file mode 100644
index 00000000000..47711b4fb7e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+/**
+ * Factory class for @see ConsumerConfigItem
+ */
+class ConsumerConfigItemFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = ConsumerConfigItem::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return ConsumerConfigItem
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemInterface.php
new file mode 100644
index 00000000000..0896b7789e1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemInterface.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\HandlerInterface;
+
+/**
+ * Items of this class represent config items declared in etc/queue_consumer.xsd
+ */
+interface ConsumerConfigItemInterface
+{
+    /**
+     * Get consumer name.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get connection name.
+     *
+     * @return string
+     */
+    public function getConnection();
+
+    /**
+     * Get name of the queue current consumer is listening to.
+     *
+     * @return string
+     */
+    public function getQueue();
+
+    /**
+     * Get consumer class name.
+     *
+     * @return string
+     */
+    public function getConsumerInstance();
+
+    /**
+     * Get information about custom handlers to be used by current consumer.
+     *
+     * @return HandlerInterface[]
+     */
+    public function getHandlers();
+
+    /**
+     * Get maximum number of messages to be consumed from queue before terminating consumer.
+     *
+     * @return int
+     */
+    public function getMaxMessages();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Data.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Data.php
new file mode 100644
index 00000000000..d94f5bd4a64
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Data.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Consumer config data storage. Caches merged config.
+ */
+class Data extends \Magento\Framework\Config\Data
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        \Magento\Framework\MessageQueue\Consumer\Config\ReaderInterface $reader,
+        \Magento\Framework\Config\CacheInterface $cache,
+        $cacheId = 'message_queue_consumer_config_cache',
+        SerializerInterface $serializer = null
+    ) {
+        parent::__construct($reader, $cache, $cacheId, $serializer);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php
new file mode 100644
index 00000000000..aa318ba5f19
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Env/Reader.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Consumer\Config\Env;
+
+/**
+ * Communication configuration reader. Reads data from env.php.
+ */
+class Reader implements \Magento\Framework\Config\ReaderInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Env
+     */
+    private $envConfig;
+
+    /**
+     * @param \Magento\Framework\MessageQueue\Config\Reader\Env $envConfig
+     */
+    public function __construct(\Magento\Framework\MessageQueue\Config\Reader\Env $envConfig)
+    {
+        $this->envConfig = $envConfig;
+    }
+
+    /**
+     * Read consumers configuration from env.php
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $configData = $this->envConfig->read($scope);
+        return isset($configData[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_CONSUMERS])
+            ? $configData[\Magento\Framework\MessageQueue\Config\Reader\Env::ENV_CONSUMERS]
+            : [];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ReaderInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ReaderInterface.php
new file mode 100644
index 00000000000..c56b14c3f67
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ReaderInterface.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+/**
+ * Queue consumer config reader interface.
+ */
+interface ReaderInterface extends \Magento\Framework\Config\ReaderInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/ConsumerInstance.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/ConsumerInstance.php
new file mode 100644
index 00000000000..5d38fddc8f6
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/ConsumerInstance.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer;
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+use Magento\Framework\MessageQueue\ConsumerInterface;
+
+/**
+ * Consumer config data validator for consumer instance.
+ */
+class ConsumerInstance implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($configData as $consumerConfig) {
+            $this->validateConsumerInstance($consumerConfig);
+        }
+    }
+
+    /**
+     * Make sure that specified consumer instance is valid.
+     *
+     * @param array $consumerConfig
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateConsumerInstance($consumerConfig)
+    {
+        $consumerInstance = $consumerConfig['consumerInstance'];
+        if ($consumerInstance == ConsumerInterface::class) {
+            return;
+        }
+        if (!class_exists($consumerInstance)) {
+            throw new \LogicException(
+                sprintf(
+                    "'%s' does not exist and thus cannot be used as 'consumerInstance' for '%s' consumer.",
+                    $consumerInstance,
+                    $consumerConfig['name'],
+                    ConsumerInterface::class
+                )
+            );
+        }
+        $implementedInterfaces = class_implements($consumerInstance);
+        if (!in_array(ConsumerInterface::class, $implementedInterfaces)) {
+            throw new \LogicException(
+                sprintf(
+                    "'%s' cannot be specified as 'consumerInstance' for '%s' consumer,"
+                    . " unless it implements '%s' interface",
+                    $consumerInstance,
+                    $consumerConfig['name'],
+                    ConsumerInterface::class
+                )
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/FieldsTypes.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/FieldsTypes.php
new file mode 100644
index 00000000000..d1409dec026
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/FieldsTypes.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+
+/**
+ * Consumer config data validator for fields types.
+ */
+class FieldsTypes implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($configData as $consumerName => $consumerConfig) {
+            $this->validateConsumerFieldsTypes($consumerName, $consumerConfig);
+        }
+    }
+
+    /**
+     * Make sure types of all fields in the consumer item config are correct.
+     *
+     * @param string $consumerName
+     * @param array $consumerConfig
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateConsumerFieldsTypes($consumerName, $consumerConfig)
+    {
+        $fields = [
+            'name' => 'string',
+            'queue' => 'string',
+            'handlers' => 'array',
+            'consumerInstance' => 'string',
+            'connection' => 'string'
+        ];
+        foreach ($fields as $fieldName => $expectedType) {
+            $actualType = gettype($consumerConfig[$fieldName]);
+            if ($actualType !== $expectedType) {
+                throw new \LogicException(
+                    sprintf(
+                        "Type of '%s' field specified in configuration of '%s' consumer is invalid. "
+                        . "Given '%s', '%s' was expected.",
+                        $fieldName,
+                        $consumerName,
+                        $actualType,
+                        $expectedType
+                    )
+                );
+            }
+        }
+        if (null !== $consumerConfig['maxMessages'] && !is_numeric($consumerConfig['maxMessages'])) {
+            throw new \LogicException(
+                sprintf(
+                    "Type of 'maxMessages' field specified in configuration of '%s' consumer is invalid. "
+                    . "Given '%s', '%s' was expected.",
+                    $consumerName,
+                    gettype($consumerConfig['maxMessages']),
+                    'int|null'
+                )
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/Handlers.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/Handlers.php
new file mode 100644
index 00000000000..fa6586d81b1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/Handlers.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+use Magento\Framework\Reflection\MethodsMap;
+
+/**
+ * Consumer config data validator for handlers.
+ */
+class Handlers implements ValidatorInterface
+{
+    /**
+     * @var MethodsMap
+     */
+    private $methodsMap;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param MethodsMap $methodsMap
+     */
+    public function __construct(MethodsMap $methodsMap)
+    {
+        $this->methodsMap = $methodsMap;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($configData as $consumerConfig) {
+            $consumerName = $consumerConfig['name'];
+            if (!is_array($consumerConfig['handlers'])) {
+                throw new \LogicException(
+                    sprintf(
+                        "'handlers' element must be an array for consumer '%s'",
+                        $consumerName
+                    )
+                );
+            }
+            foreach ($consumerConfig['handlers'] as $handler) {
+                $this->validateHandler($handler, $consumerName);
+            }
+        }
+    }
+
+    /**
+     * Validate handler configuration.
+     *
+     * @param array $handler
+     * @param string $consumerName
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateHandler($handler, $consumerName)
+    {
+        if (!isset($handler['type']) || !isset($handler['method'])) {
+            throw new \LogicException(
+                sprintf(
+                    "'%s' consumer declaration is invalid. "
+                    . "Every handler element must be an array. It must contain 'type' and 'method' elements.",
+                    $consumerName
+                )
+            );
+        }
+        try {
+            $this->methodsMap->getMethodParams($handler['type'], $handler['method']);
+        } catch (\Exception $e) {
+            throw new \LogicException(
+                sprintf(
+                    'Service method specified as handler for of consumer "%s" is not available. Given "%s"',
+                    $consumerName,
+                    $handler['type'] . '::' . $handler['method']
+                )
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/RequiredFields.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/RequiredFields.php
new file mode 100644
index 00000000000..87de2233381
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/RequiredFields.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ValidatorInterface;
+
+/**
+ * Consumer config data validator for required fields.
+ */
+class RequiredFields implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($configData as $consumerName => $consumerConfig) {
+            $requiredFields = ['name', 'queue', 'handlers', 'consumerInstance', 'connection', 'maxMessages'];
+            foreach ($requiredFields as $fieldName) {
+                if (!array_key_exists($fieldName, $consumerConfig)) {
+                    throw new \LogicException(
+                        sprintf("'%s' field must be specified for consumer '%s'", $fieldName, $consumerName)
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ValidatorInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ValidatorInterface.php
new file mode 100644
index 00000000000..70cad497283
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ValidatorInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config;
+
+/**
+ * Queue consumer config validator interface.
+ */
+interface ValidatorInterface
+{
+    /**
+     * Validate merged consumer config data.
+     *
+     * @param array $configData
+     * @return void
+     * @throws \LogicException
+     */
+    public function validate($configData);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php
new file mode 100644
index 00000000000..352bc53e94e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Xml;
+
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\ConsumerInterface;
+use Magento\Framework\Communication\Config\ConfigParser;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Converts MessageQueue consumers config from \DOMDocument to array
+ */
+class Converter implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * @var string
+     */
+    private static $defaultInstance = ConsumerInterface::class;
+
+    /**
+     * @var ConfigParser
+     */
+    private $configParser;
+
+    /**
+     * Default value provider.
+     *
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConfigParser $configParser
+     * @param DefaultValueProvider $defaultValueProvider
+     */
+    public function __construct(ConfigParser $configParser, DefaultValueProvider $defaultValueProvider)
+    {
+        $this->configParser = $configParser;
+        $this->defaultValueProvider = $defaultValueProvider;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function convert($source)
+    {
+        $result = [];
+        /** @var $consumerNode \DOMElement */
+        foreach ($source->getElementsByTagName('consumer') as $consumerNode) {
+            $consumerName = $this->getAttributeValue($consumerNode, 'name');
+            $handler = $this->getAttributeValue($consumerNode, 'handler');
+            $result[$consumerName] = [
+                'name' => $consumerName,
+                'queue' => $this->getAttributeValue($consumerNode, 'queue'),
+                'consumerInstance' => $this->getAttributeValue(
+                    $consumerNode,
+                    'consumerInstance',
+                    self::$defaultInstance
+                ),
+                'handlers' => $handler ? [$this->parseHandler($handler)] : [],
+                'connection' => $this->getAttributeValue(
+                    $consumerNode,
+                    'connection',
+                    $this->defaultValueProvider->getConnection()
+                ),
+                'maxMessages' => $this->getAttributeValue($consumerNode, 'maxMessages')
+            ];
+        }
+        return $result;
+    }
+
+    /**
+     * Get attribute value of the given node
+     *
+     * @param \DOMNode $node
+     * @param string $attributeName
+     * @param mixed $default
+     * @return string|null
+     */
+    private function getAttributeValue(\DOMNode $node, $attributeName, $default = null)
+    {
+        $item = $node->attributes->getNamedItem($attributeName);
+        return $item ? $item->nodeValue : $default;
+    }
+
+    /**
+     * Parse service method callback to become compatible with handlers format.
+     *
+     * @param array $handler
+     * @return array
+     */
+    private function parseHandler($handler)
+    {
+        $parseServiceMethod = $this->configParser->parseServiceMethod($handler);
+        return [
+            CommunicationConfig::HANDLER_TYPE => $parseServiceMethod[ConfigParser::TYPE_NAME],
+            CommunicationConfig::HANDLER_METHOD => $parseServiceMethod[ConfigParser::METHOD_NAME]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Reader.php
new file mode 100644
index 00000000000..52502e8f139
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Reader.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Xml;
+
+use Magento\Framework\MessageQueue\Consumer\Config\ReaderInterface;
+
+/**
+ * Reader for etc/queue_consumer.xml configs.
+ */
+class Reader extends \Magento\Framework\Config\Reader\Filesystem implements ReaderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $_idAttributes = [
+        '/config/consumer' => 'name'
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        \Magento\Framework\Config\FileResolverInterface $fileResolver,
+        \Magento\Framework\MessageQueue\Consumer\Config\Xml\Converter $converter,
+        \Magento\Framework\MessageQueue\Consumer\Config\Xml\SchemaLocator $schemaLocator,
+        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        $fileName = 'queue_consumer.xml',
+        $idAttributes = [],
+        $domDocumentClass = \Magento\Framework\Config\Dom::class,
+        $defaultScope = 'global'
+    ) {
+        parent::__construct(
+            $fileResolver,
+            $converter,
+            $schemaLocator,
+            $validationState,
+            $fileName,
+            $idAttributes,
+            $domDocumentClass,
+            $defaultScope
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/SchemaLocator.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/SchemaLocator.php
new file mode 100644
index 00000000000..3ddbc143f3b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/SchemaLocator.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer\Config\Xml;
+
+/**
+ * Schema locator for etc/queue_consumer.xml
+ */
+class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    protected $schema;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     *
+     * @var string
+     */
+    protected $perFileSchema;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
+     */
+    public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
+    {
+        $this->schema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/consumer.xsd');
+        $this->perFileSchema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/consumer.xsd');
+    }
+
+    /**
+     * Get path to merged config schema
+     *
+     * @return string|null
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * Get path to per file validation schema
+     *
+     * @return string|null
+     */
+    public function getPerFileSchema()
+    {
+        return $this->perFileSchema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/ConfigInterface.php
new file mode 100644
index 00000000000..344b5ef1d58
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/ConfigInterface.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Consumer;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface;
+
+/**
+ * Consumer config interface provides access data declared in etc/queue_consumer.xml
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ConfigInterface
+{
+    /**
+     * Get consumer configuration by consumer name.
+     *
+     * @param string $name
+     * @return ConsumerConfigItemInterface
+     * @throws LocalizedException
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getConsumer($name);
+
+    /**
+     * Get list of all consumers declared in the system.
+     *
+     * @return ConsumerConfigItemInterface[]
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getConsumers();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php
new file mode 100644
index 00000000000..09cd5dcb8d9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Value class which stores the configuration
+ */
+class ConsumerConfiguration implements ConsumerConfigurationInterface
+{
+    /**
+     * @deprecated
+     * @see ConsumerConfigurationInterface::TOPIC_TYPE
+     */
+    const CONSUMER_TYPE = "consumer_type";
+
+    /**
+     * @deprecated
+     * @see ConsumerConfigurationInterface::TOPIC_HANDLERS
+     */
+    const HANDLERS = 'handlers';
+
+    /**
+     * @var array
+     */
+    private $data;
+
+    /**
+     * @var QueueRepository
+     */
+    private $queueRepository;
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueRepository $queueRepository
+     * @param MessageQueueConfig $messageQueueConfig
+     * @param array $data configuration data
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(QueueRepository $queueRepository, MessageQueueConfig $messageQueueConfig, $data = [])
+    {
+        $this->data = $data;
+        $this->queueRepository = $queueRepository;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConsumerName()
+    {
+        return $this->getData(self::CONSUMER_NAME);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMaxMessages()
+    {
+        return $this->getData(self::MAX_MESSAGES);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueueName()
+    {
+        return $this->getData(self::QUEUE_NAME);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getType()
+    {
+        $topics = $this->getData(self::TOPICS);
+        if (count($topics) > 1) {
+            throw new \LogicException(
+                'Current method is deprecated and does not support more than 1 topic declarations for consumer. '
+                . 'Use \Magento\Framework\MessageQueue\ConsumerConfiguration::getConsumerType instead. '
+                . "Multiple topics declared for consumer '{$this->getConsumerName()}'"
+            );
+        } elseif (count($topics) < 1) {
+            throw new \LogicException(
+                "There must be at least one topic declared for consumer '{$this->getConsumerName()}'."
+            );
+        }
+        // Get the only topic and read consumer type from its declaration. Necessary for backward compatibility
+        $topicConfig = reset($topics);
+        return $topicConfig[self::TOPIC_TYPE];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHandlers($topicName)
+    {
+        return $this->getTopicConfig($topicName)[self::TOPIC_HANDLERS];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTopicNames()
+    {
+        $topics = $this->getData(self::TOPICS);
+        return is_array($topics) && count($topics) ? array_keys($topics) : [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueue()
+    {
+        $connectionName = $this->getConsumerConfig()->getConsumer($this->getConsumerName())->getConnection();
+        return $this->queueRepository->get($connectionName, $this->getQueueName());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMessageSchemaType($topicName)
+    {
+        return $this->getCommunicationConfig()->getTopic($topicName)[CommunicationConfig::TOPIC_REQUEST_TYPE];
+    }
+
+    /**
+     * Get topic configuration for current consumer.
+     * @param string $topicName
+     * @return array
+     * @throws \LogicException
+     */
+    private function getTopicConfig($topicName)
+    {
+        if (!isset($this->getData(self::TOPICS)[$topicName])) {
+            throw new \LogicException("Consumer configuration for {$topicName} topic not found.");
+        }
+        return $this->getData(self::TOPICS)[$topicName];
+    }
+
+    /**
+     * Get specified data item.
+     *
+     * @param string $key
+     * @return string|null
+     */
+    private function getData($key)
+    {
+        if (!isset($this->data[$key])) {
+            return null;
+        }
+        return $this->data[$key];
+    }
+
+    /**
+     * Get consumer config.
+     *
+     * @return ConsumerConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConsumerConfig()
+    {
+        if ($this->consumerConfig === null) {
+            $this->consumerConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(ConsumerConfig::class);
+        }
+        return $this->consumerConfig;
+    }
+
+    /**
+     * Get communication config.
+     *
+     * @return CommunicationConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getCommunicationConfig()
+    {
+        if ($this->communicationConfig === null) {
+            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(CommunicationConfig::class);
+        }
+        return $this->communicationConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php
new file mode 100644
index 00000000000..b825949ddb0
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Configuration for the consumer.
+ */
+interface ConsumerConfigurationInterface
+{
+    const CONSUMER_NAME = "consumer_name";
+
+    const QUEUE_NAME = "queue_name";
+    const MAX_MESSAGES = "max_messages";
+    const SCHEMA_TYPE = "schema_type";
+    const TOPICS = 'topics';
+    const TOPIC_TYPE = 'consumer_type';
+    const TOPIC_HANDLERS = 'handlers';
+
+    const TYPE_SYNC = 'sync';
+    const TYPE_ASYNC = 'async';
+    const INSTANCE_TYPE_BATCH = 'batch';
+    const INSTANCE_TYPE_SINGULAR = 'singular';
+
+    /**
+     * Get consumer name.
+     *
+     * @return string
+     */
+    public function getConsumerName();
+
+    /**
+     * Get the name of queue which consumer will read from.
+     *
+     * @return string
+     */
+    public function getQueueName();
+
+    /**
+     * Get consumer type sync|async.
+     *
+     * @return string
+     * @deprecated 100.2.0
+     * @see \Magento\Framework\Communication\ConfigInterface::getTopic
+     * @throws \LogicException
+     */
+    public function getType();
+
+    /**
+     * Get maximum number of message, which will be read by consumer before termination of the process.
+     *
+     * @return int|null
+     */
+    public function getMaxMessages();
+
+    /**
+     * Get handlers by topic type.
+     *
+     * @param string $topicName
+     * @return callback[]
+     * @throws \LogicException
+     */
+    public function getHandlers($topicName);
+
+    /**
+     * Get topics.
+     *
+     * @return string[]
+     */
+    public function getTopicNames();
+
+    /**
+     * @param string $topicName
+     * @return string
+     */
+    public function getMessageSchemaType($topicName);
+
+    /**
+     * @return QueueInterface
+     */
+    public function getQueue();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php
new file mode 100644
index 00000000000..7d9f210b4a6
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\MessageQueue\ConsumerInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Class which creates Consumers
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ConsumerFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * @var ConsumerConfig
+     */
+    private $consumerConfig;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueConfig $queueConfig
+     * @param ObjectManagerInterface $objectManager
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        QueueConfig $queueConfig,
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Return the actual Consumer implementation for the given consumer name.
+     *
+     * @param string $consumerName
+     * @param int $batchSize [optional]
+     * @return ConsumerInterface
+     * @throws LocalizedException
+     */
+    public function get($consumerName, $batchSize = 0)
+    {
+        $consumerConfig = $this->getConsumerConfig()->getConsumer($consumerName);
+        if ($consumerConfig === null) {
+            throw new LocalizedException(
+                new Phrase('Specified consumer "%consumer" is not declared.', ['consumer' => $consumerName])
+            );
+        }
+
+        return $this->objectManager->create(
+            $consumerConfig->getConsumerInstance(),
+            [
+                'configuration' => $this->createConsumerConfiguration($consumerConfig),
+                'batchSize' => $batchSize,
+            ]
+        );
+    }
+
+    /**
+     * Creates the objects necessary for the ConsumerConfigurationInterface to configure a Consumer.
+     *
+     * @param ConsumerConfigItemInterface $consumerConfigItem
+     * @return ConsumerConfigurationInterface
+     */
+    private function createConsumerConfiguration($consumerConfigItem)
+    {
+        $customConsumerHandlers = [];
+        foreach ($consumerConfigItem->getHandlers() as $handlerConfig) {
+            $customConsumerHandlers[] = [
+                $this->objectManager->create($handlerConfig->getType()),
+                $handlerConfig->getMethod()
+            ];
+        }
+        $topics = [];
+        foreach ($this->getCommunicationConfig()->getTopics() as $topicConfig) {
+            $topicName = $topicConfig[CommunicationConfig::TOPIC_NAME];
+            $topics[$topicName] = [
+                ConsumerConfigurationInterface::TOPIC_HANDLERS => $customConsumerHandlers
+                    ?: $this->getHandlersFromCommunicationConfig($topicName),
+                ConsumerConfigurationInterface::TOPIC_TYPE => $topicConfig[CommunicationConfig::TOPIC_IS_SYNCHRONOUS]
+                    ? ConsumerConfiguration::TYPE_SYNC
+                    : ConsumerConfiguration::TYPE_ASYNC
+            ];
+        }
+        $configData = [
+            ConsumerConfigurationInterface::CONSUMER_NAME => $consumerConfigItem->getName(),
+            ConsumerConfigurationInterface::QUEUE_NAME => $consumerConfigItem->getQueue(),
+            ConsumerConfigurationInterface::TOPICS => $topics,
+            ConsumerConfigurationInterface::MAX_MESSAGES => $consumerConfigItem->getMaxMessages(),
+        ];
+
+        return $this->objectManager->create(
+            \Magento\Framework\MessageQueue\ConsumerConfiguration::class,
+            ['data' => $configData]
+        );
+    }
+
+    /**
+     * Get consumer config.
+     *
+     * @return ConsumerConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConsumerConfig()
+    {
+        if ($this->consumerConfig === null) {
+            $this->consumerConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(ConsumerConfig::class);
+        }
+        return $this->consumerConfig;
+    }
+
+    /**
+     * Get communication config.
+     *
+     * @return CommunicationConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getCommunicationConfig()
+    {
+        if ($this->communicationConfig === null) {
+            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(CommunicationConfig::class);
+        }
+        return $this->communicationConfig;
+    }
+
+    /**
+     * Get handlers by topic based on communication config.
+     *
+     * @param string $topicName
+     * @return array
+     */
+    private function getHandlersFromCommunicationConfig($topicName)
+    {
+        $topicConfig = $this->getCommunicationConfig()->getTopic($topicName);
+        $handlers = [];
+        foreach ($topicConfig[CommunicationConfig::TOPIC_HANDLERS] as $handlerConfig) {
+            $handlers[] = [
+                $this->objectManager->create($handlerConfig[CommunicationConfig::HANDLER_TYPE]),
+                $handlerConfig[CommunicationConfig::HANDLER_METHOD]
+            ];
+        }
+        return $handlers;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerInterface.php
new file mode 100644
index 00000000000..ca45da7eca8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Consumers will connect to a queue, read messages, and invoke a method to process the message contents.
+ *
+ * @api
+ */
+interface ConsumerInterface
+{
+    /**
+     * Connects to a queue, consumes a message on the queue, and invoke a method to process the message contents.
+     *
+     * @param int|null $maxNumberOfMessages if not specified - process all queued incoming messages and terminate,
+     *      otherwise terminate execution after processing the specified number of messages
+     * @return void
+     */
+    public function process($maxNumberOfMessages = null);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/DefaultValueProvider.php b/lib/internal/Magento/Framework/MessageQueue/DefaultValueProvider.php
new file mode 100644
index 00000000000..592581a0259
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/DefaultValueProvider.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Message Queue default config value provider.
+ */
+class DefaultValueProvider
+{
+    /**
+     * Default connection name.
+     *
+     * @var string
+     */
+    private $connection;
+
+    /**
+     * Default exchange name.
+     *
+     * @var string
+     */
+    private $exchange;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param string $connection
+     * @param string $exchange
+     */
+    public function __construct($connection = 'amqp', $exchange = 'magento')
+    {
+        $this->connection = $connection;
+        $this->exchange = $exchange;
+    }
+
+    /**
+     * Get default connection name.
+     *
+     * @return string
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * Get default exchange name.
+     *
+     * @return string
+     */
+    public function getExchange()
+    {
+        return $this->exchange;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Envelope.php b/lib/internal/Magento/Framework/MessageQueue/Envelope.php
new file mode 100644
index 00000000000..07dd45efbf1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Envelope.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+
+class Envelope implements EnvelopeInterface
+{
+    /**
+     * @var array
+     */
+    private $properties;
+
+    /**
+     * @var string
+     */
+    private $body;
+
+    /**
+     * @param string $body
+     * @param array $properties
+     */
+    public function __construct($body, array $properties = [])
+    {
+        $this->body = $body;
+        $this->properties = $properties;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProperties()
+    {
+        return $this->properties;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/EnvelopeFactory.php b/lib/internal/Magento/Framework/MessageQueue/EnvelopeFactory.php
new file mode 100644
index 00000000000..0ffcc988bf4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/EnvelopeFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Envelope
+ */
+class EnvelopeFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $_objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    protected $_instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = \Magento\Framework\MessageQueue\Envelope::class
+    ) {
+        $this->_objectManager = $objectManager;
+        $this->_instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\MessageQueue\Envelope
+     */
+    public function create(array $data = [])
+    {
+        return $this->_objectManager->create($this->_instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php b/lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php
new file mode 100644
index 00000000000..07f12d18563
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * @api
+ */
+interface EnvelopeInterface
+{
+    /**
+     * Binary representation of message
+     *
+     * @return string
+     */
+    public function getBody();
+
+    /**
+     * Message metadata
+     *
+     * @return array
+     */
+    public function getProperties();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeFactory.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactory.php
new file mode 100644
index 00000000000..ca1ef769af9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactory.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\ExchangeInterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+class ExchangeFactory implements ExchangeFactoryInterface
+{
+    /**
+     * @var ExchangeFactoryInterface[]
+     */
+    private $exchangeFactories;
+
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     * @since 100.2.0
+     */
+    protected $objectManager = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConnectionTypeResolver $connectionTypeResolver
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ExchangeFactoryInterface[] $exchangeFactories
+     * @since 100.2.0
+     */
+    public function __construct(
+        ConnectionTypeResolver $connectionTypeResolver,
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        array $exchangeFactories = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->exchangeFactories = $exchangeFactories;
+        $this->connectionTypeResolver = $connectionTypeResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.2.0
+     */
+    public function create($connectionName, array $data = [])
+    {
+        $connectionType = $this->connectionTypeResolver->getConnectionType($connectionName);
+
+        if (!isset($this->exchangeFactories[$connectionType])) {
+            throw new \LogicException("Not found exchange for connection name '{$connectionName}' in config");
+        }
+
+        $factory = $this->exchangeFactories[$connectionType];
+        $exchange = $factory->create($connectionName, $data);
+
+        if (!$exchange instanceof ExchangeInterface) {
+            $exchangeInterface = \Magento\Framework\MessageQueue\ExchangeInterface::class;
+            throw new \LogicException(
+                "Exchange for connection name '{$connectionName}' " .
+                "does not implement interface '{$exchangeInterface}'"
+            );
+        }
+        return $exchange;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeFactoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactoryInterface.php
new file mode 100644
index 00000000000..1e70b0266fc
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactoryInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\ExchangeInterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ExchangeFactoryInterface
+{
+    /**
+     * Create exchange instance.
+     *
+     * @param string $connectionName
+     * @param array $data
+     * @return ExchangeInterface
+     * @since 100.2.0
+     */
+    public function create($connectionName, array $data = []);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php
new file mode 100644
index 00000000000..bb36332ae25
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Interface message Exchange
+ *
+ * @api
+ */
+interface ExchangeInterface
+{
+    /**
+     * Send message
+     *
+     * @param string $topic
+     * @param EnvelopeInterface $envelope
+     * @return mixed
+     */
+    public function enqueue($topic, EnvelopeInterface $envelope);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeRepository.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeRepository.php
new file mode 100644
index 00000000000..1f26e5d785c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeRepository.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+class ExchangeRepository
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ExchangeFactoryInterface
+     */
+    private $exchangeFactory;
+
+    /**
+     * Pool of exchange instances.
+     *
+     * @var ExchangeInterface[]
+     */
+    private $exchangePool = [];
+
+    /**
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string[] $exchanges
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $exchanges = [])
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @param string $connectionName
+     * @return ExchangeInterface
+     * @throws \LogicException
+     */
+    public function getByConnectionName($connectionName)
+    {
+        if (!isset($this->exchangePool[$connectionName])) {
+            $exchange = $this->getExchangeFactory()->create($connectionName);
+            $this->exchangePool[$connectionName] = $exchange;
+        }
+        return $this->exchangePool[$connectionName];
+    }
+
+    /**
+     * Get exchange factory.
+     *
+     * @return ExchangeFactoryInterface
+     * @deprecated 100.2.0
+     */
+    private function getExchangeFactory()
+    {
+        if ($this->exchangeFactory === null) {
+            $this->exchangeFactory = $this->objectManager->get(ExchangeFactoryInterface::class);
+        }
+        return $this->exchangeFactory;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Lock.php b/lib/internal/Magento/Framework/MessageQueue/Lock.php
new file mode 100644
index 00000000000..15a9530d054
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Lock.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Class Lock to handle message lock transactions.
+ */
+class Lock extends \Magento\Framework\DataObject implements LockInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getId()
+    {
+        return $this->getData('id');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setId($value)
+    {
+        $this->setData('id', $value);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMessageCode()
+    {
+        return $this->getData('message_code');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setMessageCode($value)
+    {
+        $this->setData('message_code', $value);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getCreatedAt()
+    {
+        return $this->getData('created_at');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setCreatedAt($value)
+    {
+        $this->setData('created_at', $value);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Lock/ReaderInterface.php b/lib/internal/Magento/Framework/MessageQueue/Lock/ReaderInterface.php
new file mode 100644
index 00000000000..33490f51374
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Lock/ReaderInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Lock;
+
+/**
+ * Message lock reader interface
+ */
+interface ReaderInterface
+{
+    /**
+     * Get lock from storage
+     *
+     * @param \Magento\Framework\MessageQueue\LockInterface $lock
+     * @param string $code
+     * @return void
+     */
+    public function read(\Magento\Framework\MessageQueue\LockInterface $lock, $code);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Lock/WriterInterface.php b/lib/internal/Magento/Framework/MessageQueue/Lock/WriterInterface.php
new file mode 100644
index 00000000000..3d446f283c1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Lock/WriterInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Lock;
+
+/**
+ * Message lock writer
+ */
+interface WriterInterface
+{
+    /**
+     * Save lock
+     *
+     * @param \Magento\Framework\MessageQueue\LockInterface $lock
+     * @return void
+     */
+    public function saveLock(\Magento\Framework\MessageQueue\LockInterface $lock);
+
+    /**
+     * Remove outdated locks
+     *
+     * @return void
+     */
+    public function releaseOutdatedLocks();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/LockInterface.php b/lib/internal/Magento/Framework/MessageQueue/LockInterface.php
new file mode 100644
index 00000000000..1f3d4fd50c3
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/LockInterface.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Class Lock to handle message lock transactions.
+ */
+interface LockInterface
+{
+    /**
+     * Get lock id
+     *
+     * @return int
+     */
+    public function getId();
+
+    /**
+     * Set lock id
+     *
+     * @param int $value
+     * @return void
+     */
+    public function setId($value);
+
+    /**
+     * Get message code
+     *
+     * @return string
+     */
+    public function getMessageCode();
+
+    /**
+     * Set message code
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setMessageCode($value);
+
+    /**
+     * Get lock date
+     *
+     * @return string
+     */
+    public function getCreatedAt();
+
+    /**
+     * Set lock date
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setCreatedAt($value);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MergedMessage.php b/lib/internal/Magento/Framework/MessageQueue/MergedMessage.php
new file mode 100644
index 00000000000..31dfc423f74
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MergedMessage.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Provides mapping between merged message and appropriate original messages ids.
+ */
+class MergedMessage implements MergedMessageInterface
+{
+    /**
+     * @var mixed
+     */
+    private $mergedMessage;
+
+    /**
+     * @var array
+     */
+    private $originalMessagesIds;
+
+    /**
+     * @param mixed $mergedMessage
+     * @param array $originalMessagesIds
+     */
+    public function __construct($mergedMessage, array $originalMessagesIds)
+    {
+        $this->mergedMessage = $mergedMessage;
+        $this->originalMessagesIds = $originalMessagesIds;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMergedMessage()
+    {
+        return $this->mergedMessage;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOriginalMessagesIds()
+    {
+        return $this->originalMessagesIds;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MergedMessageInterface.php b/lib/internal/Magento/Framework/MessageQueue/MergedMessageInterface.php
new file mode 100644
index 00000000000..ff291a7cdb9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MergedMessageInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Interface for mapping between original and merged messages.
+ */
+interface MergedMessageInterface
+{
+    /**
+     * Get merged message instance.
+     *
+     * @return mixed
+     */
+    public function getMergedMessage();
+
+    /**
+     * Get original messages ids connected with the merged message.
+     *
+     * @return array
+     */
+    public function getOriginalMessagesIds();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MergedMessageProcessor.php b/lib/internal/Magento/Framework/MessageQueue/MergedMessageProcessor.php
new file mode 100644
index 00000000000..eb37214aabc
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MergedMessageProcessor.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Processing messages implementing MergedMessageInterface.
+ */
+class MergedMessageProcessor implements MessageProcessorInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageStatusProcessor
+     */
+    private $messageStatusProcessor;
+
+    /**
+     * @param MessageStatusProcessor $messageStatusProcessor
+     */
+    public function __construct(MessageStatusProcessor $messageStatusProcessor)
+    {
+        $this->messageStatusProcessor = $messageStatusProcessor;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(
+        QueueInterface $queue,
+        ConsumerConfigurationInterface $configuration,
+        array $messages,
+        array $messagesToAcknowledge,
+        array $mergedMessages
+    ) {
+        $this->messageStatusProcessor->acknowledgeMessages($queue, $messagesToAcknowledge);
+        $this->dispatchMessages($queue, $configuration, $mergedMessages, $messages);
+    }
+
+    /**
+     * Processing decoded messages, invoking callbacks, changing statuses for messages.
+     *
+     * @param QueueInterface $queue
+     * @param ConsumerConfigurationInterface $configuration
+     * @param array $messageList
+     * @param array $originalMessages
+     */
+    private function dispatchMessages(
+        QueueInterface $queue,
+        ConsumerConfigurationInterface $configuration,
+        array $messageList,
+        array $originalMessages
+    ) {
+        $originalMessagesIds = [];
+
+        try {
+            foreach ($messageList as $topicName => $messages) {
+                foreach ($messages as $message) {
+                    /**
+                     * @var \Magento\Framework\MessageQueue\MergedMessageInterface $message
+                     */
+                    $callbacks = $configuration->getHandlers($topicName);
+                    $originalMessagesIds = $message->getOriginalMessagesIds();
+
+                    foreach ($callbacks as $callback) {
+                        call_user_func($callback, $message->getMergedMessage());
+                    }
+
+                    $originalMessages = $this->getOriginalMessages($originalMessages, $originalMessagesIds);
+                    $this->messageStatusProcessor->acknowledgeMessages($queue, $originalMessages);
+                }
+            }
+        } catch (\Exception $e) {
+            $originalMessages = $this->getOriginalMessages($originalMessages, $originalMessagesIds);
+            $this->messageStatusProcessor->rejectMessages($queue, $originalMessages);
+        }
+    }
+
+    /**
+     * Get original messages by messages ids.
+     *
+     * @param array $messages
+     * @param array $messagesIds
+     * @return array
+     */
+    private function getOriginalMessages(array $messages, array $messagesIds)
+    {
+        $originalMessages = [];
+
+        foreach ($messagesIds as $messageId) {
+            if (isset($messages[$messageId])) {
+                $originalMessages[] = $messages[$messageId];
+            }
+        }
+
+        return $originalMessages;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MergerFactory.php b/lib/internal/Magento/Framework/MessageQueue/MergerFactory.php
new file mode 100644
index 00000000000..0647279258a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MergerFactory.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\ObjectManagerInterface;
+
+class MergerFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var string[]
+     */
+    private $mergers;
+
+    /**
+     * MergerFactory constructor.
+     * @param ObjectManagerInterface $objectManager
+     * @param string[] $mergers
+     */
+    public function __construct(ObjectManagerInterface $objectManager, $mergers = [])
+    {
+        $this->objectManager = $objectManager;
+        $this->mergers = $mergers;
+    }
+
+    /**
+     * @param string $consumerName
+     * @return MergerInterface
+     * @throws \LogicException
+     */
+    public function create($consumerName)
+    {
+        if (!isset($this->mergers[$consumerName])) {
+            throw new \LogicException("Not found merger for consumer name '{$consumerName}'");
+        }
+
+        $mergerClassName = $this->mergers[$consumerName];
+        $merger = $this->objectManager->get($mergerClassName);
+
+        if (!$merger instanceof MergerInterface) {
+            $mergerInterfaceName = \Magento\Framework\MessageQueue\MergerInterface::class;
+            throw new \LogicException(
+                "Merger '{$mergerClassName}' for consumer name '{$consumerName}' " .
+                "does not implement interface '{$mergerInterfaceName}'"
+            );
+        }
+
+        return $merger;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MergerInterface.php b/lib/internal/Magento/Framework/MessageQueue/MergerInterface.php
new file mode 100644
index 00000000000..a922cbf894d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MergerInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Interface for merging decoded queue messages.
+ */
+interface MergerInterface
+{
+    /**
+     * Merges or/and converts decoded queue messages.
+     *
+     * MergedMessage object contains array with ids of original queue messages
+     *
+     * @param object[] $messages
+     * @return object[]|MergedMessageInterface[]
+     */
+    public function merge(array $messages);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageController.php b/lib/internal/Magento/Framework/MessageQueue/MessageController.php
new file mode 100644
index 00000000000..16853501e1d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageController.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Phrase;
+
+class MessageController
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\LockInterfaceFactory
+     */
+    private $lockFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Lock\ReaderInterface
+     */
+    private $reader;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Lock\WriterInterface
+     */
+    private $writer;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\MessageQueue\LockInterfaceFactory $lockFactory
+     * @param Lock\ReaderInterface $reader
+     * @param Lock\WriterInterface $writer
+     */
+    public function __construct(
+        \Magento\Framework\MessageQueue\LockInterfaceFactory $lockFactory,
+        \Magento\Framework\MessageQueue\Lock\ReaderInterface $reader,
+        \Magento\Framework\MessageQueue\Lock\WriterInterface $writer
+    ) {
+        $this->lockFactory = $lockFactory;
+        $this->reader = $reader;
+        $this->writer = $writer;
+    }
+
+    /**
+     * Create lock corresponding to the provided message. Throw MessageLockException if lock is already created.
+     *
+     * @param EnvelopeInterface $envelope
+     * @param string $consumerName
+     * @return LockInterface
+     * @throws MessageLockException
+     * @throws NotFoundException
+     */
+    public function lock(EnvelopeInterface $envelope, $consumerName)
+    {
+        $lock = $this->lockFactory->create();
+        $properties = $envelope->getProperties();
+        if (empty($properties['message_id'])) {
+            throw new NotFoundException(new Phrase("Property 'message_id' not found in properties."));
+        }
+        $code = $consumerName . '-' . $properties['message_id'];
+        $code = md5($code);
+        $this->reader->read($lock, $code);
+        if ($lock->getId()) {
+            throw new MessageLockException(new Phrase('The "%1" message code was already processed.', [$code]));
+        }
+        $this->writer->saveLock($lock);
+        return $lock;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageEncoder.php b/lib/internal/Magento/Framework/MessageQueue/MessageEncoder.php
new file mode 100644
index 00000000000..91ad24eaeb9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageEncoder.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use Magento\Framework\Webapi\ServicePayloadConverterInterface;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Class which provides encoding and decoding capabilities for MessageQueue messages.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MessageEncoder
+{
+    const DIRECTION_ENCODE = 'encode';
+    const DIRECTION_DECODE = 'decode';
+
+    /**
+     * @var \Magento\Framework\Webapi\ServiceOutputProcessor
+     */
+    private $dataObjectEncoder;
+
+    /**
+     * @var \Magento\Framework\Webapi\ServiceInputProcessor
+     */
+    private $dataObjectDecoder;
+
+    /**
+     * @var \Magento\Framework\Json\EncoderInterface
+     */
+    private $jsonEncoder;
+
+    /**
+     * @var \Magento\Framework\Json\DecoderInterface
+     */
+    private $jsonDecoder;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueConfig $queueConfig
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param \Magento\Framework\Json\DecoderInterface $jsonDecoder
+     * @param \Magento\Framework\Webapi\ServiceOutputProcessor $dataObjectEncoder
+     * @param \Magento\Framework\Webapi\ServiceInputProcessor $dataObjectDecoder
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        QueueConfig $queueConfig,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
+        \Magento\Framework\Json\DecoderInterface $jsonDecoder,
+        \Magento\Framework\Webapi\ServiceOutputProcessor $dataObjectEncoder,
+        \Magento\Framework\Webapi\ServiceInputProcessor $dataObjectDecoder
+    ) {
+        $this->dataObjectEncoder = $dataObjectEncoder;
+        $this->dataObjectDecoder = $dataObjectDecoder;
+        $this->jsonEncoder = $jsonEncoder;
+        $this->jsonDecoder = $jsonDecoder;
+    }
+
+    /**
+     * Encode message content based on current topic.
+     *
+     * @param string $topic
+     * @param mixed $message
+     * @param bool $requestType
+     * @return string
+     * @throws LocalizedException
+     */
+    public function encode($topic, $message, $requestType = true)
+    {
+        $convertedMessage = $this->convertMessage($topic, $message, self::DIRECTION_ENCODE, $requestType);
+        return $this->jsonEncoder->encode($convertedMessage);
+    }
+
+    /**
+     * Decode message content based on current topic.
+     *
+     * @param string $topic
+     * @param string $message
+     * @param bool $requestType
+     * @return mixed
+     * @throws LocalizedException
+     */
+    public function decode($topic, $message, $requestType = true)
+    {
+        try {
+            $decodedMessage = $this->jsonDecoder->decode($message);
+        } catch (\Exception $e) {
+            throw new LocalizedException(new Phrase("Error occurred during message decoding."));
+        }
+        return $this->convertMessage($topic, $decodedMessage, self::DIRECTION_DECODE, $requestType);
+    }
+
+    /**
+     * Identify message data schema by topic.
+     *
+     * @param string $topic
+     * @param bool $requestType
+     * @return array
+     * @throws LocalizedException
+     */
+    protected function getTopicSchema($topic, $requestType)
+    {
+        $topicConfig = $this->getCommunicationConfig()->getTopic($topic);
+        if ($topicConfig === null) {
+            throw new LocalizedException(new Phrase('Specified topic "%topic" is not declared.', ['topic' => $topic]));
+        }
+        if ($requestType) {
+            return [
+                'schema_type' => $topicConfig[CommunicationConfig::TOPIC_REQUEST_TYPE],
+                'schema_value' => $topicConfig[CommunicationConfig::TOPIC_REQUEST]
+            ];
+        } else {
+            return [
+                'schema_type' => isset($topicConfig[CommunicationConfig::TOPIC_RESPONSE])
+                    ? CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS
+                    : null,
+                'schema_value' => $topicConfig[CommunicationConfig::TOPIC_RESPONSE]
+            ];
+        }
+    }
+
+    /**
+     * Convert message according to the format associated with its topic using provided converter.
+     *
+     * @param string $topic
+     * @param mixed $message
+     * @param string $direction
+     * @param bool $requestType
+     * @return mixed
+     * @throws LocalizedException
+     */
+    protected function convertMessage($topic, $message, $direction, $requestType)
+    {
+        $topicSchema = $this->getTopicSchema($topic, $requestType);
+        if ($topicSchema['schema_type'] == CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS) {
+            /** Convert message according to the data interface associated with the message topic */
+            $messageDataType = $topicSchema[QueueConfig::TOPIC_SCHEMA_VALUE];
+            try {
+                $convertedMessage = $this->getConverter($direction)->convertValue($message, $messageDataType);
+            } catch (LocalizedException $e) {
+                throw new LocalizedException(
+                    new Phrase(
+                        'Message with topic "%topic" must be an instance of "%class".',
+                        ['topic' => $topic, 'class' => $messageDataType]
+                    )
+                );
+            }
+        } else {
+            /** Convert message according to the method signature associated with the message topic */
+            $message = (array)$message;
+            $isIndexedArray = array_keys($message) === range(0, count($message) - 1);
+            $convertedMessage = [];
+            /** Message schema type is defined by method signature */
+            foreach ($topicSchema['schema_value'] as $methodParameterMeta) {
+                $paramName = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_NAME];
+                $paramType = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_TYPE];
+                if ($isIndexedArray) {
+                    /** Encode parameters according to their positions in method signature */
+                    $paramPosition = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_POSITION];
+                    if (isset($message[$paramPosition])) {
+                        $convertedMessage[$paramName] = $this->getConverter($direction)
+                            ->convertValue($message[$paramPosition], $paramType);
+                    }
+                } else {
+                    /** Encode parameters according to their names in method signature */
+                    if (isset($message[$paramName])) {
+                        $convertedMessage[$paramName] = $this->getConverter($direction)
+                            ->convertValue($message[$paramName], $paramType);
+                    }
+                }
+
+                /** Ensure that all required params were passed */
+                if ($methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_IS_REQUIRED]
+                    && !isset($convertedMessage[$paramName])
+                ) {
+                    throw new LocalizedException(
+                        new Phrase(
+                            'Data item corresponding to "%param" must be specified '
+                            . 'in the message with topic "%topic".',
+                            [
+                                'topic' => $topic,
+                                'param' => $paramName
+                            ]
+                        )
+                    );
+                }
+            }
+        }
+        return $convertedMessage;
+    }
+
+    /**
+     * Get value converter based on conversion direction.
+     *
+     * @param string $direction
+     * @return ServicePayloadConverterInterface
+     */
+    protected function getConverter($direction)
+    {
+        return ($direction == self::DIRECTION_ENCODE) ? $this->dataObjectEncoder : $this->dataObjectDecoder;
+    }
+
+    /**
+     * Get communication config.
+     *
+     * @return CommunicationConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getCommunicationConfig()
+    {
+        if ($this->communicationConfig === null) {
+            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(CommunicationConfig::class);
+        }
+        return $this->communicationConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageIdGenerator.php b/lib/internal/Magento/Framework/MessageQueue/MessageIdGenerator.php
new file mode 100644
index 00000000000..7f8196e1a59
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageIdGenerator.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Generate unique id for queue message.
+ */
+class MessageIdGenerator implements MessageIdGeneratorInterface
+{
+    /**
+     * @var \Magento\Framework\Encryption\EncryptorInterface
+     */
+    private $encryptor;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
+     */
+    public function __construct(
+        \Magento\Framework\Encryption\EncryptorInterface $encryptor
+    ) {
+        $this->encryptor = $encryptor;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function generate($topicName)
+    {
+        return $this->encryptor->hash(uniqid($topicName));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageIdGeneratorInterface.php b/lib/internal/Magento/Framework/MessageQueue/MessageIdGeneratorInterface.php
new file mode 100644
index 00000000000..727db7d3476
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageIdGeneratorInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Used to generate unique id for queue message.
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface MessageIdGeneratorInterface
+{
+    /**
+     * Generate unique message id based on topic name.
+     *
+     * @param string $topicName
+     * @return string
+     * @since 100.2.0
+     */
+    public function generate($topicName);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageLockException.php b/lib/internal/Magento/Framework/MessageQueue/MessageLockException.php
new file mode 100644
index 00000000000..4ea462f7e1a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageLockException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Class MessageLockException to be thrown when a message being processed is already in the lock table.
+ *
+ * @api
+ * @since 100.1.0
+ */
+class MessageLockException extends LocalizedException
+{
+
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php b/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php
new file mode 100644
index 00000000000..d71a527c9cb
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Processes any type of messages except messages implementing MergedMessageInterface.
+ */
+class MessageProcessor implements MessageProcessorInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageStatusProcessor
+     */
+    private $messageStatusProcessor;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @param MessageStatusProcessor $messageStatusProcessor
+     * @param ResourceConnection $resource
+     */
+    public function __construct(
+        MessageStatusProcessor $messageStatusProcessor,
+        ResourceConnection $resource
+    ) {
+        $this->messageStatusProcessor = $messageStatusProcessor;
+        $this->resource = $resource;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(
+        QueueInterface $queue,
+        ConsumerConfigurationInterface $configuration,
+        array $messages,
+        array $messagesToAcknowledge,
+        array $mergedMessages
+    ) {
+        try {
+            $this->resource->getConnection()->beginTransaction();
+            $this->messageStatusProcessor->acknowledgeMessages($queue, $messagesToAcknowledge);
+            $this->dispatchMessages($configuration, $mergedMessages);
+            $this->resource->getConnection()->commit();
+            $this->messageStatusProcessor->acknowledgeMessages($queue, $messages);
+        } catch (ConnectionLostException $e) {
+            $this->resource->getConnection()->rollBack();
+        } catch (\Exception $e) {
+            $this->resource->getConnection()->rollBack();
+            $this->messageStatusProcessor->rejectMessages($queue, $messages);
+        }
+    }
+
+    /**
+     * Processes decoded messages, invokes callbacks, changes statuses for messages.
+     *
+     * @param ConsumerConfigurationInterface $configuration
+     * @param array $messageList
+     */
+    private function dispatchMessages(ConsumerConfigurationInterface $configuration, array $messageList)
+    {
+        foreach ($messageList as $topicName => $messages) {
+            foreach ($messages as $message) {
+                $callbacks = $configuration->getHandlers($topicName);
+                foreach ($callbacks as $callback) {
+                    call_user_func($callback, $message);
+                }
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageProcessorInterface.php b/lib/internal/Magento/Framework/MessageQueue/MessageProcessorInterface.php
new file mode 100644
index 00000000000..c78485b7748
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageProcessorInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Interface for processing queue messages.
+ */
+interface MessageProcessorInterface
+{
+    /**
+     * Processing decoded messages, invoking callbacks, changing statuses for messages.
+     *
+     * @param QueueInterface $queue
+     * @param ConsumerConfigurationInterface $configuration
+     * @param array $messages
+     * @param array $messagesToAcknowledge
+     * @param array $mergedMessages
+     * @return void
+     */
+    public function process(
+        QueueInterface $queue,
+        ConsumerConfigurationInterface $configuration,
+        array $messages,
+        array $messagesToAcknowledge,
+        array $mergedMessages
+    );
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageProcessorLoader.php b/lib/internal/Magento/Framework/MessageQueue/MessageProcessorLoader.php
new file mode 100644
index 00000000000..ae6072e39cf
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageProcessorLoader.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Loads message processor depending on the message type.
+ */
+class MessageProcessorLoader
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorInterface
+     */
+    private $mergedMessageProcessor;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorInterface
+     */
+    private $defaultMessageProcessor;
+
+    /**
+     * @param MessageProcessorInterface $mergedMessageProcessor
+     * @param MessageProcessorInterface $defaultMessageProcessor
+     */
+    public function __construct(
+        MessageProcessorInterface $mergedMessageProcessor,
+        MessageProcessorInterface $defaultMessageProcessor
+    ) {
+        $this->mergedMessageProcessor = $mergedMessageProcessor;
+        $this->defaultMessageProcessor = $defaultMessageProcessor;
+    }
+
+    /**
+     * Loads message processor depending on the message type.
+     *
+     * @param array $messages
+     * @return MessageProcessorInterface
+     */
+    public function load(array $messages)
+    {
+        $message = $this->getMergedMessage($messages);
+
+        return ($message instanceof MergedMessageInterface)
+            ? $this->mergedMessageProcessor : $this->defaultMessageProcessor;
+    }
+
+    /**
+     * Get first message from the list of merged messages.
+     *
+     * @param array $messages
+     * @return mixed|null
+     */
+    private function getMergedMessage(array $messages)
+    {
+        $message = null;
+
+        if ($messages) {
+            $topicMessages = array_shift($messages);
+
+            if ($topicMessages) {
+                $message = array_shift($topicMessages);
+            }
+        }
+
+        return $message;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageStatusProcessor.php b/lib/internal/Magento/Framework/MessageQueue/MessageStatusProcessor.php
new file mode 100644
index 00000000000..a6d97dd1e51
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageStatusProcessor.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Changes messages status.
+ */
+class MessageStatusProcessor
+{
+    /**
+     * Acknowledge all provided messages.
+     *
+     * @param QueueInterface $queue
+     * @param array $messages
+     * @return void
+     */
+    public function acknowledgeMessages(QueueInterface $queue, array $messages)
+    {
+        foreach ($messages as $message) {
+            $queue->acknowledge($message);
+        }
+    }
+
+    /**
+     * Reject all provided messages.
+     *
+     * @param QueueInterface $queue
+     * @param array $messages
+     * @return void
+     */
+    public function rejectMessages(QueueInterface $queue, array $messages)
+    {
+        foreach ($messages as $message) {
+            $queue->reject($message);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php b/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
new file mode 100644
index 00000000000..9bc519fc87e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Class MessageValidator to validate message with topic schema
+ *
+ */
+class MessageValidator
+{
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * Identify message data schema by topic.
+     *
+     * @param string $topic
+     * @param bool $requestType
+     * @return array
+     * @throws LocalizedException
+     */
+    protected function getTopicSchema($topic, $requestType)
+    {
+        $topicConfig = $this->getCommunicationConfig()->getTopic($topic);
+        if ($topicConfig === null) {
+            throw new LocalizedException(new Phrase('Specified topic "%topic" is not declared.', ['topic' => $topic]));
+        }
+        if ($requestType) {
+            return [
+                'schema_type' => $topicConfig[CommunicationConfig::TOPIC_REQUEST_TYPE],
+                'schema_value' => $topicConfig[CommunicationConfig::TOPIC_REQUEST]
+            ];
+        } else {
+            return [
+                'schema_type' => isset($topicConfig[CommunicationConfig::TOPIC_RESPONSE])
+                    ? CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS
+                    : null,
+                'schema_value' => $topicConfig[CommunicationConfig::TOPIC_RESPONSE]
+            ];
+        }
+    }
+
+    /**
+     * Validate message according to the format associated with its topic
+     *
+     * @param string $topic
+     * @param mixed $message
+     * @param bool $requestType
+     * @return void
+     * @throws InvalidArgumentException
+     */
+    public function validate($topic, $message, $requestType = true)
+    {
+        $topicSchema = $this->getTopicSchema($topic, $requestType);
+        if ($topicSchema['schema_type'] == CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS) {
+            $messageDataType = $topicSchema['schema_value'];
+            $this->validateMessage($message, $messageDataType, $topic);
+        } else {
+            /** Validate message according to the method signature associated with the message topic */
+            $message = (array)$message;
+            $isIndexedArray = array_keys($message) === range(0, count($message) - 1);
+            foreach ($topicSchema['schema_value'] as $methodParameterMeta) {
+                $paramName = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_NAME];
+                $paramType = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_TYPE];
+                if ($isIndexedArray) {
+                    $paramPosition = $methodParameterMeta[CommunicationConfig::SCHEMA_METHOD_PARAM_POSITION];
+                    if (isset($message[$paramPosition])) {
+                        $this->validateMessage($message[$paramPosition], $paramType, $topic);
+                    }
+                } else {
+                    if (isset($message[$paramName])) {
+                        if (isset($message[$paramName])) {
+                            $this->validateMessage($message[$paramName], $paramType, $topic);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $message
+     * @param string $messageType
+     * @param string $topic
+     * @return void
+     */
+    protected function validateMessage($message, $messageType, $topic)
+    {
+        if (preg_match_all("/\\\\/", $messageType)) {
+            $this->validateClassType($message, $messageType, $topic);
+        } else {
+            $this->validatePrimitiveType($message, $messageType, $topic);
+        }
+    }
+
+    /**
+     * @param string $message
+     * @param string $messageType
+     * @param string $topic
+     * @return void
+     */
+    protected function validatePrimitiveType($message, $messageType, $topic)
+    {
+        $compareType = $messageType;
+        $realType = $this->getRealType($message);
+        if ($realType == 'array' && count($message) == 0) {
+            return;
+        } elseif ($realType == 'array' && count($message) > 0) {
+            $realType = $this->getRealType($message[0]);
+            $compareType = preg_replace('/\[\]/', '', $messageType);
+        }
+        if ($realType !== $compareType) {
+            throw new InvalidArgumentException(
+                new Phrase(
+                    'Data in topic "%topic" must be of type "%expectedType". '
+                    . '"%actualType" given.',
+                    [
+                        'topic' => $topic,
+                        'expectedType' => $messageType,
+                        'actualType' => $this->getRealType($message)
+                    ]
+                )
+            );
+        }
+    }
+
+    /**
+     * @param string $message
+     * @param string $messageType
+     * @param string $topic
+     * @return void
+     */
+    protected function validateClassType($message, $messageType, $topic)
+    {
+        $origMessage = $message;
+        $compareType = $messageType;
+        $realType = $this->getRealType($message);
+        if ($realType == 'array' && count($message) == 0) {
+            return;
+        } elseif ($realType == 'array' && count($message) > 0) {
+            $message = $message[0];
+            $compareType = preg_replace('/\[\]/', '', $messageType);
+        }
+        if (!($message instanceof $compareType)) {
+            throw new InvalidArgumentException(
+                new Phrase(
+                    'Data in topic "%topic" must be of type "%expectedType". '
+                    . '"%actualType" given.',
+                    [
+                        'topic' => $topic,
+                        'expectedType' => $messageType,
+                        'actualType' => $this->getRealType($origMessage)
+                    ]
+                )
+            );
+        }
+    }
+
+    /**
+     * @param string $message
+     * @return string
+     */
+    private function getRealType($message)
+    {
+        $type = is_object($message) ? get_class($message) : gettype($message);
+        return $type == "integer" ? "int" : $type;
+    }
+
+    /**
+     * Get communication config.
+     *
+     * @return CommunicationConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getCommunicationConfig()
+    {
+        if ($this->communicationConfig === null) {
+            $this->communicationConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                CommunicationConfig::class
+            );
+        }
+        return $this->communicationConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Publisher.php
new file mode 100644
index 00000000000..8fe77abe691
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\Amqp\Config as AmqpConfig;
+use Magento\Framework\MessageQueue\ConfigInterface as MessageQueueConfig;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+
+/**
+ * A MessageQueue Publisher to handle publishing a message.
+ */
+class Publisher implements PublisherInterface
+{
+    /**
+     * @var ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * Help check whether Amqp is configured.
+     *
+     * @var AmqpConfig
+     */
+    private $amqpConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ExchangeRepository $exchangeRepository
+     * @param EnvelopeFactory $envelopeFactory
+     * @param MessageQueueConfig $messageQueueConfig
+     * @param MessageEncoder $messageEncoder
+     * @param MessageValidator $messageValidator
+     * @internal param ExchangeInterface $exchange
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        ExchangeRepository $exchangeRepository,
+        EnvelopeFactory $envelopeFactory,
+        MessageQueueConfig $messageQueueConfig,
+        MessageEncoder $messageEncoder,
+        MessageValidator $messageValidator
+    ) {
+        $this->exchangeRepository = $exchangeRepository;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->messageEncoder = $messageEncoder;
+        $this->messageValidator = $messageValidator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function publish($topicName, $data)
+    {
+        $this->messageValidator->validate($topicName, $data);
+        $data = $this->messageEncoder->encode($topicName, $data);
+        $envelope = $this->envelopeFactory->create(
+            [
+                'body' => $data,
+                'properties' => [
+                    'delivery_mode' => 2,
+                    'message_id' => md5(uniqid($topicName))
+                ]
+            ]
+        );
+        $connectionName = $this->getPublisherConfig()->getPublisher($topicName)->getConnection()->getName();
+        $connectionName = ($connectionName === 'amqp' && !$this->isAmqpConfigured()) ? 'db' : $connectionName;
+        $exchange = $this->exchangeRepository->getByConnectionName($connectionName);
+        $exchange->enqueue($topicName, $envelope);
+        return null;
+    }
+
+    /**
+     * Check Amqp is configured.
+     *
+     * @return bool
+     */
+    private function isAmqpConfigured()
+    {
+        return $this->getAmqpConfig()->getValue(AmqpConfig::HOST) ? true : false;
+    }
+
+    /**
+     * Get publisher config.
+     *
+     * @return PublisherConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getPublisherConfig()
+    {
+        if ($this->publisherConfig === null) {
+            $this->publisherConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(PublisherConfig::class);
+        }
+        return $this->publisherConfig;
+    }
+
+    /**
+     * Get Amqp config instance.
+     *
+     * @return AmqpConfig
+     *
+     * @deprecated
+     */
+    private function getAmqpConfig()
+    {
+        if ($this->amqpConfig === null) {
+            $this->amqpConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(AmqpConfig::class);
+        }
+
+        return $this->amqpConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config.php
new file mode 100644
index 00000000000..8f64ebedfeb
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use \Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem\Iterator;
+
+/**
+ * Publisher config provides access data declared in etc/queue_publisher.xml
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * Publisher config data iterator.
+     *
+     * @var Iterator
+     */
+    private $iterator;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Iterator $iterator
+     */
+    public function __construct(Iterator $iterator)
+    {
+        $this->iterator = $iterator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPublisher($topic)
+    {
+        $publisher = $this->iterator[$topic];
+        if (!$publisher) {
+            throw new LocalizedException(
+                new Phrase("Publisher '%publisher' is not declared.", ['publisher' => $topic])
+            );
+        }
+        return $publisher;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPublishers()
+    {
+        return $this->iterator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeReader.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeReader.php
new file mode 100644
index 00000000000..7c115c53c53
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeReader.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+
+/**
+ * Composite reader for publisher config.
+ */
+class CompositeReader implements ReaderInterface
+{
+    /**
+     * Config validator.
+     *
+     * @var ValidatorInterface
+     */
+    private $validator;
+
+    /**
+     * Config reade list.
+     *
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ValidatorInterface $validator
+     * @param DefaultValueProvider $defaultValueProvider
+     * @param ReaderInterface[] $readers
+     */
+    public function __construct(
+        ValidatorInterface $validator,
+        DefaultValueProvider $defaultValueProvider,
+        array $readers
+    ) {
+        $this->validator = $validator;
+        $this->readers = $readers;
+        $this->defaultValueProvider = $defaultValueProvider;
+    }
+
+    /**
+     * Read config.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        foreach ($this->readers as $reader) {
+            $result = array_replace_recursive($result, $reader->read($scope));
+        }
+
+        $result = $this->addDefaultConnection($result);
+
+        $this->validator->validate($result);
+
+        foreach ($result as $key => &$value) {
+            //Find enabled connection
+            $connection = null;
+            foreach ($value['connections'] as $connectionConfig) {
+                if (!$connectionConfig['disabled']) {
+                    $connection = $connectionConfig;
+                    break;
+                }
+            }
+            $value['connection'] = $connection;
+            unset($value['connections']);
+            $result[$key] = $value;
+        }
+        return $result;
+    }
+
+    /**
+     * Add default connection.
+     *
+     * @param array $config
+     * @return array
+     */
+    private function addDefaultConnection(array $config)
+    {
+        $defaultConnectionName = $this->defaultValueProvider->getConnection();
+        $default = [
+            'name' => $defaultConnectionName,
+            'exchange' => $this->defaultValueProvider->getExchange(),
+            'disabled' => false,
+        ];
+
+        foreach ($config as &$value) {
+            if (!isset($value['connections']) || empty($value['connections'])) {
+                $value['connections'][$defaultConnectionName] = $default;
+                continue;
+            }
+
+            $hasActiveConnection = false;
+            /** Find enabled connection */
+            foreach ($value['connections'] as $connectionConfig) {
+                if (!$connectionConfig['disabled']) {
+                    $hasActiveConnection = true;
+                    break;
+                }
+            }
+            if (!$hasActiveConnection) {
+                $value['connections'][$defaultConnectionName] = $default;
+            }
+        }
+        return $config;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeValidator.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeValidator.php
new file mode 100644
index 00000000000..6021354b37b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/CompositeValidator.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Publisher config data validator.
+ */
+class CompositeValidator implements ValidatorInterface
+{
+    /**
+     * Config validator list.
+     *
+     * @var ValidatorInterface[]
+     */
+    private $validators;
+
+    /**
+     * Validator constructor.
+     *
+     * @param ValidatorInterface[] $validators
+     */
+    public function __construct($validators)
+    {
+        $this->validators = $validators;
+    }
+
+    /**
+     * Validate merged publisher config data.
+     *
+     * @param array $configData
+     * @throws \LogicException
+     * @return void
+     * @throws \LogicException
+     */
+    public function validate($configData)
+    {
+        foreach ($this->validators as $validator) {
+            if (!$validator instanceof ValidatorInterface) {
+                throw new \LogicException(
+                    sprintf(
+                        'Validator [%s] does not implements ' .
+                        'Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface',
+                        get_class($validator)
+                    )
+                );
+            }
+            $validator->validate($configData);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Data.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Data.php
new file mode 100644
index 00000000000..ae7552bf574
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Data.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Publisher config data storage. Caches merged config.
+ */
+class Data extends \Magento\Framework\Config\Data
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        ReaderInterface $reader,
+        \Magento\Framework\Config\CacheInterface $cache,
+        $cacheId = 'message_queue_publisher_config_cache',
+        SerializerInterface $serializer = null
+    ) {
+        parent::__construct($reader, $cache, $cacheId, $serializer);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Env/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Env/Reader.php
new file mode 100644
index 00000000000..77926917bf0
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Env/Reader.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Publisher\Config\Env;
+
+use Magento\Framework\MessageQueue\Config\Data as MessageQueueConfigData;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\MessageQueue\Config\Reader\Env as MessageQueueEnvReader;
+
+/**
+ * Publisher configuration reader. Reads data from env.php.
+ */
+class Reader implements \Magento\Framework\Config\ReaderInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Env
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var MessageQueueConfigData
+     */
+    private $configData;
+
+    /**
+     * Mapping between default publishers name and connections
+     *
+     * @var array
+     */
+    private $publisherNameToConnectionMap;
+
+    /**
+     * @param DeploymentConfig $deploymentConfig
+     * @param MessageQueueConfigData $configData
+     * @param array $publisherNameToConnectionMap
+     */
+    public function __construct(
+        DeploymentConfig $deploymentConfig,
+        MessageQueueConfigData $configData,
+        $publisherNameToConnectionMap = []
+    ) {
+        $this->deploymentConfig = $deploymentConfig;
+        $this->configData = $configData;
+        $this->publisherNameToConnectionMap = $publisherNameToConnectionMap;
+    }
+
+    /**
+     * Read publisher configuration from env.php
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $configData = $this->deploymentConfig->getConfigData(MessageQueueEnvReader::ENV_QUEUE);
+        if (isset($configData['config'])) {
+            $configData = isset($configData['config'][MessageQueueEnvReader::ENV_PUBLISHERS])
+                ? $configData['config'][MessageQueueEnvReader::ENV_PUBLISHERS]
+                : [];
+        } else {
+            $configData = isset($configData[MessageQueueEnvReader::ENV_PUBLISHERS])
+                ? $this->convertConfigData($scope)
+                : [];
+        }
+        return $configData;
+    }
+
+    /**
+     * Convert publisher related data to publisher config format
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    private function convertConfigData($scope)
+    {
+        $configData = [];
+        $topicsConfig = $this->configData->get('topics');
+        foreach ($topicsConfig as $topicName => $topicConfig) {
+            $configData[$topicName] = [];
+            if (isset($topicConfig['disabled'])) {
+                $configData[$topicName]['disabled'] = $topicConfig['disabled'];
+            }
+            $publisherName = $this->configData->get('topics/' . $topicName . '/publisher', $scope);
+            $config = $this->configData->get('publishers/' . $publisherName, $scope);
+            if (!empty($config) && isset($this->publisherNameToConnectionMap[$publisherName])) {
+                $connectionName = $this->publisherNameToConnectionMap[$publisherName];
+                $config['name'] = $config['connection'];
+                unset($config['connection']);
+                $disabled = isset($config['disabled']) ? $config['disabled'] : false;
+                $config['disabled'] = $disabled;
+                $configData[$topicName]['connections'][$connectionName] = $config;
+            }
+        }
+        return $configData;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem.php
new file mode 100644
index 00000000000..426d39efd94
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * {@inheritdoc}
+ */
+class PublisherConfigItem implements PublisherConfigItemInterface
+{
+    /**
+     * Publisher topic name.
+     *
+     * @var string
+     */
+    private $topic;
+
+    /**
+     * Publisher connection.
+     *
+     * @var PublisherConnectionInterface
+     */
+    private $connection;
+
+    /**
+     * Flag. Is publisher disabled.
+     *
+     * @var bool
+     */
+    private $isDisabled;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param PublisherConnectionFactory $connectionFactory
+     */
+    public function __construct(PublisherConnectionFactory $connectionFactory)
+    {
+        $this->connection = $connectionFactory->create();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTopic()
+    {
+        return $this->topic;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDisabled()
+    {
+        return $this->isDisabled;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * Set publisher config item data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->topic = $data['topic'];
+        $this->isDisabled = $data['disabled'];
+        $this->connection->setData($data['connection']);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem/Iterator.php
new file mode 100644
index 00000000000..f0414edfc0c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem/Iterator.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem;
+
+use Magento\Framework\MessageQueue\Publisher\Config\Data;
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem;
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemFactory;
+
+/**
+ * Publisher config data iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Publisher config item.
+     *
+     * @var PublisherConfigItem
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Data $configData
+     * @param PublisherConfigItemFactory $itemFactory
+     */
+    public function __construct(Data $configData, PublisherConfigItemFactory $itemFactory)
+    {
+        $this->data = $configData->get();
+        $this->object = $itemFactory->create();
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return PublisherConfigItem
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+            if ($this->current()->isDisabled()) {
+                $this->next();
+            }
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+            if ($this->current()->isDisabled()) {
+                $this->next();
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset) || $this->data[$offset]['disabled'] == true) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemFactory.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemFactory.php
new file mode 100644
index 00000000000..c7e1577ed8c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem
+ */
+class PublisherConfigItemFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = PublisherConfigItem::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemInterface.php
new file mode 100644
index 00000000000..c9f583ddb7f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItemInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Instances of this class represent config items declared in etc/queue_publisher.xsd
+ */
+interface PublisherConfigItemInterface
+{
+    /**
+     * Get publisher name.
+     *
+     * @return string
+     */
+    public function getTopic();
+
+    /**
+     * Check if connection disabled.
+     *
+     * @return bool
+     */
+    public function isDisabled();
+
+    /**
+     * Get publisher connection.
+     *
+     * @return PublisherConnectionInterface
+     */
+    public function getConnection();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnection.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnection.php
new file mode 100644
index 00000000000..54244874720
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnection.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Representation of publisher connection configuration.
+ */
+class PublisherConnection implements PublisherConnectionInterface
+{
+    /**
+     * Connection name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Exchange name.
+     *
+     * @var string
+     */
+    private $exchange;
+
+    /**
+     * Flag. Is connection disabled.
+     *
+     * @var bool
+     */
+    private $isDisabled;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getExchange()
+    {
+        return $this->exchange;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDisabled()
+    {
+        return $this->isDisabled;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setData(array $data)
+    {
+        $this->name = $data['name'];
+        $this->exchange = $data['exchange'];
+        $this->isDisabled = $data['disabled'];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionFactory.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionFactory.php
new file mode 100644
index 00000000000..a2b51ecb0e2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface
+ */
+class PublisherConnectionFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = PublisherConnection::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\MessageQueue\Publisher\Config\PublisherConnection
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionInterface.php
new file mode 100644
index 00000000000..71ad8c6beae
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConnectionInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Representation of publisher connection configuration.
+ */
+interface PublisherConnectionInterface
+{
+    /**
+     * Get Connection name.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get exchange name.
+     *
+     * @return string
+     */
+    public function getExchange();
+
+    /**
+     * Check if connection disabled.
+     *
+     * @return bool
+     */
+    public function isDisabled();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ReaderInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ReaderInterface.php
new file mode 100644
index 00000000000..669daef963a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ReaderInterface.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Publisher config reader interface
+ */
+interface ReaderInterface extends \Magento\Framework\Config\ReaderInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/RemoteService/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/RemoteService/Reader.php
new file mode 100644
index 00000000000..656ed545018
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/RemoteService/Reader.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\RemoteService;
+
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\Publisher\Config\ReaderInterface;
+use Magento\Framework\ObjectManager\ConfigInterface as ObjectManagerConfig;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+
+/**
+ * Reader for queue publisher configs based on remote service declaration in DI configs.
+ */
+class Reader implements ReaderInterface
+{
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * @var ObjectManagerConfig
+     */
+    private $objectManagerConfig;
+
+    /**
+     * @var ReflectionGenerator
+     */
+    private $reflectionGenerator;
+
+    /**
+     * @var ServiceMethodsMap
+     */
+    private $serviceMethodsMap;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param DefaultValueProvider $defaultValueProvider
+     * @param ObjectManagerConfig $objectManagerConfig
+     * @param ReflectionGenerator $reflectionGenerator
+     * @param ServiceMethodsMap $serviceMethodsMap
+     */
+    public function __construct(
+        DefaultValueProvider $defaultValueProvider,
+        ObjectManagerConfig $objectManagerConfig,
+        ReflectionGenerator $reflectionGenerator,
+        ServiceMethodsMap $serviceMethodsMap
+    ) {
+        $this->defaultValueProvider = $defaultValueProvider;
+        $this->objectManagerConfig = $objectManagerConfig;
+        $this->reflectionGenerator = $reflectionGenerator;
+        $this->serviceMethodsMap = $serviceMethodsMap;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        $connectionName = $this->defaultValueProvider->getConnection();
+        $connections = [
+            $connectionName => [
+                'name' => $connectionName,
+                'exchange' => $this->defaultValueProvider->getExchange(),
+                'disabled' => false,
+            ]
+        ];
+        foreach ($this->getRemoteServices() as $serviceInterface => $remoteImplementation) {
+            try {
+                $methodsMap = $this->serviceMethodsMap->getMethodsMap($serviceInterface);
+            } catch (\Exception $e) {
+                throw new \LogicException(sprintf('Service interface was expected, "%s" given', $serviceInterface));
+            }
+            foreach ($methodsMap as $methodName => $returnType) {
+                $topic = $this->reflectionGenerator->generateTopicName($serviceInterface, $methodName);
+                $result[$topic] = [
+                    'topic' => $topic,
+                    'disabled' => false,
+                    'connections' => $connections,
+
+                ];
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Get list of remote services declared in DI config.
+     *
+     * @return array
+     */
+    private function getRemoteServices()
+    {
+        $preferences = $this->objectManagerConfig->getPreferences();
+        $remoteServices = [];
+        foreach ($preferences as $type => $preference) {
+            if ($preference == $type . RemoteServiceGenerator::REMOTE_SERVICE_SUFFIX) {
+                $remoteServices[$type] = $preference;
+            }
+        }
+        return $remoteServices;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/EnabledConnection.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/EnabledConnection.php
new file mode 100644
index 00000000000..01a0dff3cc7
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/EnabledConnection.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\Validator;
+
+use Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface;
+
+/**
+ * Publisher config data validator. Validates that publisher has only one enabled connection at the same time
+ */
+class EnabledConnection implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        $errors = [];
+        foreach ($configData as $name => $publisherData) {
+            if (!isset($publisherData['connections'])) {
+                continue;
+            }
+            $enabledConnections = 0;
+            foreach ($publisherData['connections'] as $connectionConfig) {
+                if ($connectionConfig['disabled'] == false) {
+                    $enabledConnections++;
+                }
+            }
+
+            if ($enabledConnections > 1) {
+                $errors[] = sprintf('More than 1 enabled connections configured for publisher %s.', $name);
+            }
+        }
+
+        if (!empty($errors)) {
+            throw new \LogicException(implode(' ', $errors));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/Format.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/Format.php
new file mode 100644
index 00000000000..10f80436493
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Validator/Format.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\Validator;
+
+use Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface;
+
+/**
+ * Publisher config data validator. Validates that publisher config has all required fields.
+ */
+class Format implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        $requiredPublisherFields = ['topic', 'disabled', 'connections'];
+        $requiredConnectionFields = ['name', 'disabled', 'exchange'];
+
+        $errors = [];
+        foreach ($configData as $name => $publisherData) {
+            $diff = array_diff($requiredPublisherFields, array_keys($publisherData));
+            foreach ($diff as $field) {
+                $errors[] = sprintf('Missing %s field for publisher %s.', $field, $name);
+            }
+
+            if (!array_key_exists('connections', $publisherData) || !is_array($publisherData['connections'])) {
+                $errors[] = sprintf('Invalid connections format for publisher %s.', $name);
+                continue;
+            }
+
+            foreach ($publisherData['connections'] as $connectionConfig) {
+                $diff = array_diff($requiredConnectionFields, array_keys($connectionConfig));
+                foreach ($diff as $field) {
+                    $errors[] = sprintf('Missing %s field for publisher %s in connection config.', $field, $name);
+                }
+            }
+        }
+
+        if (!empty($errors)) {
+            throw new \LogicException(implode(' ', $errors));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ValidatorInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ValidatorInterface.php
new file mode 100644
index 00000000000..8f210f44039
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/ValidatorInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config;
+
+/**
+ * Publisher config data validator.
+ */
+interface ValidatorInterface
+{
+    /**
+     * Validate publisher config data.
+     *
+     * @param array $configData
+     * @throws \LogicException
+     * @return void
+     */
+    public function validate($configData);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Converter.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Converter.php
new file mode 100644
index 00000000000..10fc9716cb6
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Converter.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\Xml;
+
+use Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+
+/**
+ * Converts MessageQueue publishers config from \DOMDocument to array
+ */
+class Converter implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * Boolean value converter.
+     *
+     * @var BooleanUtils
+     */
+    private $booleanUtils;
+
+    /**
+     * Default value provider.
+     *
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param BooleanUtils $booleanUtils
+     * @param DefaultValueProvider $defaultValueProvider
+     */
+    public function __construct(BooleanUtils $booleanUtils, DefaultValueProvider $defaultValueProvider)
+    {
+        $this->booleanUtils = $booleanUtils;
+        $this->defaultValueProvider = $defaultValueProvider;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convert($source)
+    {
+        $result = [];
+        /** @var $publisherConfig \DOMElement */
+        foreach ($source->getElementsByTagName('publisher') as $publisherConfig) {
+            $topic = $this->getAttributeValue($publisherConfig, 'topic');
+
+            $connections = [];
+            /** @var \DOMNode $connectionConfig */
+            foreach ($publisherConfig->childNodes as $connectionConfig) {
+                if ($connectionConfig->nodeName != 'connection' || $connectionConfig->nodeType != XML_ELEMENT_NODE) {
+                    continue;
+                }
+                $connectionName = $this->getAttributeValue($connectionConfig, 'name');
+                if (!$connectionName) {
+                    throw new \InvalidArgumentException('Connection name is missing');
+                }
+                $exchangeName = $this->getAttributeValue(
+                    $connectionConfig,
+                    'exchange',
+                    $this->defaultValueProvider->getExchange()
+                );
+                $isDisabled = $this->getAttributeValue($connectionConfig, 'disabled', false);
+                $connections[$connectionName] = [
+                    'name' => $connectionName,
+                    'exchange' => $exchangeName,
+                    'disabled' => $this->booleanUtils->toBoolean($isDisabled),
+                ];
+            }
+            $isDisabled = $this->getAttributeValue($publisherConfig, 'disabled', false);
+            $result[$topic] = [
+                'topic' => $topic,
+                'disabled' => $this->booleanUtils->toBoolean($isDisabled),
+                'connections' => $connections,
+
+            ];
+        }
+        return $result;
+    }
+
+    /**
+     * Get attribute value of the given node
+     *
+     * @param \DOMNode $node
+     * @param string $attributeName
+     * @param mixed $default
+     * @return string|null
+     */
+    private function getAttributeValue(\DOMNode $node, $attributeName, $default = null)
+    {
+        $item = $node->attributes->getNamedItem($attributeName);
+        return $item ? $item->nodeValue : $default;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Reader.php
new file mode 100644
index 00000000000..6a6625423f3
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Reader.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\Xml;
+
+use \Magento\Framework\MessageQueue\Publisher\Config\ReaderInterface;
+
+/**
+ * Reader for etc/queue_publisher.xml configs.
+ */
+class Reader extends \Magento\Framework\Config\Reader\Filesystem implements ReaderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $_idAttributes = [
+        '/config/publisher' => 'topic',
+        '/config/publisher/connection' => 'name'
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        \Magento\Framework\Config\FileResolverInterface $fileResolver,
+        Converter $converter,
+        SchemaLocator $schemaLocator,
+        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        $fileName = 'queue_publisher.xml',
+        $idAttributes = [],
+        $domDocumentClass = \Magento\Framework\Config\Dom::class,
+        $defaultScope = 'global'
+    ) {
+        parent::__construct(
+            $fileResolver,
+            $converter,
+            $schemaLocator,
+            $validationState,
+            $fileName,
+            $idAttributes,
+            $domDocumentClass,
+            $defaultScope
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/SchemaLocator.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/SchemaLocator.php
new file mode 100644
index 00000000000..aa9b2127f0e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/SchemaLocator.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher\Config\Xml;
+
+/**
+ * Schema locator for etc/queue_publisher.xml
+ */
+class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    protected $schema;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     *
+     * @var string
+     */
+    protected $perFileSchema;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
+     */
+    public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
+    {
+        $this->schema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/publisher.xsd');
+        $this->perFileSchema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/publisher.xsd');
+    }
+
+    /**
+     * Get path to merged config schema
+     *
+     * @return string|null
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * Get path to per file validation schema
+     *
+     * @return string|null
+     */
+    public function getPerFileSchema()
+    {
+        return $this->perFileSchema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/ConfigInterface.php
new file mode 100644
index 00000000000..7b5586b28a2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/ConfigInterface.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Publisher;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemInterface;
+
+/**
+ * Publisher config interface provides access data declared in etc/queue_publisher.xml
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ConfigInterface
+{
+    /**
+     * Get publisher configuration by topic.
+     *
+     * @param string $topic
+     * @return PublisherConfigItemInterface
+     * @throws LocalizedException
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getPublisher($topic);
+
+    /**
+     * Get list of all publishers declared in the system.
+     *
+     * @return PublisherConfigItemInterface[]
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getPublishers();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php b/lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php
new file mode 100644
index 00000000000..1aee963b1bd
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Producer to publish messages via a specific transport to a specific queue or exchange.
+ *
+ * @api
+ */
+interface PublisherInterface
+{
+    /**
+     * Publishes a message to a specific queue or exchange.
+     *
+     * @param string $topicName
+     * @param array|object $data
+     * @return null|mixed
+     * @throws \InvalidArgumentException If message is not formed properly
+     */
+    public function publish($topicName, $data);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/PublisherPool.php b/lib/internal/Magento/Framework/MessageQueue/PublisherPool.php
new file mode 100644
index 00000000000..2c1e4e64c7d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/PublisherPool.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+
+/**
+ * Publishers pool.
+ *
+ * @api
+ * @since 100.1.0
+ */
+class PublisherPool implements PublisherInterface, BulkPublisherInterface
+{
+    const MODE_SYNC = 'sync';
+    const MODE_ASYNC = 'async';
+
+    /**
+     * @deprecated
+     */
+    const TYPE = 'type';
+
+    /**
+     * @deprecated
+     */
+    const CONNECTION_NAME = 'connectionName';
+
+    /**
+     * Publisher objects pool.
+     *
+     * @var \Magento\Framework\MessageQueue\PublisherInterface[]
+     * @since 100.1.0
+     */
+    protected $publishers = [];
+
+    /**
+     * Communication config.
+     *
+     * @var CommunicationConfig
+     * @since 100.1.0
+     */
+    protected $communicationConfig;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param CommunicationConfig $communicationConfig
+     * @param QueueConfig $queueConfig
+     * @param string[] $publishers
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @since 100.1.0
+     */
+    public function __construct(
+        CommunicationConfig $communicationConfig,
+        QueueConfig $queueConfig,
+        array $publishers
+    ) {
+        $this->communicationConfig = $communicationConfig;
+        $this->initializePublishers($publishers);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.1.0
+     */
+    public function publish($topicName, $data)
+    {
+        $publisherType = $this->communicationConfig->getTopic($topicName)[CommunicationConfig::TOPIC_IS_SYNCHRONOUS]
+            ? self::MODE_SYNC
+            : self::MODE_ASYNC;
+        $connectionName = $this->getPublisherConfig()->getPublisher($topicName)->getConnection()->getName();
+        $publisher = $this->getPublisherForConnectionNameAndType($publisherType, $connectionName);
+        return $publisher->publish($topicName, $data);
+    }
+
+    /**
+     * Initialize publisher objects pool.
+     *
+     * @param array $publishers
+     * @return void
+     */
+    private function initializePublishers(array $publishers)
+    {
+        $asyncPublishers = isset($publishers[self::MODE_ASYNC]) ? $publishers[self::MODE_ASYNC] : [];
+        $syncPublishers = isset($publishers[self::MODE_SYNC]) ? $publishers[self::MODE_SYNC] : [];
+        foreach ($asyncPublishers as $connectionType => $publisher) {
+            $this->addPublisherToPool(
+                self::MODE_ASYNC,
+                $connectionType,
+                $publisher
+            );
+        }
+        foreach ($syncPublishers as $connectionType => $publisher) {
+            $this->addPublisherToPool(
+                self::MODE_SYNC,
+                $connectionType,
+                $publisher
+            );
+        }
+    }
+
+    /**
+     * Add publisher.
+     *
+     * @param string $type
+     * @param string $connectionType
+     * @param PublisherInterface $publisher
+     * @return $this
+     */
+    private function addPublisherToPool($type, $connectionType, PublisherInterface $publisher)
+    {
+        $this->publishers[$type][$connectionType] = $publisher;
+        return $this;
+    }
+
+    /**
+     * Return an instance of a publisher for a connection name.
+     *
+     * @param string $type
+     * @param string $connectionName
+     * @return PublisherInterface
+     * @throws \LogicException
+     * @throws \InvalidArgumentException
+     */
+    private function getPublisherForConnectionNameAndType($type, $connectionName)
+    {
+        $connectionType = $this->getConnectionTypeResolver()->getConnectionType($connectionName);
+        if (!isset($this->publishers[$type])) {
+            throw new \InvalidArgumentException('Unknown publisher type ' . $type);
+        }
+
+        if (!isset($this->publishers[$type][$connectionType])) {
+            throw new \LogicException(
+                sprintf(
+                    'Could not find an implementation type for type "%s" and connection "%s".',
+                    $type,
+                    $connectionName
+                )
+            );
+        }
+        return $this->publishers[$type][$connectionType];
+    }
+
+    /**
+     * Get publisher config.
+     *
+     * @return PublisherConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getPublisherConfig()
+    {
+        if ($this->publisherConfig === null) {
+            $this->publisherConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(PublisherConfig::class);
+        }
+        return $this->publisherConfig;
+    }
+
+    /**
+     * Get connection type resolver.
+     *
+     * @return ConnectionTypeResolver
+     *
+     * @deprecated 100.2.0
+     */
+    private function getConnectionTypeResolver()
+    {
+        if ($this->connectionTypeResolver === null) {
+            $this->connectionTypeResolver = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(ConnectionTypeResolver::class);
+        }
+        return $this->connectionTypeResolver;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueFactory.php b/lib/internal/Magento/Framework/MessageQueue/QueueFactory.php
new file mode 100644
index 00000000000..eb734df06a5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueFactory.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Queuenterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+class QueueFactory implements QueueFactoryInterface
+{
+    /**
+     * @var QueueFactoryInterface[]
+     */
+    private $queueFactories;
+
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     * @since 100.2.0
+     */
+    protected $objectManager = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ConnectionTypeResolver $connectionTypeResolver
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param QueueFactoryInterface[] $queueFactories
+     * @since 100.2.0
+     */
+    public function __construct(
+        ConnectionTypeResolver $connectionTypeResolver,
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        array $queueFactories = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->queueFactories = $queueFactories;
+        $this->connectionTypeResolver = $connectionTypeResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @since 100.2.0
+     */
+    public function create($queueName, $connectionName)
+    {
+        $connectionType = $this->connectionTypeResolver->getConnectionType($connectionName);
+        if (!isset($this->queueFactories[$connectionType])) {
+            throw new \LogicException("Not found queue for connection name '{$connectionName}' in config");
+        }
+        $factory = $this->queueFactories[$connectionType];
+        $queue = $factory->create($queueName, $connectionName);
+
+        if (!$queue instanceof QueueInterface) {
+            $queueInterface = \Magento\Framework\MessageQueue\QueueInterface::class;
+            throw new \LogicException(
+                "Queue for connection name '{$connectionName}' does not implement interface '{$queueInterface}'"
+            );
+        }
+        return $queue;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueFactoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/QueueFactoryInterface.php
new file mode 100644
index 00000000000..697db9296b5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueFactoryInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\QueueInterface
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface QueueFactoryInterface
+{
+    /**
+     * Create queue instance.
+     *
+     * @param string $queueName
+     * @param string $connectionName
+     * @return QueueInterface
+     * @since 100.2.0
+     */
+    public function create($queueName, $connectionName);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueInterface.php b/lib/internal/Magento/Framework/MessageQueue/QueueInterface.php
new file mode 100644
index 00000000000..1b3814b8e85
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueInterface.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Interface for interaction with message queue.
+ *
+ * @api
+ */
+interface QueueInterface
+{
+    /**
+     * Get message from queue
+     *
+     * @return EnvelopeInterface
+     */
+    public function dequeue();
+
+    /**
+     * Acknowledge message delivery
+     *
+     * @param EnvelopeInterface $envelope
+     * @return void
+     */
+    public function acknowledge(EnvelopeInterface $envelope);
+
+    /**
+     * Wait for messages and dispatch them
+     *
+     * @param callable|array $callback
+     * @return void
+     */
+    public function subscribe($callback);
+
+    /**
+     * Reject message
+     *
+     * @param EnvelopeInterface $envelope
+     * @param bool $requeue
+     * @param string $rejectionMessage
+     * @return void
+     */
+    public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null);
+
+    /**
+     * Push message to queue directly, without using exchange
+     *
+     * @param EnvelopeInterface $envelope
+     * @return void
+     * @since 100.1.0
+     */
+    public function push(EnvelopeInterface $envelope);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueRepository.php b/lib/internal/Magento/Framework/MessageQueue/QueueRepository.php
new file mode 100644
index 00000000000..5d04003c9ad
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueRepository.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue;
+
+/**
+ * Queue factory
+ */
+class QueueRepository
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var QueueInterface[]
+     */
+    private $queueInstances;
+
+    /**
+     * @var QueueFactoryInterface
+     */
+    private $queueFactory;
+
+    /**
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string[] $queues
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, array $queues = [])
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Get queue instance by connection name and queue name.
+     *
+     * @param string $connectionName
+     * @param string $queueName
+     * @return QueueInterface
+     * @throws \LogicException
+     */
+    public function get($connectionName, $queueName)
+    {
+        if (!isset($this->queueInstances[$connectionName][$queueName])) {
+            $queue = $this->getQueueFactory()->create($queueName, $connectionName);
+            $this->queueInstances[$connectionName][$queueName] = $queue;
+        }
+        return $this->queueInstances[$connectionName][$queueName];
+    }
+
+    /**
+     * Get queue factory.
+     *
+     * @return QueueFactoryInterface
+     * @deprecated 100.2.0
+     */
+    private function getQueueFactory()
+    {
+        if ($this->queueFactory === null) {
+            $this->queueFactory = $this->objectManager->get(QueueFactoryInterface::class);
+        }
+        return $this->queueFactory;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/README.md b/lib/internal/Magento/Framework/MessageQueue/README.md
new file mode 100644
index 00000000000..9708d30102f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/README.md
@@ -0,0 +1 @@
+This component is designed to provide Message Queue Framework 
diff --git a/lib/internal/Magento/Framework/MessageQueue/Rpc/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Rpc/Consumer.php
new file mode 100644
index 00000000000..10ef24c4628
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Rpc/Consumer.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Rpc;
+
+/**
+ * A MessageQueue Consumer to handle receiving, processing and replying to an RPC message.
+ *
+ * @deprecated 100.2.0
+ */
+class Consumer extends \Magento\Framework\MessageQueue\Consumer
+{
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php
new file mode 100644
index 00000000000..89b987cbb44
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Rpc;
+
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Magento\Framework\MessageQueue\ExchangeRepository;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+
+/**
+ * A MessageQueue Publisher to handle publishing a message.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Publisher implements PublisherInterface
+{
+    /**
+     * @var ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var ResponseQueueNameBuilder
+     */
+    private $responseQueueNameBuilder;
+
+    /**
+     * @var PublisherConfig
+     */
+    private $publisherConfig;
+
+    //@codingStandardsIgnoreStart
+    /**
+     * Initialize dependencies.
+     *
+     * @param ExchangeRepository $exchangeRepository
+     * @param EnvelopeFactory $envelopeFactory
+     * @param null $messageQueueConfig @deprecated obsolete dependency
+     * @param null $amqpConfig @deprecated obsolete dependency
+     * @param MessageEncoder $messageEncoder
+     * @param MessageValidator $messageValidator
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        ExchangeRepository $exchangeRepository,
+        EnvelopeFactory $envelopeFactory,
+        $messageQueueConfig = null,
+        $amqpConfig = null,
+        MessageEncoder $messageEncoder,
+        MessageValidator $messageValidator
+    ) {
+        $this->exchangeRepository = $exchangeRepository;
+        $this->envelopeFactory = $envelopeFactory;
+        $this->messageEncoder = $messageEncoder;
+        $this->messageValidator = $messageValidator;
+    }
+    //@codingStandardsIgnoreEnd
+
+    /**
+     * {@inheritdoc}
+     */
+    public function publish($topicName, $data)
+    {
+        $this->messageValidator->validate($topicName, $data);
+        $data = $this->messageEncoder->encode($topicName, $data);
+        $replyTo = $this->getResponseQueueNameBuilder()->getQueueName($topicName);
+        $envelope = $this->envelopeFactory->create(
+            [
+                'body' => $data,
+                'properties' => [
+                    'reply_to' => $replyTo,
+                    'delivery_mode' => 2,
+                    'correlation_id' => rand(),
+                    'message_id' => md5(uniqid($topicName))
+                ]
+            ]
+        );
+        $connectionName = $this->getPublisherConfig()->getPublisher($topicName)->getConnection()->getName();
+        $exchange = $this->exchangeRepository->getByConnectionName($connectionName);
+        $responseMessage = $exchange->enqueue($topicName, $envelope);
+        return $this->messageEncoder->decode($topicName, $responseMessage, false);
+    }
+
+    /**
+     * Get response queue name builder.
+     *
+     * @return ResponseQueueNameBuilder
+     *
+     * @deprecated 100.2.0
+     */
+    private function getResponseQueueNameBuilder()
+    {
+        if ($this->responseQueueNameBuilder === null) {
+            $this->responseQueueNameBuilder = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(ResponseQueueNameBuilder::class);
+        }
+        return $this->responseQueueNameBuilder;
+    }
+
+    /**
+     * Get publisher config.
+     *
+     * @return PublisherConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getPublisherConfig()
+    {
+        if ($this->publisherConfig === null) {
+            $this->publisherConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(PublisherConfig::class);
+        }
+        return $this->publisherConfig;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Rpc/ResponseQueueNameBuilder.php b/lib/internal/Magento/Framework/MessageQueue/Rpc/ResponseQueueNameBuilder.php
new file mode 100644
index 00000000000..8115a5f6ee2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Rpc/ResponseQueueNameBuilder.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Rpc;
+
+class ResponseQueueNameBuilder
+{
+    /**
+     * Response queue name prefix
+     */
+    const RESPONSE_QUEUE_PREFIX = 'responseQueue.';
+
+    /**
+     * Get response queue name.
+     *
+     * @param string $topicName
+     * @return string
+     */
+    public function getQueueName($topicName)
+    {
+        return self::RESPONSE_QUEUE_PREFIX . str_replace('-', '_', $topicName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/BatchConsumerTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/BatchConsumerTest.php
new file mode 100644
index 00000000000..32120e12cf6
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/BatchConsumerTest.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+/**
+ * Unit test for BatchConsumer class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BatchConsumerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\ConsumerConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configuration;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageEncoder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\QueueRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queueRepository;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MergerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mergerFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $consumerConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageController|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageController;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\BatchConsumer
+     */
+    private $batchConsumer;
+
+    /**
+     * @var int
+     */
+    private $batchSize = 10;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorLoader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageProcessorLoader;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configuration = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageEncoder = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageEncoder::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queueRepository = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueRepository::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->mergerFactory = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergerFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()->getMock();
+        $this->resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageProcessorLoader = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageProcessorLoader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->batchConsumer = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\BatchConsumer::class,
+            [
+                'configuration' => $this->configuration,
+                'messageEncoder' => $this->messageEncoder,
+                'queueRepository' => $this->queueRepository,
+                'mergerFactory' => $this->mergerFactory,
+                'resource' => $this->resource,
+                'batchSize' => $this->batchSize,
+                'messageProcessorLoader' => $this->messageProcessorLoader
+            ]
+        );
+
+        $this->consumerConfig = $this->getMockBuilder(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $objectManager->setBackwardCompatibleProperty(
+            $this->batchConsumer,
+            'consumerConfig',
+            $this->consumerConfig
+        );
+        $this->messageController = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageController::class)
+            ->disableOriginalConstructor()->getMock();
+        $objectManager->setBackwardCompatibleProperty(
+            $this->batchConsumer,
+            'messageController',
+            $this->messageController
+        );
+    }
+
+    /**
+     * Test for process().
+     *
+     * @return void
+     */
+    public function testProcess()
+    {
+        $queueName = 'queue.name';
+        $consumerName = 'consumerName';
+        $connectionName = 'connection_name';
+        $topicName = 'topicName';
+        $messageBody = 'messageBody';
+        $message = ['message_data'];
+        $numberOfMessages = 2;
+        $this->configuration->expects($this->once())->method('getQueueName')->willReturn($queueName);
+        $this->configuration->expects($this->atLeastOnce())->method('getConsumerName')->willReturn($consumerName);
+        $consumerConfigItem = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->consumerConfig->expects($this->once())
+            ->method('getConsumer')->with($consumerName)->willReturn($consumerConfigItem);
+        $consumerConfigItem->expects($this->once())->method('getConnection')->willReturn($connectionName);
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queueRepository->expects($this->once())
+            ->method('get')->with($connectionName, $queueName)->willReturn($queue);
+        $merger = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->mergerFactory->expects($this->once())->method('create')->with($consumerName)->willReturn($merger);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $queue->expects($this->exactly($numberOfMessages))->method('dequeue')->willReturn($envelope);
+        $this->messageController->expects($this->exactly($numberOfMessages))
+            ->method('lock')->with($envelope, $consumerName);
+        $envelope->expects($this->exactly($numberOfMessages))
+            ->method('getProperties')->willReturn(['topic_name' => $topicName]);
+        $envelope->expects($this->exactly($numberOfMessages))
+            ->method('getBody')->willReturn($messageBody);
+        $this->messageEncoder->expects($this->exactly($numberOfMessages))
+            ->method('decode')->with($topicName, $messageBody)->willReturn($message);
+        $messageProcessor = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->messageProcessorLoader->expects($this->atLeastOnce())->method('load')->willReturn($messageProcessor);
+        $merger->expects($this->once())->method('merge')
+            ->with([$topicName => [$message, $message]])->willReturnArgument(0);
+
+        $this->batchConsumer->process($numberOfMessages);
+    }
+
+    /**
+     * Test for process() with MessageLockException.
+     *
+     * @return void
+     */
+    public function testProcessWithMessageLockException()
+    {
+        $queueName = 'queue.name';
+        $consumerName = 'consumerName';
+        $connectionName = 'connection_name';
+        $numberOfMessages = 2;
+        $this->configuration->expects($this->once())->method('getQueueName')->willReturn($queueName);
+        $this->configuration->expects($this->atLeastOnce())->method('getConsumerName')->willReturn($consumerName);
+        $consumerConfigItem = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->consumerConfig->expects($this->once())
+            ->method('getConsumer')->with($consumerName)->willReturn($consumerConfigItem);
+        $consumerConfigItem->expects($this->once())->method('getConnection')->willReturn($connectionName);
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queueRepository->expects($this->once())
+            ->method('get')->with($connectionName, $queueName)->willReturn($queue);
+        $merger = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->mergerFactory->expects($this->once())->method('create')->with($consumerName)->willReturn($merger);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $queue->expects($this->exactly($numberOfMessages))->method('dequeue')->willReturn($envelope);
+        $exception = new \Magento\Framework\MessageQueue\MessageLockException(__('Exception Message'));
+        $this->messageController->expects($this->atLeastOnce())
+            ->method('lock')->with($envelope, $consumerName)->willThrowException($exception);
+        $messageProcessor = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->messageProcessorLoader->expects($this->atLeastOnce())->method('load')->willReturn($messageProcessor);
+        $merger->expects($this->once())->method('merge')->willReturn([]);
+
+        $this->batchConsumer->process($numberOfMessages);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeFactoryTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeFactoryTest.php
new file mode 100644
index 00000000000..fd8ccb86d97
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeFactoryTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Bulk;
+
+/**
+ * Unit test for ExchangeFactory.
+ */
+class ExchangeFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\ConnectionTypeResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionTypeResolver;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $amqpExchangeFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeFactory
+     */
+    private $exchangeFactory;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->connectionTypeResolver = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\ConnectionTypeResolver::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $this->amqpExchangeFactory = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\ExchangeFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->exchangeFactory = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Bulk\ExchangeFactory::class,
+            [
+                'connectionTypeResolver' => $this->connectionTypeResolver,
+                'exchangeFactories' => ['amqp' => $this->amqpExchangeFactory],
+            ]
+        );
+    }
+
+    /**
+     * Test for create method.
+     *
+     * @return void
+     */
+    public function testCreate()
+    {
+        $connectionName = 'amqp';
+        $data = ['key1' => 'value1'];
+        $this->connectionTypeResolver->expects($this->once())
+            ->method('getConnectionType')->with($connectionName)->willReturn($connectionName);
+        $exchange = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\Bulk\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->amqpExchangeFactory->expects($this->once())
+            ->method('create')->with($connectionName, $data)->willReturn($exchange);
+        $this->assertEquals($exchange, $this->exchangeFactory->create($connectionName, $data));
+    }
+
+    /**
+     * Test for create method with undefined connection type.
+     *
+     * @return void
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Not found exchange for connection name 'db' in config
+     */
+    public function testCreateWithUndefinedConnectionType()
+    {
+        $connectionName = 'db';
+        $data = ['key1' => 'value1'];
+        $this->connectionTypeResolver->expects($this->once())
+            ->method('getConnectionType')->with($connectionName)->willReturn($connectionName);
+        $this->amqpExchangeFactory->expects($this->never())->method('create');
+        $this->exchangeFactory->create($connectionName, $data);
+    }
+
+    /**
+     * Test for create method with wrong exchange type.
+     *
+     * @return void
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Exchange for connection name 'amqp' does not implement interface
+     */
+    public function testCreateWithWrongExchangeType()
+    {
+        $connectionName = 'amqp';
+        $data = ['key1' => 'value1'];
+        $this->connectionTypeResolver->expects($this->once())
+            ->method('getConnectionType')->with($connectionName)->willReturn($connectionName);
+        $exchange = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->amqpExchangeFactory->expects($this->once())
+            ->method('create')->with($connectionName, $data)->willReturn($exchange);
+        $this->exchangeFactory->create($connectionName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeRepositoryTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeRepositoryTest.php
new file mode 100644
index 00000000000..63c7f37ff3f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/ExchangeRepositoryTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Bulk;
+
+/**
+ * Unit test for ExchangeRepository.
+ */
+class ExchangeRepositoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exchangeFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->exchangeFactory = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Bulk\ExchangeFactoryInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->exchangeRepository = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Bulk\ExchangeRepository::class
+        );
+        $objectManager->setBackwardCompatibleProperty(
+            $this->exchangeRepository,
+            'exchangeFactory',
+            $this->exchangeFactory
+        );
+    }
+
+    /**
+     * Test for getByConnectionName method.
+     *
+     * @return void
+     */
+    public function testGetByConnectionName()
+    {
+        $connectionName = 'amqp';
+        $exchange = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\Bulk\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->exchangeFactory->expects($this->once())->method('create')->with($connectionName)->willReturn($exchange);
+        $this->assertEquals($exchange, $this->exchangeRepository->getByConnectionName($connectionName));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/PublisherTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/PublisherTest.php
new file mode 100644
index 00000000000..c429a17096f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/PublisherTest.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Bulk;
+
+/**
+ * Unit test for Publisher.
+ */
+class PublisherTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\EnvelopeFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageEncoder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageValidator;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageIdGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageIdGenerator;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\Publisher
+     */
+    private $publisher;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->exchangeRepository = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Bulk\ExchangeRepository::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->envelopeFactory = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()->getMock();
+        $this->messageEncoder = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageEncoder::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageValidator = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageValidator::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageIdGenerator = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageIdGeneratorInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->publisher = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Bulk\Publisher::class,
+            [
+                'exchangeRepository' => $this->exchangeRepository,
+                'envelopeFactory' => $this->envelopeFactory,
+                'messageEncoder' => $this->messageEncoder,
+                'messageValidator' => $this->messageValidator,
+                'publisherConfig' => $this->publisherConfig,
+                'messageIdGenerator' => $this->messageIdGenerator,
+            ]
+        );
+    }
+
+    /**
+     * Test for publish method.
+     *
+     * @return void
+     */
+    public function testPublish()
+    {
+        $messageId = 'message-id-001';
+        $topicName = 'topic.name';
+        $message = 'messageBody';
+        $encodedMessage = 'encodedMessageBody';
+        $connectionName = 'amqp';
+        $this->messageValidator->expects($this->once())->method('validate')->with($topicName, $message);
+        $this->messageEncoder->expects($this->once())
+            ->method('encode')->with($topicName, $message)->willReturn($encodedMessage);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageIdGenerator->expects($this->once())
+            ->method('generate')->with($topicName)->willReturn($messageId);
+        $this->envelopeFactory->expects($this->once())->method('create')->with(
+            [
+                'body' => $encodedMessage,
+                'properties' => [
+                    'delivery_mode' => 2,
+                    'message_id' => $messageId,
+                ]
+            ]
+        )->willReturn($envelope);
+        $publisher = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig->expects($this->once())
+            ->method('getPublisher')->with($topicName)->willReturn($publisher);
+        $connection = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $publisher->expects($this->once())->method('getConnection')->with()->willReturn($connection);
+        $connection->expects($this->once())->method('getName')->with()->willReturn($connectionName);
+        $exchange = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\Bulk\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->exchangeRepository->expects($this->once())
+            ->method('getByConnectionName')->with($connectionName)->willReturn($exchange);
+        $exchange->expects($this->once())->method('enqueue')->with($topicName, [$envelope])->willReturn(null);
+        $this->assertNull($this->publisher->publish($topicName, [$message]));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/Rpc/PublisherTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/Rpc/PublisherTest.php
new file mode 100644
index 00000000000..014fc234f3a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Bulk/Rpc/PublisherTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Bulk\Rpc;
+
+/**
+ * Unit test for Publisher.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PublisherTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\EnvelopeFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageEncoder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageValidator;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseQueueNameBuilder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageIdGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageIdGenerator;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\Rpc\Publisher
+     */
+    private $publisher;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->exchangeRepository = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Bulk\ExchangeRepository::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->envelopeFactory = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()->getMock();
+        $this->messageEncoder = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageEncoder::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageValidator = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageValidator::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->responseQueueNameBuilder = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageIdGenerator = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageIdGeneratorInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->publisher = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Bulk\Rpc\Publisher::class,
+            [
+                'exchangeRepository' => $this->exchangeRepository,
+                'envelopeFactory' => $this->envelopeFactory,
+                'messageEncoder' => $this->messageEncoder,
+                'messageValidator' => $this->messageValidator,
+                'publisherConfig' => $this->publisherConfig,
+                'responseQueueNameBuilder' => $this->responseQueueNameBuilder,
+                'messageIdGenerator' => $this->messageIdGenerator,
+            ]
+        );
+    }
+
+    /**
+     * Test for publish method.
+     *
+     * @return void
+     */
+    public function testPublish()
+    {
+        $messageId = 'message-id-001';
+        $topicName = 'topic.name';
+        $message = 'messageBody';
+        $encodedMessage = 'encodedMessageBody';
+        $connectionName = 'amqp';
+        $queueName = 'queueName';
+        $this->responseQueueNameBuilder->expects($this->once())
+            ->method('getQueueName')->with($topicName)->willReturn($queueName);
+        $this->messageValidator->expects($this->once())->method('validate')->with($topicName, $message);
+        $this->messageEncoder->expects($this->once())
+            ->method('encode')->with($topicName, $message)->willReturn($encodedMessage);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageIdGenerator->expects($this->once())
+            ->method('generate')->with($topicName)->willReturn($messageId);
+        $this->envelopeFactory->expects($this->once())->method('create')->with(
+            $this->logicalAnd(
+                $this->arrayHasKey('body'),
+                $this->arrayHasKey('properties'),
+                $this->contains($encodedMessage)
+            )
+        )->willReturn($envelope);
+        $publisher = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItemInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->publisherConfig->expects($this->once())
+            ->method('getPublisher')->with($topicName)->willReturn($publisher);
+        $connection = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $publisher->expects($this->once())->method('getConnection')->with()->willReturn($connection);
+        $connection->expects($this->once())->method('getName')->with()->willReturn($connectionName);
+        $exchange = $this
+            ->getMockBuilder(\Magento\Framework\Amqp\Bulk\Exchange::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->exchangeRepository->expects($this->once())
+            ->method('getByConnectionName')->with($connectionName)->willReturn($exchange);
+        $exchange->expects($this->once())->method('enqueue')->with($topicName, [$envelope])->willReturn(null);
+        $this->assertNull($this->publisher->publish($topicName, [$message]));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/RemoteServiceGeneratorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/RemoteServiceGeneratorTest.php
new file mode 100644
index 00000000000..e81dc65c686
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/RemoteServiceGeneratorTest.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Code\Generator;
+
+use Composer\Autoload\ClassLoader;
+use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfigInterface;
+use Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator;
+use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Reflection\TypeProcessor;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject_MockObject as MockObject;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class RemoteServiceGeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CommunicationConfigInterface|MockObject
+     */
+    private $communicationConfig;
+
+    /**
+     * @var RemoteServiceGenerator|MockObject
+     */
+    private $generator;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->communicationConfig = $this->getMockBuilder(CommunicationConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $loader = new ClassLoader();
+        $loader->addPsr4(
+            'Magento\\Framework\\MessageQueue\\Code\\Generator\\',
+            __DIR__ . '/_files'
+        );
+        $loader->register();
+    }
+
+    /**
+     * Checks a test case when generator should be possible to generate code
+     * for a specified interface.
+     *
+     * @param string $sourceClassName
+     * @param string $resultClassName
+     * @param string $topicName
+     * @param string $fileName
+     * @dataProvider interfaceDataProvider
+     */
+    public function testGenerate($sourceClassName, $resultClassName, $topicName, $fileName)
+    {
+        $this->createGenerator($sourceClassName, $resultClassName);
+
+        $this->communicationConfig->method('getTopic')
+            ->willReturnMap(
+                [
+                    [$topicName . '.save', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                    [$topicName . '.get', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                    [$topicName . '.getById', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                    [$topicName . '.getList', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                    [$topicName . '.delete', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                    [$topicName . '.deleteById', [CommunicationConfigInterface::TOPIC_IS_SYNCHRONOUS => true]],
+                ]
+            );
+        $expectedResult = file_get_contents(__DIR__ . '/_files/' . $fileName);
+        $this->validateGeneratedCode($expectedResult);
+    }
+
+    /**
+     * Get list of variations for testing remote service generator.
+     *
+     * @return array
+     */
+    public function interfaceDataProvider()
+    {
+        return [
+            [
+                '\\' . \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                '\\' . \Magento\Customer\Api\CustomerRepositoryInterfaceRemote::class,
+                'magento.customer.api.customerRepositoryInterface',
+                'RemoteService.txt'
+            ],
+            [
+                '\\' . \Magento\Framework\MessageQueue\Code\Generator\TRepositoryInterface::class,
+                '\\' . \Magento\Framework\MessageQueue\Code\Generator\TRepositoryInterfaceRemote::class,
+                'magento.framework.messageQueue.code.generator.tRepositoryInterface',
+                'TRemoteService.txt'
+            ]
+        ];
+    }
+
+    /**
+     * Checks if generated code matches provided expected result.
+     *
+     * @param string $expectedResult
+     * @return void
+     */
+    private function validateGeneratedCode($expectedResult)
+    {
+        $reflectionObject = new \ReflectionObject($this->generator);
+        $reflectionMethod = $reflectionObject->getMethod('_generateCode');
+        $reflectionMethod->setAccessible(true);
+        $generatedCode = $reflectionMethod->invoke($this->generator);
+        self::assertEquals($expectedResult, $generatedCode);
+    }
+
+    /**
+     * Creates instance of RemoveServiceGenerator::class with all required dependencies.
+     *
+     * @param string $sourceClassName
+     * @param string $resultClassName
+     */
+    private function createGenerator($sourceClassName, $resultClassName)
+    {
+        $methodMap = $this->createMethodMap();
+        $this->generator = $this->objectManager->getObject(
+            RemoteServiceGenerator::class,
+            [
+                'communicationConfig' => $this->communicationConfig,
+                'serviceMethodsMap' => $methodMap,
+                'sourceClassName' => $sourceClassName,
+                'resultClassName' => $resultClassName,
+                'classGenerator' => null
+            ]
+        );
+
+        $reflectionGenerator = $this->objectManager->getObject(ReflectionGenerator::class);
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->generator,
+            'reflectionGenerator',
+            $reflectionGenerator
+        );
+    }
+
+    /**
+     * Creates instance of MethodsMap::class.
+     *
+     * @return MethodsMap
+     */
+    private function createMethodMap()
+    {
+        $cache = $this->getMockBuilder(FrontendInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cache->method('load')
+            ->willReturn(false);
+
+        $serializer = $this->getMockBuilder(SerializerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $typeProcessor = $this->objectManager->getObject(TypeProcessor::class);
+
+        /** @var MethodsMap $serviceMethodMap */
+        $serviceMethodMap = $this->objectManager->getObject(MethodsMap::class, [
+            'cache' => $cache,
+            'typeProcessor' => $typeProcessor
+        ]);
+        $this->objectManager->setBackwardCompatibleProperty(
+            $serviceMethodMap,
+            'serializer',
+            $serializer
+        );
+
+        return $serviceMethodMap;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/RemoteService.txt b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/RemoteService.txt
new file mode 100644
index 00000000000..d5cfe744406
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/RemoteService.txt
@@ -0,0 +1,90 @@
+namespace Magento\Customer\Api;
+
+/**
+ * Remote class for @see \Magento\Customer\Api\CustomerRepositoryInterface
+ */
+class CustomerRepositoryInterfaceRemote implements CustomerRepositoryInterface
+{
+    /**
+     * Publisher
+     *
+     * @var \Magento\Framework\MessageQueue\PublisherInterface
+     */
+    protected $publisher = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\MessageQueue\PublisherInterface $publisher
+     */
+    public function __construct(\Magento\Framework\MessageQueue\PublisherInterface $publisher)
+    {
+        $this->publisher = $publisher;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $passwordHash = null)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.save',
+            ['customer' => $customer, 'passwordHash' => $passwordHash]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get($email, $websiteId = null)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.get',
+            ['email' => $email, 'websiteId' => $websiteId]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getById($customerId)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.getById',
+            ['customerId' => $customerId]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.getList',
+            ['searchCriteria' => $searchCriteria]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function delete(\Magento\Customer\Api\Data\CustomerInterface $customer)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.delete',
+            ['customer' => $customer]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteById($customerId)
+    {
+        return $this->publisher->publish(
+            'magento.customer.api.customerRepositoryInterface.deleteById',
+            ['customerId' => $customerId]
+        );
+    }
+}
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/discount.phtml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TInterface.php
similarity index 55%
rename from app/code/Magento/Tax/view/frontend/templates/checkout/discount.phtml
rename to lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TInterface.php
index 75f04eae821..687d1f0cc11 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/discount.phtml
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TInterface.php
@@ -3,3 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Framework\MessageQueue\Code\Generator;
+
+interface TInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRemoteService.txt b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRemoteService.txt
new file mode 100644
index 00000000000..6d88b6b59f8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRemoteService.txt
@@ -0,0 +1,90 @@
+namespace Magento\Framework\MessageQueue\Code\Generator;
+
+/**
+ * Remote class for @see \Magento\Framework\MessageQueue\Code\Generator\TRepositoryInterface
+ */
+class TRepositoryInterfaceRemote implements TRepositoryInterface
+{
+    /**
+     * Publisher
+     *
+     * @var \Magento\Framework\MessageQueue\PublisherInterface
+     */
+    protected $publisher = null;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\MessageQueue\PublisherInterface $publisher
+     */
+    public function __construct(\Magento\Framework\MessageQueue\PublisherInterface $publisher)
+    {
+        $this->publisher = $publisher;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function save(\Magento\Framework\MessageQueue\Code\Generator\TInterface $t) : \Magento\Framework\MessageQueue\Code\Generator\TInterface
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.save',
+            ['t' => $t]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get(string $attribute, int $typeId = null) : \Magento\Framework\MessageQueue\Code\Generator\TInterface
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.get',
+            ['attribute' => $attribute, 'typeId' => $typeId]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getById(int $tId) : \Magento\Framework\MessageQueue\Code\Generator\TInterface
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.getById',
+            ['tId' => $tId]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.getList',
+            ['searchCriteria' => $searchCriteria]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function delete(\Magento\Framework\MessageQueue\Code\Generator\TInterface $t) : bool
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.delete',
+            ['t' => $t]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteById(int $tId) : bool
+    {
+        return $this->publisher->publish(
+            'magento.framework.messageQueue.code.generator.tRepositoryInterface.deleteById',
+            ['tId' => $tId]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRepositoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRepositoryInterface.php
new file mode 100644
index 00000000000..592cab83fef
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Code/Generator/_files/TRepositoryInterface.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Code\Generator;
+
+/**
+ * Stub interface for remote service generator with PHP 7.0 syntax.
+ */
+interface TRepositoryInterface
+{
+    /**
+     * Saves TInterface entity.
+     *
+     * @param TInterface $t
+     * @return \Magento\Framework\MessageQueue\Code\Generator\TInterface
+     */
+    public function save(\Magento\Framework\MessageQueue\Code\Generator\TInterface $t)
+        : \Magento\Framework\MessageQueue\Code\Generator\TInterface;
+
+    /**
+     * Retrieves TInterfaces entity.
+     *
+     * @param string $attribute
+     * @param int|null $typeId
+     * @return TInterface
+     */
+    public function get(string $attribute, int $typeId = null)
+        : \Magento\Framework\MessageQueue\Code\Generator\TInterface;
+
+    /**
+     * Retrieves TInterface entity by id.
+     *
+     * @param int $tId
+     * @return TInterface
+     */
+    public function getById(int $tId) : \Magento\Framework\MessageQueue\Code\Generator\TInterface;
+
+    /**
+     * Gets list of TInterface entities.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\Framework\MessageQueue\Code\Generator\TSearchResultsInterface
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
+
+    /**
+     * Deletes TInterface entity.
+     *
+     * @param TInterface $t
+     * @return bool
+     */
+    public function delete(\Magento\Framework\MessageQueue\Code\Generator\TInterface $t) : bool;
+
+    /**
+     * Deletes TInterface entity by id.
+     *
+     * @param int $tId
+     * @return bool
+     */
+    public function deleteById(int $tId) : bool;
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Consumer/ConfigReaderPluginTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Consumer/ConfigReaderPluginTest.php
new file mode 100644
index 00000000000..0eaddf35004
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Consumer/ConfigReaderPluginTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Consumer;
+
+use Magento\Framework\MessageQueue\Config\Consumer\ConfigReaderPlugin as ConsumerConfigReaderPlugin;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Consumer\Config\CompositeReader as ConsumerConfigCompositeReader;
+
+class ConfigReaderPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConsumerConfigReaderPlugin
+     */
+    private $plugin;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var ConsumerConfigCompositeReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectMock;
+
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->subjectMock = $this->getMockBuilder(ConsumerConfigCompositeReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->plugin = $this->objectManagerHelper->getObject(
+            ConsumerConfigReaderPlugin::class,
+            ['config' => $this->configMock]
+        );
+    }
+
+    public function testAfterRead()
+    {
+        $result = ['consumer0' => []];
+        $consumers = [
+            [
+                'name' => 'consumer1',
+                'handlers' => [
+                    ['handlerConfig1_1_1', 'handlerConfig1_1_2'],
+                    ['handlerConfig1_2_1']
+                ],
+                'queue' => ['item1_1', 'item1_2'],
+                'instance_type' => 'type1',
+                'connection' => 'connection1',
+                'max_messages' => 100
+            ],
+            [
+                'name' => 'consumer2',
+                'handlers' => [],
+                'queue' => ['item2_1'],
+                'instance_type' => 'type2',
+                'connection' => 'connection2',
+                'max_messages' => 2
+            ]
+        ];
+        $finalResult = [
+            'consumer1' => [
+                'name' => 'consumer1',
+                'queue' => ['item1_1', 'item1_2'],
+                'consumerInstance' => 'type1',
+                'handlers' => ['handlerConfig1_1_1', 'handlerConfig1_1_2', 'handlerConfig1_2_1'],
+                'connection' => 'connection1',
+                'maxMessages' => 100
+            ],
+            'consumer2' => [
+                'name' => 'consumer2',
+                'queue' => ['item2_1'],
+                'consumerInstance' => 'type2',
+                'handlers' => [],
+                'connection' => 'connection2',
+                'maxMessages' => 2
+            ],
+            'consumer0' => []
+        ];
+
+        $this->configMock->expects(static::atLeastOnce())
+            ->method('getConsumers')
+            ->willReturn($consumers);
+
+        $this->assertEquals($finalResult, $this->plugin->afterRead($this->subjectMock, $result));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/DataTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/DataTest.php
new file mode 100644
index 00000000000..e847420d15f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/DataTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Config;
+
+use Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader\MessageQueue as RemoteServiceReader;
+
+class DataTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Xml|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $xmlReaderMock;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Env|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $envReaderMock;
+
+    /**
+     * @var RemoteServiceReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $remoteServiceReaderMock;
+
+    /**
+     * @var \Magento\Framework\Config\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $cacheMock;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    protected function setUp()
+    {
+        $this->xmlReaderMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\Config\Reader\Xml::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->envReaderMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\Config\Reader\Env::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->remoteServiceReaderMock = $this
+            ->getMockBuilder(
+                \Magento\Framework\MessageQueue\Code\Generator\Config\RemoteServiceReader\MessageQueue::class
+            )->disableOriginalConstructor()
+            ->getMock();
+        $this->cacheMock = $this->getMockBuilder(\Magento\Framework\Config\CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\SerializerInterface::class);
+    }
+
+    public function testGet()
+    {
+        $expected = ['someData' => ['someValue', 'someKey' => 'someValue']];
+        $this->cacheMock->expects($this->any())
+            ->method('load')
+            ->willReturn(json_encode($expected));
+
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willReturn($expected);
+
+        $this->envReaderMock->expects($this->any())->method('read')->willReturn([]);
+        $this->remoteServiceReaderMock->expects($this->any())->method('read')->willReturn([]);
+        $this->assertEquals($expected, $this->getModel()->get());
+    }
+
+    /**
+     * Return Config Data Object
+     *
+     * @return \Magento\Framework\MessageQueue\Config\Data
+     */
+    private function getModel()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        return $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Config\Data::class,
+            [
+                'xmlReader' => $this->xmlReaderMock,
+                'cache' => $this->cacheMock,
+                'envReader' => $this->envReaderMock,
+                'remoteServiceReader' => $this->remoteServiceReaderMock,
+                'serializer' => $this->serializerMock,
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Publisher/ConfigReaderPluginTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Publisher/ConfigReaderPluginTest.php
new file mode 100644
index 00000000000..52297da5422
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Publisher/ConfigReaderPluginTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Publisher;
+
+use Magento\Framework\MessageQueue\Config\Publisher\ConfigReaderPlugin as PublisherConfigReaderPlugin;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\Config\CompositeReader as PublisherConfigCompositeReader;
+
+class ConfigReaderPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PublisherConfigReaderPlugin
+     */
+    private $plugin;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var PublisherConfigCompositeReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectMock;
+
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->subjectMock = $this->getMockBuilder(PublisherConfigCompositeReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->plugin = $this->objectManagerHelper->getObject(
+            PublisherConfigReaderPlugin::class,
+            ['config' => $this->configMock]
+        );
+    }
+
+    public function testAfterRead()
+    {
+        $result = ['topic0' => []];
+        $binds = [
+            [
+                'topic' => 'topic1',
+                'exchange' => 'exchange1'
+            ],
+            [
+                'topic' => 'topic2',
+                'exchange' => 'exchange2'
+            ]
+        ];
+        $finalResult = [
+            'topic1' => [
+                'topic' => 'topic1',
+                'connection' => [
+                    'name' => 'connection1',
+                    'exchange' => 'exchange1',
+                    'disabled' => false
+                ],
+                'disabled' => false
+            ],
+            'topic2' => [
+                'topic' => 'topic2',
+                'connection' => [
+                    'name' => 'connection2',
+                    'exchange' => 'exchange2',
+                    'disabled' => false
+                ],
+                'disabled' => false
+            ],
+            'topic0' => []
+        ];
+
+        $this->configMock->expects(static::atLeastOnce())
+            ->method('getBinds')
+            ->willReturn($binds);
+        $this->configMock->expects(static::atLeastOnce())
+            ->method('getConnectionByTopic')
+            ->willReturnMap(
+                [
+                    ['topic1', 'connection1'],
+                    ['topic2', 'connection2']
+                ]
+            );
+
+        $this->assertEquals($finalResult, $this->plugin->afterRead($this->subjectMock, $result));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Env/Converter/PublisherTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Env/Converter/PublisherTest.php
new file mode 100644
index 00000000000..a4028f12300
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Env/Converter/PublisherTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Reader\Env\Converter;
+
+use Magento\Framework\MessageQueue\Config\Reader\Env\Converter\Publisher as EnvPublisherConverter;
+use Magento\Framework\MessageQueue\Config\Reader\Env as ReaderEnv;
+
+class PublisherTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var EnvPublisherConverter
+     */
+    private $converter;
+
+    protected function setUp()
+    {
+        $connectionToExchangeMap =  [
+            'amqp' => 'magento',
+            'db'=> 'magento-db'
+        ];
+        $this->converter = new EnvPublisherConverter(
+            $connectionToExchangeMap
+        );
+    }
+
+    public function testConvert()
+    {
+        $source = include __DIR__ . '/../../../../_files/env_2_2.php';
+        $expectedConfig = [
+            'amqp-magento' => [
+                'name' => 'amqp-magento',
+                'exchange' => 'magento-db',
+                'connection' =>'db'
+            ]
+        ];
+        $actualResult = $this->converter->convert($source['config']);
+        $this->assertEquals($expectedConfig, $actualResult[ReaderEnv::ENV_PUBLISHERS]);
+    }
+
+    public function testConvertIfPublisherConfigNotExist()
+    {
+        $source = include __DIR__ . '/../../../../_files/env_2_2.php';
+        unset($source['config'][ReaderEnv::ENV_PUBLISHERS]);
+        $actualResult = $this->converter->convert($source['config']);
+        $this->assertEquals($source['config'], $actualResult);
+    }
+    public function testConvertIfConnectionConfigNotExist()
+    {
+        $source = include __DIR__ . '/../../../../_files/env_2_2.php';
+        $topicName = 'inventory.counter.updated';
+        unset($source['config'][ReaderEnv::ENV_PUBLISHERS][$topicName]['connections']);
+        $actualResult = $this->converter->convert($source['config']);
+        $expectedResult[ReaderEnv::ENV_CONSUMERS] = $source['config'][ReaderEnv::ENV_CONSUMERS];
+        $expectedResult[ReaderEnv::ENV_PUBLISHERS] = [];
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Xml/Converter/TopicConverterTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Xml/Converter/TopicConverterTest.php
new file mode 100644
index 00000000000..f6464a6d5be
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/Xml/Converter/TopicConverterTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Reader\Xml\Converter;
+
+/**
+ * Class TopicConverterTest to test <topic> root node type definition of MQ
+ */
+class TopicConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Xml\Converter\TopicConfig
+     */
+    private $converter;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $methodMapMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $validatorMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $communicationConfigMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->methodMapMock = $this->createMock(\Magento\Framework\Reflection\MethodsMap::class);
+        $this->validatorMock = $this->createMock(\Magento\Framework\MessageQueue\Config\Validator::class);
+        $this->communicationConfigMock = $this->createMock(\Magento\Framework\Communication\ConfigInterface::class);
+        $wildcardPatternMap = include(__DIR__ . '/../../../../_files/wildcard_pattern_map.php');
+        $topicsMap = include(__DIR__ . '/../../../../_files/topic_definitions_map.php');
+        $this->validatorMock->expects($this->any())
+            ->method('buildWildcardPattern')
+            ->willReturnMap($wildcardPatternMap);
+
+        $topicsDefinitions = [
+            'user.created.remote' => [],
+            'product.created.local' => [],
+        ];
+        $this->communicationConfigMock->expects($this->once())->method('getTopics')->willReturn($topicsDefinitions);
+
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturnMap($topicsMap);
+
+        $this->converter = new \Magento\Framework\MessageQueue\Config\Reader\Xml\Converter\TopicConfig(
+            $this->methodMapMock,
+            $this->validatorMock,
+            $this->communicationConfigMock
+        );
+    }
+
+    /**
+     * Test converting valid configuration
+     */
+    public function testConvert()
+    {
+        $xmlFile = __DIR__ . '/../../../../_files/topic_config.xml';
+        $expectedData = include(__DIR__ . '/../../../../_files/expected_topic_config.php');
+        $dom = new \DOMDocument();
+        $dom->load($xmlFile);
+        $result = $this->converter->convert($dom);
+        $this->assertEquals($expectedData, $result);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/XmlReader/SchemaLocatorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/XmlReader/SchemaLocatorTest.php
new file mode 100644
index 00000000000..a3a74b3991b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Reader/XmlReader/SchemaLocatorTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Reader\XmlReader;
+
+class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Config\Reader\Xml\SchemaLocator
+     */
+    protected $model;
+
+    /** @var \Magento\Framework\Config\Dom\UrnResolver */
+    protected $urnResolver;
+
+    protected function setUp()
+    {
+        $this->urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
+        $this->model = new \Magento\Framework\MessageQueue\Config\Reader\Xml\SchemaLocator($this->urnResolver);
+    }
+
+    public function testGetSchema()
+    {
+        $expected = $this->urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue_merged.xsd');
+        $actual = $this->model->getSchema();
+        $this->assertEquals($expected, $actual);
+    }
+
+    public function testGetPerFileSchema()
+    {
+        $expected = $this->urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue.xsd');
+        $actual = $this->model->getPerFileSchema();
+        $this->assertEquals($expected, $actual);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Topology/ConfigReaderPluginTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Topology/ConfigReaderPluginTest.php
new file mode 100644
index 00000000000..c270a923a75
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Topology/ConfigReaderPluginTest.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Config\Topology;
+
+use Magento\Framework\MessageQueue\Config\Topology\ConfigReaderPlugin as TopologyConfigReaderPlugin;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\MessageQueue\ConfigInterface;
+use Magento\Framework\MessageQueue\Topology\Config\CompositeReader as TopologyConfigCompositeReader;
+
+class ConfigReaderPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var TopologyConfigReaderPlugin
+     */
+    private $plugin;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var TopologyConfigCompositeReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectMock;
+
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->subjectMock = $this->getMockBuilder(TopologyConfigCompositeReader::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBinds', 'getConnectionByTopic'])
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->plugin = $this->objectManagerHelper->getObject(
+            TopologyConfigReaderPlugin::class,
+            ['queueConfig' => $this->configMock]
+        );
+    }
+
+    public function testAfterRead()
+    {
+        $binding = [
+            [
+                'queue' => 'catalog_product_removed_queue',
+                'exchange' => 'magento-db',
+                'topic' => 'catalog.product.removed'
+            ],
+            [
+                'queue' => 'inventory_qty_counter_queue',
+                'exchange' => 'magento',
+                'topic' => 'inventory.counter.updated'
+            ]
+        ];
+        $magento = [
+            'name' => 'magento',
+            'type' => 'topic',
+            'connection' => 'amqp',
+            'bindings' => []
+        ];
+        $dbDefaultBinding = [
+            'id' => 'defaultBinding',
+            'destinationType' => 'queue',
+            'destination' => 'catalog_product_removed_queue',
+            'topic' => 'catalog.product.removed',
+        ];
+        $amqpDefaultBinding = [
+            'id' => 'defaultBinding',
+            'destinationType' => 'queue',
+            'destination' => 'inventory_qty_counter_queue',
+            'topic' => 'inventory.counter.updated',
+        ];
+        $result = [
+            'magento' => $magento,
+            'magento-db--db' => [
+                'name' => 'magento-db',
+                'type' => 'topic',
+                'connection' => 'db',
+                'bindings' => [
+                    'defaultBinding' => $dbDefaultBinding
+                ]
+            ],
+            'magento--amqp' => [
+                'name' => 'magento',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'bindings' => [
+                    'defaultBinding' => $amqpDefaultBinding
+                ]
+            ]
+        ];
+        $expectedResult = [
+            'magento' => $magento,
+            'magento-db--db' => [
+                'name' => 'magento-db',
+                'type' => 'topic',
+                'connection' => 'db',
+                'bindings' => [
+                    'queue--catalog_product_removed_queue--catalog.product.removed' => [
+                        'id' => 'queue--catalog_product_removed_queue--catalog.product.removed',
+                        'destinationType' => 'queue',
+                        'destination' => 'catalog_product_removed_queue',
+                        'disabled' => false,
+                        'topic' => 'catalog.product.removed',
+                        'arguments' => []
+                    ],
+                    'defaultBinding' => $dbDefaultBinding
+                ]
+            ],
+            'magento--amqp' => [
+                'name' => 'magento',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'bindings' => [
+                    'queue--inventory_qty_counter_queue--inventory.counter.updated' => [
+                        'id' => 'queue--inventory_qty_counter_queue--inventory.counter.updated',
+                        'destinationType' => 'queue',
+                        'destination' => 'inventory_qty_counter_queue',
+                        'disabled' => false,
+                        'topic' => 'inventory.counter.updated',
+                        'arguments' => []
+                    ],
+                    'defaultBinding' => $amqpDefaultBinding
+                ]
+            ]
+        ];
+
+        $this->configMock->expects(static::atLeastOnce())
+            ->method('getBinds')
+            ->willReturn($binding);
+        $this->configMock->expects(static::exactly(2))
+            ->method('getConnectionByTopic')
+            ->willReturnMap([
+                ['catalog.product.removed', 'db'],
+                ['inventory.counter.updated', 'amqp']
+            ]);
+
+        $this->assertEquals($expectedResult, $this->plugin->afterRead($this->subjectMock, $result));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConnectionTypeResolverTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConnectionTypeResolverTest.php
new file mode 100644
index 00000000000..14ccca75bb1
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConnectionTypeResolverTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\MessageQueue\ConnectionTypeResolverInterface;
+use Magento\Framework\MessageQueue\ConnectionTypeResolver;
+
+class ConnectionTypeResolverTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetConnectionType()
+    {
+        $resolverOne = $this->createMock(ConnectionTypeResolverInterface::class);
+        $resolverOne->expects($this->once())->method('getConnectionType')->with('test')->willReturn(null);
+
+        $resolverTwo = $this->createMock(ConnectionTypeResolverInterface::class);
+        $resolverTwo->expects($this->once())->method('getConnectionType')->with('test')->willReturn('some-type');
+
+        $model = new ConnectionTypeResolver([$resolverOne, $resolverTwo]);
+        $this->assertEquals('some-type', $model->getConnectionType('test'));
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Unknown connection name test
+     */
+    public function testGetConnectionTypeWithException()
+    {
+        $resolverOne = $this->createMock(ConnectionTypeResolverInterface::class);
+        $resolverOne->expects($this->once())->method('getConnectionType')->with('test')->willReturn(null);
+
+        $resolverTwo = $this->createMock(ConnectionTypeResolverInterface::class);
+        $resolverTwo->expects($this->once())->method('getConnectionType')->with('test')->willReturn(null);
+
+        $model = new ConnectionTypeResolver([$resolverOne, $resolverTwo]);
+        $model->getConnectionType('test');
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Env/ReaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Env/ReaderTest.php
new file mode 100644
index 00000000000..93feadccbd0
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Env/ReaderTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Env;
+
+use Magento\Framework\MessageQueue\Consumer\Config\Env\Reader;
+
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Consumer\Config\Env\Reader
+     */
+    private $reader;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $envConfig;
+
+    protected function setUp()
+    {
+        $this->envConfig =
+            $this->getMockBuilder(\Magento\Framework\MessageQueue\Config\Reader\Env::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->reader = new Reader($this->envConfig);
+    }
+
+    public function testRead()
+    {
+        $configData['consumers'] = ['consumerConfig'];
+        $this->envConfig->expects($this->once())->method('read')->willReturn($configData);
+        $actual = $this->reader->read();
+        $this->assertEquals(['consumerConfig'], $actual);
+    }
+
+    public function testReadIfConsumerConfigNotExist()
+    {
+        $this->envConfig->expects($this->once())->method('read')->willReturn([]);
+        $actual = $this->reader->read();
+        $this->assertEquals([], $actual);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php
new file mode 100644
index 00000000000..a69555ad742
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\Validator\ConsumerInstance as ConsumerInstanceValidator;
+
+class ConsumerInstanceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConsumerInstanceValidator
+     */
+    private $validator;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->validator = $objectManager->getObject(ConsumerInstanceValidator::class);
+    }
+
+    /**
+     * @dataProvider validConfigDataProvider
+     * @param array $configData
+     */
+    public function testValidateValid($configData)
+    {
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function validConfigDataProvider()
+    {
+        return [
+            'valid' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => \Magento\Framework\MessageQueue\BatchConsumer::class,
+                        'handlers' => [
+                            ['type' => 'handlerClassOne', 'method' => 'handlerMethodOne'],
+                            ['type' => 'handlerClassTwo', 'method' => 'handlerMethodTwo'],
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider invalidConfigDataProvider
+     * @param array $configData
+     * @param string $expectedExceptionMessage
+     */
+    public function testValidateInvalid($configData, $expectedExceptionMessage)
+    {
+        $this->expectException('\LogicException', $expectedExceptionMessage);
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidConfigDataProvider()
+    {
+        return [
+            'invalid, consumerInstance not implementing consumer interface' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => ConsumerInstanceTest::class,
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                // @codingStandardsIgnoreStart
+                "'Magento\\Framework\\MessageQueue\\Test\\Unit\\Consumer\\Config\\Validator\\ConsumerInstanceTest'"
+                . " cannot be specified as 'consumerInstance' for 'consumer1' consumer, unless it implements"
+                . " 'Magento\\Framework\\MessageQueue\\ConsumerInterface' interface"
+                // @codingStandardsIgnoreEnd
+            ],
+            'invalid, consumerInstance class does not exist' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [
+                            [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']]
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumerClass1' does not exist and thus cannot be used as 'consumerInstance'"
+                . " for 'consumer1' consumer."
+            ]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php
new file mode 100644
index 00000000000..086a05ccdaa
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\Validator\FieldsTypes as FieldsTypesValidator;
+
+class FieldsTypesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FieldsTypesValidator
+     */
+    private $validator;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->validator = $objectManager->getObject(FieldsTypesValidator::class);
+    }
+
+    /**
+     * @dataProvider validConfigDataProvider
+     * @param array $configData
+     */
+    public function testValidateValid($configData)
+    {
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function validConfigDataProvider()
+    {
+        return [
+            'valid' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ]
+            ],
+            'valid, maxMessages == null' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => null,
+                    ]
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidConfigDataProvider
+     * @param array $configData
+     * @param string $expectedExceptionMessage
+     */
+    public function testValidateInvalid($configData, $expectedExceptionMessage)
+    {
+        $this->expectException('\LogicException', $expectedExceptionMessage);
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidConfigDataProvider()
+    {
+        return [
+            'invalid name' => [
+                [
+                    'consumer1' => [
+                        'name' => true,
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "Type of 'name' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'boolean', 'string' was expected."
+            ],
+            'invalid queue' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 1,
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "Type of 'queue' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'integer', 'string' was expected."
+            ],
+            'invalid consumerInstance' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => (object)[],
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "Type of 'consumerInstance' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'object', 'string' was expected."
+            ],
+            'invalid connection' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => [],
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "Type of 'connection' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'array', 'string' was expected."
+            ],
+            'invalid handlers' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => '',
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "Type of 'handlers' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'string', 'array' was expected."
+            ],
+            'invalid maxMessages' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => 'abc',
+                    ]
+                ],
+                "Type of 'maxMessages' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'string', 'int|null' was expected."
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php
new file mode 100644
index 00000000000..9abcc8b70ea
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\Validator\Handlers as HandlersValidator;
+use Magento\Framework\Reflection\MethodsMap;
+
+class HandlersTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var MethodsMap|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $methodsMap;
+
+    /**
+     * @var HandlersValidator
+     */
+    private $validator;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->methodsMap = $this->getMockBuilder(MethodsMap::class)->disableOriginalConstructor()->getMock();
+        $this->validator = $objectManager->getObject(HandlersValidator::class, ['methodsMap' => $this->methodsMap]);
+    }
+
+    /**
+     * @dataProvider validConfigDataProvider
+     * @param array $configData
+     */
+    public function testValidateValid($configData)
+    {
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function validConfigDataProvider()
+    {
+        return [
+            'valid' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [
+                            ['type' => 'handlerClassOne', 'method' => 'handlerMethodOne'],
+                            ['type' => 'handlerClassTwo', 'method' => 'handlerMethodTwo'],
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ]
+            ],
+            'valid, empty handlers' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [],
+                        'connection' => 'connection1',
+                        'maxMessages' => null,
+                    ]
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidConfigDataProvider
+     * @param array $configData
+     * @param string $expectedExceptionMessage
+     */
+    public function testValidateInvalid($configData, $expectedExceptionMessage)
+    {
+        $this->expectException('\LogicException', $expectedExceptionMessage);
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidConfigDataProvider()
+    {
+        return [
+            'invalid, not an array' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => ['handlerClassOne::handlerMethodOne'],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumer1' consumer declaration is invalid. Every handler element must be an array."
+                . " It must contain 'type' and 'method' elements."
+            ],
+            'invalid, no required fields' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [
+                            ['handlerClassOne::handlerMethodOne']
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumer1' consumer declaration is invalid. Every handler element must be an array."
+                . " It must contain 'type' and 'method' elements."
+            ],
+            'invalid, no method' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [
+                            ['type' => 'handlerClassOne']
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumer1' consumer declaration is invalid. Every handler element must be an array."
+                . " It must contain 'type' and 'method' elements."
+            ],
+            'invalid, no type' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [
+                            ['method' => 'handlerMethodOne']
+                        ],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumer1' consumer declaration is invalid. Every handler element must be an array."
+                . " It must contain 'type' and 'method' elements."
+            ]
+        ];
+    }
+
+    public function testValidateUndeclaredService()
+    {
+        $configData = [
+            'consumer1' => [
+                'name' => 'consumer1',
+                'queue' => 'queue1',
+                'consumerInstance' => 'consumerClass1',
+                'handlers' => [
+                    ['type' => 'handlerClassOne', 'method' => 'handlerMethodOne'],
+                ],
+                'connection' => 'connection1',
+                'maxMessages' => '100',
+            ]
+        ];
+        $expectedExceptionMessage = 'Service method specified as handler for of consumer "consumer1" is not available.'
+        . ' Given "handlerClassOne::handlerMethodOne"';
+        $this->expectException('\LogicException', $expectedExceptionMessage);
+
+        $this->methodsMap->expects($this->once())
+            ->method('getMethodParams')
+            ->with('handlerClassOne', 'handlerMethodOne')
+            ->willThrowException(new \Exception(''));
+
+        $this->validator->validate($configData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php
new file mode 100644
index 00000000000..61a31603ea7
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Validator;
+
+use Magento\Framework\MessageQueue\Consumer\Config\Validator\RequiredFields as RequiredFieldsValidator;
+
+class RequiredFieldsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var RequiredFieldsValidator
+     */
+    private $validator;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->validator = $objectManager->getObject(RequiredFieldsValidator::class);
+    }
+
+    /**
+     * @dataProvider validConfigDataProvider
+     * @param array $configData
+     */
+    public function testValidateValid($configData)
+    {
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function validConfigDataProvider()
+    {
+        return [
+            'valid' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider invalidConfigDataProvider
+     * @param array $configData
+     * @param string $expectedExceptionMessage
+     */
+    public function testValidateInvalid($configData, $expectedExceptionMessage)
+    {
+        $this->expectException('\LogicException', $expectedExceptionMessage);
+        $this->validator->validate($configData);
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidConfigDataProvider()
+    {
+        return [
+            'missing name' => [
+                [
+                    'consumer1' => [
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'name' field must be specified for consumer 'consumer1'"
+            ],
+            'missing queue' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'queue' field must be specified for consumer 'consumer1'"
+            ],
+            'missing consumerInstance' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'consumerInstance' field must be specified for consumer 'consumer1'"
+            ],
+            'missing connection' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'connection' field must be specified for consumer 'consumer1'"
+            ],
+            'missing handlers' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                    ]
+                ],
+                "'handlers' field must be specified for consumer 'consumer1'"
+            ],
+            'missing maxMessages' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                    ]
+                ],
+                "'maxMessages' field must be specified for consumer 'consumer1'"
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Xml/ConverterTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Xml/ConverterTest.php
new file mode 100644
index 00000000000..cb68d845a26
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Xml/ConverterTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config\Xml;
+
+use Magento\Framework\Communication\Config\ConfigParser;
+use Magento\Framework\MessageQueue\Consumer\Config\Xml\Converter;
+
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Converter
+     */
+    private $converter;
+
+    /**
+     * @var ConfigParser|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $configParserMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultConfigProviderMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->defaultConfigProviderMock =
+            $this->createMock(\Magento\Framework\MessageQueue\DefaultValueProvider::class);
+        $this->configParserMock = $this->createMock(ConfigParser::class);
+        $this->converter = new Converter($this->configParserMock, $this->defaultConfigProviderMock);
+    }
+
+    public function testConvert()
+    {
+        $this->defaultConfigProviderMock->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->configParserMock->expects($this->any())->method('parseServiceMethod')->willReturnCallback(
+            function ($handler) {
+                $parsedHandler = explode('::', $handler);
+                return ['typeName' => $parsedHandler[0], 'methodName' => $parsedHandler[1]];
+            }
+        );
+        $fixtureDir = __DIR__ . '/../../../_files/queue_consumer';
+        $xmlFile = $fixtureDir . '/valid.xml';
+        $dom = new \DOMDocument();
+        $dom->load($xmlFile);
+        $result = $this->converter->convert($dom);
+
+        $expectedData = include($fixtureDir . '/valid.php');
+        $this->assertEquals($expectedData, $result);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
new file mode 100644
index 00000000000..2e0120ad7ea
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Consumer\Config;
+
+class XsdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    protected $_schemaFile;
+
+    protected function setUp()
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+        $urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
+        $this->_schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/consumer.xsd');
+    }
+
+    /**
+     * @param string $fixtureXml
+     * @param array $expectedErrors
+     * @dataProvider exemplarXmlDataProvider
+     */
+    public function testExemplarXml($fixtureXml, array $expectedErrors)
+    {
+        $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
+        $validationState->expects($this->any())
+            ->method('isValidationRequired')
+            ->willReturn(true);
+        $messageFormat = '%message%';
+        $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
+        $actualErrors = [];
+        $actualResult = $dom->validate($this->_schemaFile, $actualErrors);
+        $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
+        $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exemplarXmlDataProvider()
+    {
+        // @codingStandardsIgnoreStart
+        return [
+            /** Valid configurations */
+            'valid' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [],
+            ],
+            'non unique consumer name' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer1" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'consumer': Duplicate key-sequence ['consumer1'] in unique identity-constraint 'consumer-unique-name'."
+                ],
+            ],
+            'invalid handler format' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClass1::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethod2" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'consumer', attribute 'handler': [facet 'pattern'] The value 'handlerClass1::handlerMethodOne' is not accepted by the pattern '[a-zA-Z\\\\]+::[a-zA-Z]+'.",
+                    "Element 'consumer', attribute 'handler': 'handlerClass1::handlerMethodOne' is not a valid value of the atomic type 'handlerType'.",
+                    "Element 'consumer', attribute 'handler': [facet 'pattern'] The value 'handlerClassTwo::handlerMethod2' is not accepted by the pattern '[a-zA-Z\\\\]+::[a-zA-Z]+'.",
+                    "Element 'consumer', attribute 'handler': 'handlerClassTwo::handlerMethod2' is not a valid value of the atomic type 'handlerType'.",
+                ],
+            ],
+            'invalid maxMessages format' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="ABC"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'consumer', attribute 'maxMessages': 'ABC' is not a valid value of the atomic type 'xs:integer'.",
+                ],
+            ],
+            'unexpected element' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <unexpected name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'unexpected': This element is not expected. Expected is ( consumer ).",
+                ],
+            ],
+            'unexpected attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4" unexpected=""/>
+                </config>',
+                [
+                    "Element 'consumer', attribute 'unexpected': The attribute 'unexpected' is not allowed.",
+                ],
+            ],
+        ];
+        // @codingStandardsIgnoreEnd
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerFactoryTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerFactoryTest.php
new file mode 100644
index 00000000000..1cf1b57af87
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerFactoryTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\MessageQueue\ConsumerFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
+use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem;
+
+class ConsumerFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /** @var CommunicationConfig|\PHPUnit_Framework_MockObject_MockObject */
+    protected $communicationConfigMock;
+
+    /** @var ConsumerConfig|\PHPUnit_Framework_MockObject_MockObject */
+    protected $consumerConfigMock;
+
+    const TEST_CONSUMER_NAME = "test_consumer_name";
+    const TEST_CONSUMER_QUEUE = "test_consumer_queue";
+    const TEST_CONSUMER_METHOD = "test_consumer_method";
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->communicationConfigMock = $this->getMockBuilder(CommunicationConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->consumerConfigMock = $this->getMockBuilder(ConsumerConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage pecified consumer "test_consumer_name" is not declared.
+     */
+    public function testUndeclaredConsumerName()
+    {
+        $consumerFactory = $this->objectManager->getObject(ConsumerFactory::class);
+        $this->objectManager->setBackwardCompatibleProperty(
+            $consumerFactory,
+            'communicationConfig',
+            $this->communicationConfigMock
+        );
+        $this->objectManager->setBackwardCompatibleProperty(
+            $consumerFactory,
+            'consumerConfig',
+            $this->consumerConfigMock
+        );
+        $consumerFactory->get(self::TEST_CONSUMER_NAME);
+    }
+
+    public function testConnectionInjectedForConsumer()
+    {
+        $consumerType = 'async';
+        $consumerTypeValue = \Magento\Framework\MessageQueue\Model\TestConsumer::class;
+        $consumers = [
+            [
+                'type' => [$consumerType => $consumerTypeValue]
+            ]
+        ];
+        $consumerFactory = $this->getConsumerFactoryInstance($consumers);
+        $consumerInstanceMock = $this->getMockBuilder($consumerTypeValue)->getMock();
+        $this->assertInstanceOf(get_class($consumerInstanceMock), $consumerFactory->get(self::TEST_CONSUMER_NAME));
+    }
+
+    /**
+     * Return Consumer Factory with mocked objects
+     *
+     * @param array $consumers
+     * @return ConsumerFactory
+     */
+    private function getConsumerFactoryInstance($consumers)
+    {
+        $consumerTypeValue = \Magento\Framework\MessageQueue\Model\TestConsumer::class;
+        $handlerTypeValue = \Magento\Framework\DataObject::class;
+        $consumerType = 'async';
+
+        /** @var ConsumerConfigItem|\PHPUnit_Framework_MockObject_MockObject $consumerConfigItemMock */
+        $consumerConfigItemMock = $this->getMockBuilder(ConsumerConfigItem::class)->disableOriginalConstructor()
+            ->getMock();
+        $consumerConfigItemMock->expects($this->any())->method('getName')->willReturn(self::TEST_CONSUMER_NAME);
+        $consumerConfigItemMock->expects($this->any())->method('getQueue')->willReturn(self::TEST_CONSUMER_QUEUE);
+        $consumerConfigItemMock->expects($this->any())->method('getConsumerInstance')->willReturn($consumerTypeValue);
+        $consumerConfigItemMock->expects($this->any())->method('getHandlers')->willReturn([]);
+        $this->consumerConfigMock->expects($this->any())
+            ->method('getConsumer')
+            ->with('test_consumer_name')
+            ->willReturn($consumerConfigItemMock);
+        $this->communicationConfigMock->expects($this->any())
+            ->method('getTopics')
+            ->willReturn(
+                [
+                    [
+                        CommunicationConfig::TOPIC_NAME => 'topicName',
+                        CommunicationConfig::TOPIC_IS_SYNCHRONOUS => false
+                    ]
+                ]
+            );
+        $this->communicationConfigMock->expects($this->any())
+            ->method('getTopic')
+            ->with('topicName')
+            ->willReturn(
+                [
+                    CommunicationConfig::TOPIC_HANDLERS => [
+                        [
+                            CommunicationConfig::HANDLER_TYPE => $handlerTypeValue,
+                            CommunicationConfig::HANDLER_METHOD => self::TEST_CONSUMER_METHOD
+                        ]
+                    ],
+                ]
+            );
+
+        $consumerInstanceMock = $this->getMockBuilder($consumerTypeValue)->getMock();
+        $consumerMock = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerInterface::class)
+            ->setMethods(['configure'])
+            ->getMockForAbstractClass();
+
+        $consumerConfigurationMock =
+            $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+                ->disableOriginalConstructor()
+                ->getMockForAbstractClass();
+        $consumerConfigurationMock->expects($this->any())->method('getType')->willReturn($consumerType);
+
+        $objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+
+        $objectManagerMock->expects($this->any())
+            ->method('create')
+            ->willReturnOnConsecutiveCalls($consumerMock, $consumerConfigurationMock, $consumerInstanceMock);
+
+        $consumerFactory = $this->objectManager->getObject(
+            \Magento\Framework\MessageQueue\ConsumerFactory::class,
+            [
+                'objectManager' => $objectManagerMock,
+                'consumers' => $consumers
+            ]
+        );
+        $this->objectManager->setBackwardCompatibleProperty(
+            $consumerFactory,
+            'communicationConfig',
+            $this->communicationConfigMock
+        );
+        $this->objectManager->setBackwardCompatibleProperty(
+            $consumerFactory,
+            'consumerConfig',
+            $this->consumerConfigMock
+        );
+        return $consumerFactory;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php
new file mode 100644
index 00000000000..5eb7cd587aa
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\Phrase;
+
+/**
+ * Unit test for Consumer class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ConsumerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\ConsumerConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configuration;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageEncoder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\QueueRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queueRepository;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\CallbackInvoker
+     */
+    private $callbackInvoker;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $consumerConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageController|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageController;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\Framework\Communication\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $communicationConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Consumer
+     */
+    private $consumer;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configuration = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->messageEncoder = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageEncoder::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->queueRepository = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueRepository::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        //Hard dependency used because CallbackInvoker invokes closure logic defined inside of Customer class.
+        $this->callbackInvoker = new \Magento\Framework\MessageQueue\CallbackInvoker();
+        $this->consumer = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Consumer::class,
+            [
+                'configuration' => $this->configuration,
+                'messageEncoder' => $this->messageEncoder,
+                'queueRepository' => $this->queueRepository,
+                'invoker' => $this->callbackInvoker,
+                'resource' => $this->resource,
+                'logger' => $this->logger
+            ]
+        );
+
+        $this->consumerConfig = $this->getMockBuilder(\Magento\Framework\MessageQueue\Consumer\ConfigInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $objectManager->setBackwardCompatibleProperty(
+            $this->consumer,
+            'consumerConfig',
+            $this->consumerConfig
+        );
+        $this->messageController = $this->getMockBuilder(\Magento\Framework\MessageQueue\MessageController::class)
+            ->disableOriginalConstructor()->getMock();
+        $objectManager->setBackwardCompatibleProperty(
+            $this->consumer,
+            'messageController',
+            $this->messageController
+        );
+        $this->communicationConfig = $this
+            ->createMock(\Magento\Framework\Communication\ConfigInterface::class);
+        $objectManager->setBackwardCompatibleProperty(
+            $this->consumer,
+            'communicationConfig',
+            $this->communicationConfig
+        );
+    }
+
+    /**
+     * Test for process method with NotFoundException.
+     *
+     * @return void
+     */
+    public function testProcessWithNotFoundException()
+    {
+        $properties = ['topic_name' => 'topic.name'];
+        $topicConfig = [];
+        $numberOfMessages = 1;
+        $consumerName = 'consumer.name';
+        $exceptionPhrase = new Phrase('Exception successfully thrown');
+
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->configuration->expects($this->once())->method('getQueue')->willReturn($queue);
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $queue->expects($this->atLeastOnce())->method('dequeue')->willReturn($envelope);
+        $envelope->expects($this->once())->method('getProperties')->willReturn($properties);
+        $this->communicationConfig->expects($this->once())->method('getTopic')->with($properties['topic_name'])
+            ->willReturn($topicConfig);
+        $this->configuration->expects($this->once())->method('getConsumerName')->willReturn($consumerName);
+        $this->messageController->expects($this->once())->method('lock')->with($envelope, $consumerName)
+            ->willThrowException(
+                new \Magento\Framework\Exception\NotFoundException(
+                    $exceptionPhrase
+                )
+            );
+        $queue->expects($this->once())->method('acknowledge')->with($envelope);
+        $this->logger->expects($this->once())->method('warning')->with($exceptionPhrase->render());
+
+        $this->consumer->process($numberOfMessages);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MergedMessageProcessorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MergedMessageProcessorTest.php
new file mode 100644
index 00000000000..b3c80cf6af7
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MergedMessageProcessorTest.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for MergedMessageProcessor.
+ */
+class MergedMessageProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageStatusProcessor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageStatusProcessor;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MergedMessageProcessor
+     */
+    private $mergedMessageProcessor;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->messageStatusProcessor = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageStatusProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->mergedMessageProcessor = $objectManagerHelper->getObject(
+            \Magento\Framework\MessageQueue\MergedMessageProcessor::class,
+            [
+                'messageStatusProcessor' => $this->messageStatusProcessor
+            ]
+        );
+    }
+
+    /**
+     * Test for process().
+     *
+     * @return void
+     */
+    public function testProcess()
+    {
+        $topicName = 'topic';
+        $messageId = 1;
+        $messagesToAcknowledge = [];
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration->expects($this->atLeastOnce())->method('getHandlers')->willReturn([]);
+        $this->messageStatusProcessor->expects($this->exactly(2))->method('acknowledgeMessages');
+        $originalMessage = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergedMessageInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessage->expects($this->atLeastOnce())->method('getOriginalMessagesIds')->willReturn([$messageId]);
+        $mergedMessages = [
+            $topicName => [$mergedMessage]
+        ];
+        $messages = [$messageId => $originalMessage];
+
+        $this->mergedMessageProcessor->process(
+            $queue,
+            $configuration,
+            $messages,
+            $messagesToAcknowledge,
+            $mergedMessages
+        );
+    }
+
+    /**
+     * Test for process() with Exception.
+     *
+     * @return void
+     */
+    public function testProcessWithException()
+    {
+        $topicName = 'topic';
+        $messageId = 1;
+        $messagesToAcknowledge = [];
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
+        $exception = new \Exception();
+        $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
+        $this->messageStatusProcessor->expects($this->atLeastOnce())->method('rejectMessages');
+        $originalMessage = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergedMessageInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessages = [
+            $topicName => [$mergedMessage]
+        ];
+        $messages = [$messageId => $originalMessage];
+
+        $this->mergedMessageProcessor->process(
+            $queue,
+            $configuration,
+            $messages,
+            $messagesToAcknowledge,
+            $mergedMessages
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageControllerTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageControllerTest.php
new file mode 100644
index 00000000000..dc35a6dd26d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageControllerTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+/**
+ * Unit test for MessageController class.
+ *
+ */
+class MessageControllerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\LockInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $lockFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageController
+     */
+    private $messageController;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->lockFactory = $this->getMockBuilder(\Magento\Framework\MessageQueue\LockInterfaceFactory::class)
+            ->disableOriginalConstructor()->setMethods(['create'])->getMock();
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->messageController = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\MessageController::class,
+            [
+                'lockFactory' => $this->lockFactory
+            ]
+        );
+    }
+
+    /**
+     * Test for lock method with NotFoundException.
+     *
+     * @return void
+     */
+    public function testLockWithNotFoundException()
+    {
+        $properties = [];
+        $consumerName = '';
+        $this->expectException(
+            \Magento\Framework\Exception\NotFoundException::class,
+            "Property 'message_id' not found in properties."
+        );
+        $this->lockFactory->expects($this->once())->method('create');
+        $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableArgumentCloning()->getMock();
+        $envelope->expects($this->once())->method('getProperties')->willReturn($properties);
+
+        $this->messageController->lock($envelope, $consumerName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageEncoderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageEncoderTest.php
new file mode 100644
index 00000000000..58f11c6f736
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageEncoderTest.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\MessageEncoder;
+
+/**
+ * Test class for Magento\Framework\MessageQueue\MessageEncoder
+ */
+class MessageEncoderTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var MessageEncoder */
+    protected $encoder;
+
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    protected $objectManager;
+
+    /** @var CommunicationConfig|\PHPUnit_Framework_MockObject_MockObject */
+    protected $communicationConfigMock;
+
+    /** @var \Magento\Framework\Webapi\ServiceOutputProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    protected $dataObjectEncoderMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->dataObjectEncoderMock = $this->getMockBuilder(\Magento\Framework\Webapi\ServiceOutputProcessor::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $this->encoder = $this->objectManager->getObject(
+            MessageEncoder::class,
+            ['dataObjectEncoder' => $this->dataObjectEncoderMock]
+        );
+        $this->communicationConfigMock = $this->getMockBuilder(CommunicationConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->encoder,
+            'communicationConfig',
+            $this->communicationConfigMock
+        );
+        parent::setUp();
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Specified topic "customer.created" is not declared.
+     */
+    public function testEncodeInvalidTopic()
+    {
+        $this->encoder->encode('customer.created', 'Some message');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Specified topic "customer.created" is not declared.
+     */
+    public function testDecodeInvalidTopic()
+    {
+        $this->encoder->decode('customer.created', 'Some message');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Message with topic "customer.created" must be an instance of "Magento\Customer\Api\Data
+     */
+    public function testEncodeInvalidMessage()
+    {
+        $exceptionMessage = 'Message with topic "customer.created" must be an instance of "Magento\Customer\Api\Data"';
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigData()
+        );
+        $object = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $this->dataObjectEncoderMock
+            ->expects($this->once())
+            ->method('convertValue')
+            ->willThrowException(new LocalizedException(__($exceptionMessage)));
+
+        $this->encoder->encode('customer.created', $object);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Message with topic "customer.created" must be an instance of "Magento\Customer\Api\Data
+     */
+    public function testEncodeInvalidMessageArray()
+    {
+        $exceptionMessage = 'Message with topic "customer.created" must be an instance of "Magento\Customer\Api\Data"';
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigData()
+        );
+        $object = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $this->dataObjectEncoderMock
+            ->expects($this->once())
+            ->method('convertValue')
+            ->willThrowException(new LocalizedException(__($exceptionMessage)));
+
+        $this->encoder->encode('customer.created', [$object]);
+    }
+
+    /**
+     * Data provider for queue config
+     *
+     * @return array
+     */
+    private function getQueueConfigData()
+    {
+        return [
+            CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+            CommunicationConfig::TOPIC_REQUEST => \Magento\Customer\Api\Data\CustomerInterface::class
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorLoaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorLoaderTest.php
new file mode 100644
index 00000000000..e62f5682709
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorLoaderTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for MessageProcessorLoader.
+ */
+class MessageProcessorLoaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mergedMessageProcessor;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $defaultMessageProcessor;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessorLoader
+     */
+    private $messageProcessorLoader;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->mergedMessageProcessor = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->defaultMessageProcessor = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->messageProcessorLoader = $objectManagerHelper->getObject(
+            \Magento\Framework\MessageQueue\MessageProcessorLoader::class,
+            [
+                'mergedMessageProcessor' => $this->mergedMessageProcessor,
+                'defaultMessageProcessor' => $this->defaultMessageProcessor
+            ]
+        );
+    }
+
+    /**
+     * Test for load().
+     *
+     * @param $message
+     * @dataProvider loadDataProvider
+     */
+    public function testLoad($message)
+    {
+        $messageTopic = 'topic';
+        $messages = [
+            $messageTopic => [$message]
+        ];
+
+        $this->assertInstanceOf(
+            \Magento\Framework\MessageQueue\MessageProcessorInterface::class,
+            $this->messageProcessorLoader->load($messages)
+        );
+    }
+
+    /**
+     * DataProvider for load().
+     *
+     * @return array
+     */
+    public function loadDataProvider()
+    {
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\MessageQueue\MergedMessageInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        return [
+            [$mergedMessage],
+            [$message]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
new file mode 100644
index 00000000000..5e64d737034
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for MessageProcessor.
+ */
+class MessageProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageStatusProcessor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageStatusProcessor;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resource;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageProcessor
+     */
+    private $messageProcessor;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->messageStatusProcessor = $this
+            ->getMockBuilder(\Magento\Framework\MessageQueue\MessageStatusProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->messageProcessor = $objectManagerHelper->getObject(
+            \Magento\Framework\MessageQueue\MessageProcessor::class,
+            [
+                'messageStatusProcessor' => $this->messageStatusProcessor,
+                'resource' => $this->resource
+            ]
+        );
+    }
+
+    /**
+     * Test for process().
+     *
+     * @return void
+     */
+    public function testProcess()
+    {
+        $topicName = 'topic';
+        $messagesToAcknowledge = [];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $connection->expects($this->atLeastOnce())->method('beginTransaction');
+        $connection->expects($this->atLeastOnce())->method('commit');
+        $this->resource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connection);
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration->expects($this->atLeastOnce())->method('getHandlers')->willReturn([]);
+        $this->messageStatusProcessor->expects($this->exactly(2))->method('acknowledgeMessages');
+        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessages = [
+            $topicName => [$mergedMessage]
+        ];
+        $messages = [
+            $topicName => [$message]
+        ];
+
+        $this->messageProcessor->process($queue, $configuration, $messages, $messagesToAcknowledge, $mergedMessages);
+    }
+
+    /**
+     * Test for process() with ConnectionLostException.
+     *
+     * @return void
+     */
+    public function testProcessWithConnectionLostException()
+    {
+        $topicName = 'topic';
+        $messagesToAcknowledge = [];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $connection->expects($this->atLeastOnce())->method('beginTransaction');
+        $connection->expects($this->never())->method('commit');
+        $connection->expects($this->atLeastOnce())->method('rollBack');
+        $this->resource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connection);
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $exception = new \Magento\Framework\MessageQueue\ConnectionLostException(__('Exception Message'));
+        $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
+        $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
+        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessages = [
+            $topicName => [$mergedMessage]
+        ];
+        $messages = [
+            $topicName => [$message]
+        ];
+
+        $this->messageProcessor->process($queue, $configuration, $messages, $messagesToAcknowledge, $mergedMessages);
+    }
+
+    /**
+     * Test for process() with Exception.
+     *
+     * @return void
+     */
+    public function testProcessWithException()
+    {
+        $topicName = 'topic';
+        $messagesToAcknowledge = [];
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $connection->expects($this->atLeastOnce())->method('beginTransaction');
+        $connection->expects($this->never())->method('commit');
+        $connection->expects($this->atLeastOnce())->method('rollBack');
+        $this->resource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connection);
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $configuration = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConsumerConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $exception = new \Exception();
+        $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
+        $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
+        $this->messageStatusProcessor->expects($this->atLeastOnce())->method('rejectMessages');
+        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $mergedMessages = [
+            $topicName => [$mergedMessage]
+        ];
+        $messages = [
+            $topicName => [$message]
+        ];
+
+        $this->messageProcessor->process($queue, $configuration, $messages, $messagesToAcknowledge, $mergedMessages);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageStatusProcessorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageStatusProcessorTest.php
new file mode 100644
index 00000000000..041f73f3a26
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageStatusProcessorTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for MessageStatusProcessor.
+ */
+class MessageStatusProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageStatusProcessor
+     */
+    private $messageStatusProcessor;
+
+    /**
+     * Set up.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->messageStatusProcessor = $objectManagerHelper->getObject(
+            \Magento\Framework\MessageQueue\MessageStatusProcessor::class
+        );
+    }
+
+    /**
+     * Test for acknowledgeMessages().
+     *
+     * @return void
+     */
+    public function testAcknowledgeMessages()
+    {
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $queue->expects($this->atLeastOnce())->method('acknowledge');
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->messageStatusProcessor->acknowledgeMessages($queue, [$message]);
+    }
+
+    /**
+     * Test for rejectMessages().
+     *
+     * @return void
+     */
+    public function testRejectMessages()
+    {
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $queue->expects($this->atLeastOnce())->method('reject');
+        $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->messageStatusProcessor->rejectMessages($queue, [$message]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php
new file mode 100644
index 00000000000..c0303ba5c27
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\MessageValidator;
+
+/**
+ * @covers Magento\Framework\MessageQueue\MessageValidator
+ * @SuppressWarnings(PHPMD)
+ */
+class MessageValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var MessageValidator */
+    protected $model;
+
+    /** @var CommunicationConfig|\PHPUnit_Framework_MockObject_MockObject */
+    protected $communicationConfigMock;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->model = $objectManager->getObject(MessageValidator::class);
+        $this->communicationConfigMock = $this->getMockBuilder(CommunicationConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManager->setBackwardCompatibleProperty(
+            $this->model,
+            'communicationConfig',
+            $this->communicationConfigMock
+        );
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Specified topic "customer.created" is not declared.
+     */
+    public function testValidateInvalidTopic()
+    {
+        $this->model->validate('customer.created', 'Some message', true);
+    }
+
+    public function testValidateValidObjectType()
+    {
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigDataObjectType()
+        );
+        $object = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->model->validate('customer.created', $object, true);
+    }
+
+    public function testValidateValidMethodType()
+    {
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigDataMethodType()
+        );
+        $object = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->model->validate('customer.created', [$object, 'password', 'redirect'], true);
+    }
+
+    public function testEncodeValidMessageObjectType()
+    {
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigDataObjectType()
+        );
+        $this->model->validate('customer.created', [], true);
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage Data in topic "customer.created" must be of type "Magento\Customer\Api\Data\CustomerInt
+     */
+    public function testEncodeInvalidMessageMethodType()
+    {
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn(
+            $this->getQueueConfigDataMethodType()
+        );
+        $this->model->validate('customer.created', [1, 2, 3], true);
+    }
+
+    /**
+     * Data provider for queue config of object type
+     *
+     * @return array
+     */
+    private function getQueueConfigDataObjectType()
+    {
+        return [
+            CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+            CommunicationConfig::TOPIC_REQUEST => \Magento\Customer\Api\Data\CustomerInterface::class
+        ];
+    }
+
+    /**
+     * Data provider for queue config of method type
+     *
+     * @return array
+     */
+    private function getQueueConfigDataMethodType()
+    {
+        return [
+            CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_METHOD,
+            CommunicationConfig::TOPIC_REQUEST => [
+                [
+                    'param_name' => 'customer',
+                    'param_position' => 0,
+                    'is_required' => true,
+                    'param_type' => \Magento\Customer\Api\Data\CustomerInterface::class,
+                ],
+                [
+                    'param_name' => 'password',
+                    'param_position' => 1,
+                    'is_required' => false,
+                    'param_type' => 'string',
+                ],
+                [
+                    'param_name' => 'redirectUrl',
+                    'param_position' => 2,
+                    'is_required' => false,
+                    'param_type' => 'string',
+                ],
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider getQueueConfigRequestType
+     */
+    public function testInvalidMessageType($requestType, $message, $expectedResult = null)
+    {
+        $this->communicationConfigMock->expects($this->any())->method('getTopic')->willReturn($requestType);
+        if ($expectedResult) {
+            $this->expectException('InvalidArgumentException', $expectedResult);
+        }
+        $this->model->validate('topic', $message);
+    }
+
+    public function getQueueConfigRequestType()
+    {
+        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $customerMockTwo = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        return [
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string'
+                ],
+                'valid string',
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string'
+                ],
+                1,
+                'Data in topic "topic" must be of type "string". "int" given.'
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string[]'
+                ],
+                ['string1', 'string2'],
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string[]'
+                ],
+                [],
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'string[]'
+                ],
+                'single string',
+                'Data in topic "topic" must be of type "string[]". "string" given.'
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => \Magento\Customer\Api\Data\CustomerInterface::class
+                ],
+                $customerMock,
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => \Magento\Customer\Api\Data\CustomerInterface::class
+                ],
+                'customer',
+                'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface". "string" given.'
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                [$customerMock, $customerMockTwo],
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                [],
+                null
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                'customer',
+                'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface[]". "string" given.'
+            ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                $customerMock,
+                'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface[]". '
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeReaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeReaderTest.php
new file mode 100644
index 00000000000..88f33598366
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeReaderTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config;
+
+use Magento\Framework\MessageQueue\Publisher\Config\CompositeReader;
+use Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface;
+use Magento\Framework\MessageQueue\Publisher\Config\ReaderInterface;
+
+class CompositeReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CompositeReader
+     */
+    private $reader;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerOneMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerTwoMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerThreeMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultConfigProviderMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->validatorMock = $this->createMock(ValidatorInterface::class);
+        $this->readerOneMock = $this->createMock(ReaderInterface::class);
+        $this->readerTwoMock = $this->createMock(ReaderInterface::class);
+        $this->readerThreeMock = $this->createMock(ReaderInterface::class);
+        $this->defaultConfigProviderMock =
+            $this->createMock(\Magento\Framework\MessageQueue\DefaultValueProvider::class);
+
+        $this->reader = new CompositeReader(
+            $this->validatorMock,
+            $this->defaultConfigProviderMock,
+            [
+                'readerOne' => $this->readerOneMock,
+                'readerThree' => $this->readerThreeMock,
+                'readerTwo' => $this->readerTwoMock,
+            ]
+        );
+    }
+
+    public function testRead()
+    {
+        $this->defaultConfigProviderMock->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->defaultConfigProviderMock->expects($this->any())->method('getExchange')->willReturn('magento');
+
+        $dataOne = include __DIR__ . '/../../_files/queue_publisher/reader_one.php';
+        $dataTwo = include __DIR__ . '/../../_files/queue_publisher/reader_two.php';
+        $expectedValidationData = include __DIR__ . '/../../_files/queue_publisher/data_to_validate.php';
+
+        $this->readerOneMock->expects($this->once())->method('read')->with(null)->willReturn($dataOne);
+        $this->readerTwoMock->expects($this->once())->method('read')->with(null)->willReturn($dataTwo);
+        $this->readerThreeMock->expects($this->once())->method('read')->with(null)->willReturn([]);
+
+        $this->validatorMock->expects($this->once())->method('validate')->with($expectedValidationData);
+
+        $data = $this->reader->read();
+
+        $expectedData = [
+            //disabling existing connection and adding new
+            'top04' => [
+                'topic' => 'top04',
+                'disabled' => false,
+                'connection' => ['name' => 'db', 'disabled' => false, 'exchange' => 'magento2'],
+            ],
+            //two disabled connections are ignored
+            'top05' => [
+                'topic' => 'top05',
+                'disabled' => false,
+                'connection' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => false],
+            ],
+            //added default connection if not declared
+            'top06' => [
+                'topic' => 'top06',
+                'disabled' => false,
+                'connection' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false],
+            ],
+            //added default connection if all declared connections are disabled
+            'top07' => [
+                'topic' => 'top07',
+                'disabled' => false,
+                'connection' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false],
+            ],
+        ];
+
+        $this->assertEquals($expectedData, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeValidatorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeValidatorTest.php
new file mode 100644
index 00000000000..f53899f318d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/CompositeValidatorTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config;
+
+use Magento\Framework\MessageQueue\Publisher\Config\CompositeValidator;
+use Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface;
+
+class CompositeValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CompositeValidator
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorOneMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $validatorTwoMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->validatorOneMock = $this->createMock(ValidatorInterface::class);
+        $this->validatorTwoMock = $this->createMock(ValidatorInterface::class);
+
+        $this->model = new CompositeValidator([$this->validatorOneMock, $this->validatorTwoMock]);
+    }
+
+    public function testValidate()
+    {
+        $expectedValidationData = include __DIR__ . '/../../_files/queue_publisher/data_to_validate.php';
+        $this->validatorOneMock->expects($this->once())->method('validate')->with($expectedValidationData);
+        $this->validatorTwoMock->expects($this->once())->method('validate')->with($expectedValidationData);
+        $this->model->validate($expectedValidationData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage test
+     */
+    public function testValidatorThrowsException()
+    {
+        $expectedValidationData = include __DIR__ . '/../../_files/queue_publisher/data_to_validate.php';
+        $this->validatorOneMock
+            ->expects($this->once())
+            ->method('validate')
+            ->willThrowException(new \LogicException('test'));
+        $this->validatorTwoMock->expects($this->never())->method('validate');
+        $this->model->validate($expectedValidationData);
+    }
+
+    public function testInvalidReaderInstance()
+    {
+        $this->expectException(
+            '\LogicException',
+            'Validator [stdClass] does not implements ' .
+            'Magento\Framework\MessageQueue\Publisher\Config\ValidatorInterface'
+        );
+        $validator = new \stdClass();
+        $model = new CompositeValidator([$validator]);
+        $expectedValidationData = include __DIR__ . '/../../_files/queue_publisher/data_to_validate.php';
+        $model->validate($expectedValidationData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Env/ReaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Env/ReaderTest.php
new file mode 100644
index 00000000000..96528019cff
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Env/ReaderTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config\Env;
+
+use Magento\Framework\MessageQueue\Publisher\Config\Env\Reader;
+
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configDataMock;
+
+    /**
+     * @var Reader
+     *
+     */
+    private $reader;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cache = $this->getMockBuilder(\Magento\Framework\Config\CacheInterface::class)
+            ->getMock();
+        $data = [
+            'topics' => [
+                'inventory.counter.updated' => [
+                    'disabled' => false,
+                    'publisher' => 'amqp-magento'
+                ],
+            ],
+            'publishers' => [
+                'amqp-magento' => [
+                    'name' => 'amqp-magento',
+                    'connection' => 'db',
+                    'exchange' => 'magento-db'
+                ],
+            ]
+
+        ];
+        $reader = $this->getMockBuilder(\Magento\Framework\MessageQueue\Config\CompositeReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $reader->expects($this->any())->method('read')->willReturn($data);
+        $cache->expects($this->any())->method('load')->willReturn(false);
+        $this->configDataMock = $objectManager->getObject(
+            \Magento\Framework\MessageQueue\Config\Data::class,
+            [
+                'cache' => $cache,
+                'reader' => $reader
+            ]
+        );
+
+        $this->reader = new Reader(
+            $this->deploymentConfigMock,
+            $this->configDataMock,
+            [
+                'amqp-magento' => 'amqp',
+                'db-magento-db' => 'db'
+            ]
+        );
+    }
+
+    public function testReadCurrentConfig()
+    {
+        $configData = include __DIR__ . '/../../../_files/env_2_2.php';
+        $this->deploymentConfigMock->expects($this->once())->method('getConfigData')
+            ->with('queue')->willReturn($configData);
+        $actualResult = $this->reader->read();
+        $this->assertEquals($configData['config']['publishers'], $actualResult);
+    }
+
+    public function testReadPreviousConfig()
+    {
+        $configData = include __DIR__ . '/../../../_files/env_2_1.php';
+        $this->deploymentConfigMock->expects($this->once())->method('getConfigData')
+            ->with('queue')->willReturn($configData);
+        $actualResult = $this->reader->read();
+        $expectedResult = [
+            'inventory.counter.updated' => [
+                'connections' => [
+                    'amqp' => [
+                        'name' => 'db',
+                        'exchange' => 'magento-db',
+                        'disabled' => false
+                    ]
+                ],
+                'disabled' => false
+            ]
+        ];
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/RemoteService/ReaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/RemoteService/ReaderTest.php
new file mode 100644
index 00000000000..47c37077a54
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/RemoteService/ReaderTest.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config\RemoteService;
+
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\Publisher\Config\RemoteService\Reader;
+use Magento\Framework\ObjectManager\ConfigInterface as ObjectManagerConfig;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Reader
+     */
+    private $reader;
+
+    /**
+     * @var DefaultValueProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultValueProvider;
+
+    /**
+     * @var ObjectManagerConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerConfig;
+
+    /**
+     * @var ReflectionGenerator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $reflectionGenerator;
+
+    /**
+     * @var ServiceMethodsMap|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $serviceMethodsMap;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->defaultValueProvider = $this->createMock(DefaultValueProvider::class);
+        $this->objectManagerConfig = $this->createMock(ObjectManagerConfig::class);
+        $this->reflectionGenerator = $this->createMock(ReflectionGenerator::class);
+        $this->serviceMethodsMap = $this->createMock(ServiceMethodsMap::class);
+        $this->reader = $objectManager->getObject(
+            Reader::class,
+            [
+                'defaultValueProvider' => $this->defaultValueProvider,
+                'objectManagerConfig' => $this->objectManagerConfig,
+                'reflectionGenerator' => $this->reflectionGenerator,
+                'serviceMethodsMap' => $this->serviceMethodsMap,
+            ]
+        );
+    }
+
+    public function testRead()
+    {
+        $this->defaultValueProvider->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->defaultValueProvider->expects($this->any())->method('getExchange')->willReturn('magento');
+
+        $this->objectManagerConfig->expects($this->any())->method('getPreferences')->willReturn(
+            [
+                'Some\Service\NameInterface' => 'Some\Service\NameInterfaceRemote',
+                'Some\Service\NonRemoteInterface' => 'Some\Service\NonRemote'
+            ]
+        );
+
+        $this->serviceMethodsMap->expects($this->any())->method('getMethodsMap')->willReturn(
+            ['methodOne' => 'string', 'methodTwo' => 'string']
+        );
+
+        $this->reflectionGenerator->expects($this->exactly(2))->method('generateTopicName')->willReturnMap(
+            [
+                ['Some\Service\NameInterface', 'methodOne', 'topicOne'],
+                ['Some\Service\NameInterface', 'methodTwo', 'topicTwo']
+            ]
+        );
+
+        $expectedResult = [
+            'topicOne' => [
+                'topic' => 'topicOne',
+                'disabled' => false,
+                'connections' => ['amqp' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false]]
+            ],
+            'topicTwo' => [
+                'topic' => 'topicTwo',
+                'disabled' => false,
+                'connections' => ['amqp' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false]]
+            ],
+        ];
+
+        $this->assertEquals($expectedResult, $this->reader->read());
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Service interface was expected, "Some\Service\NameInterface" given
+     */
+    public function testReadInvalidService()
+    {
+        $this->defaultValueProvider->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->defaultValueProvider->expects($this->any())->method('getExchange')->willReturn('magento');
+
+        $this->objectManagerConfig->expects($this->any())->method('getPreferences')->willReturn(
+            [
+                'Some\Service\NameInterface' => 'Some\Service\NameInterfaceRemote',
+                'Some\Service\NonRemoteInterface' => 'Some\Service\NonRemote'
+            ]
+        );
+
+        $this->serviceMethodsMap->expects($this->any())->method('getMethodsMap')
+            ->willThrowException(new \Exception(''));
+
+        $this->reflectionGenerator->expects($this->exactly(0))->method('generateTopicName');
+
+        $this->reader->read();
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/EnabledConnectionTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/EnabledConnectionTest.php
new file mode 100644
index 00000000000..334bd20de5e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/EnabledConnectionTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config\Validator;
+
+use \Magento\Framework\MessageQueue\Publisher\Config\Validator\EnabledConnection;
+
+class EnabledConnectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var EnabledConnection
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new EnabledConnection();
+    }
+
+    public function testValidateValidConfig()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => true],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+            'pub02' => [
+                'topic' => 'pub02',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => true],
+                ]
+            ],
+            'pub03' => [
+                'topic' => 'pub02',
+                'disabled' => false,
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    public function testValidateMultipleEnabledConnections()
+    {
+        $this->expectException(
+            '\LogicException',
+            'More than 1 enabled connections configured for publisher pub01. ' .
+            'More than 1 enabled connections configured for publisher pub02.'
+        );
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+            'pub02' => [
+                'topic' => 'pub02',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/FormatTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/FormatTest.php
new file mode 100644
index 00000000000..1df7f078d9a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Validator/FormatTest.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config\Validator;
+
+use \Magento\Framework\MessageQueue\Publisher\Config\Validator\Format;
+
+class FormatTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Format
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new Format();
+    }
+
+    public function testValidateValidConfig()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => true],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+            'pub02' => [
+                'topic' => 'pub02',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => true],
+                ]
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing topic field for publisher pub01.
+     */
+    public function testValidateMissingTopicName()
+    {
+        $configData = [
+            'pub01' => [
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing disabled field for publisher pub01.
+     */
+    public function testValidateMissingDisabledField()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing connections field for publisher pub01.
+     */
+    public function testValidateMissingConnectionsField()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Invalid connections format for publisher pub01.
+     */
+    public function testValidateInvalidConnectionsFormat()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => 'con1'
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing name field for publisher pub01 in connection config.
+     */
+    public function testValidateInvalidPublisherConnectionName()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['exchange' => 'exchange01', 'disabled' => false],
+                ]
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing exchange field for publisher pub01 in connection config.
+     */
+    public function testValidateInvalidConnectionExchange()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'disabled' => false],
+                ]
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing disabled field for publisher pub01 in connection config.
+     */
+    public function testValidateInvalidConnectionDisabledField()
+    {
+        $configData = [
+            'pub01' => [
+                'topic' => 'pub01',
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'default'],
+                ]
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing topic field for publisher pub01. Missing disabled field for publisher pub02.
+     */
+    public function testValidateMultipleExceptions()
+    {
+        $configData = [
+            'pub01' => [
+                'disabled' => false,
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+            'pub02' => [
+                'topic' => 'pub02',
+                'connections' => [
+                    'con01' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                    'con02' => ['name' => 'con1', 'exchange' => 'exchange01', 'disabled' => false],
+                ],
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Xml/ConverterTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Xml/ConverterTest.php
new file mode 100644
index 00000000000..86e85261147
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/Config/Xml/ConverterTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher\Config\Xml;
+
+use Magento\Framework\MessageQueue\Publisher\Config\Xml\Converter;
+use Magento\Framework\Stdlib\BooleanUtils;
+
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Converter
+     */
+    private $converter;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultConfigProviderMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->defaultConfigProviderMock =
+            $this->createMock(\Magento\Framework\MessageQueue\DefaultValueProvider::class);
+        $this->converter = new Converter(new BooleanUtils(), $this->defaultConfigProviderMock);
+    }
+
+    public function testConvert()
+    {
+        $fixtureDir = __DIR__ . '/../../../_files/queue_publisher';
+        $xmlFile = $fixtureDir . '/valid.xml';
+        $dom = new \DOMDocument();
+        $dom->load($xmlFile);
+        $this->defaultConfigProviderMock->expects($this->any())->method('getExchange')->willReturn('magento');
+        $result = $this->converter->convert($dom);
+
+        $expectedData = include($fixtureDir . '/valid.php');
+        foreach ($expectedData as $key => $value) {
+            $this->assertEquals($value, $result[$key], 'Invalid data for ' . $key);
+        }
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Connection name is missing
+     */
+    public function testConvertWithException()
+    {
+        $fixtureDir = __DIR__ . '/../../../_files/queue_publisher';
+        $xmlFile = $fixtureDir . '/invalid.xml';
+        $dom = new \DOMDocument();
+        $dom->load($xmlFile);
+        $this->converter->convert($dom);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/XsdTest.php
new file mode 100644
index 00000000000..048ec82fb57
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/XsdTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Publisher;
+
+class XsdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    protected $_schemaFile;
+
+    protected function setUp()
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+        $urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
+        $this->_schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/publisher.xsd');
+    }
+
+    /**
+     * @param string $fixtureXml
+     * @param array $expectedErrors
+     * @dataProvider exemplarXmlDataProvider
+     */
+    public function testExemplarXml($fixtureXml, array $expectedErrors)
+    {
+        $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
+        $validationState->expects($this->any())
+            ->method('isValidationRequired')
+            ->willReturn(true);
+        $messageFormat = '%message%';
+        $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
+        $actualErrors = [];
+        $actualResult = $dom->validate($this->_schemaFile, $actualErrors);
+        $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
+        $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exemplarXmlDataProvider()
+    {
+        // @codingStandardsIgnoreStart
+        return [
+            /** Valid configurations */
+            'valid' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.01">
+                        <connection name="amqp" exchange="magento2" />
+                        <connection name="db" exchange="magento2" disabled="true" />
+                    </publisher>
+                    <publisher topic="topic.message.queue.config.02">
+                        <connection name="amqp" exchange="magento2" disabled="true"/>
+                        <connection name="db" exchange="magento2" disabled="true" />
+                    </publisher>
+                    <publisher topic="topic.message.queue.config.03" disabled="true" />
+                </config>',
+                [],
+            ],
+            'non unique publisher topic' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.01">
+                        <connection name="amqp" exchange="magento2" />
+                    </publisher>
+                    <publisher topic="topic.message.queue.config.01">
+                        <connection name="amqp" exchange="magento2" disabled="true"/>
+                    </publisher>
+                </config>',
+                [
+                    "Element 'publisher': Duplicate key-sequence ['topic.message.queue.config.01'] in unique identity-constraint 'unique-publisher-topic'."
+                ],
+            ],
+            'non unique publisher connection name' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.01">
+                        <connection name="amqp" exchange="magento2" />
+                        <connection name="amqp" exchange="magento2" />
+                    </publisher>
+                </config>',
+                [
+                    "Element 'connection': Duplicate key-sequence ['amqp'] in unique identity-constraint 'unique-connection-name'."
+                ],
+            ],
+            'missed required publisher attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher disabled="false">
+                        <connection name="amqp" exchange="magento2" />                        
+                    </publisher>
+                </config>',
+                [
+                    "Element 'publisher': The attribute 'topic' is required but missing."
+                ],
+            ],
+            'missed required connection attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="top01">
+                        <connection exchange="magento2" />                        
+                    </publisher>
+                </config>',
+                [
+                    "Element 'connection': The attribute 'name' is required but missing."
+                ],
+            ],
+            'unexpected publisher element' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <unexpected name="10">20</unexpected>
+                    <publisher topic="topic.message.queue.config.03" disabled="true" />
+                </config>',
+                [
+                    "Element 'unexpected': This element is not expected. Expected is ( publisher )."
+                ],
+            ],
+            'unexpected connection element' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.03" disabled="true">
+                        <connection name="amqp" exchange="magento2" />
+                        <unexpected name="10">20</unexpected>
+                    </publisher>
+                </config>',
+                [
+                    "Element 'unexpected': This element is not expected. Expected is ( connection )."
+                ],
+            ],
+            'unexpected publisher attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.03" disabled="true" unexpected="10"/>
+                </config>',
+                [
+                    "Element 'publisher', attribute 'unexpected': The attribute 'unexpected' is not allowed.",
+                ],
+            ],
+            'unexpected connection attribute' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.03" disabled="true">
+                        <connection name="amqp" exchange="magento2" unexpected="10"/>
+                    </publisher>
+                </config>',
+                [
+                    "Element 'connection', attribute 'unexpected': The attribute 'unexpected' is not allowed.",
+                ],
+            ],
+            'invalid connection attribute value' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.03" disabled="true">
+                        <connection name="amqp" exchange="magento2" disabled="disabled"/>
+                    </publisher>
+                </config>',
+                [
+                    "Element 'connection', attribute 'disabled': 'disabled' is not a valid value of the atomic type 'xs:boolean'.",
+                ],
+            ],
+            'invalid publisher attribute value' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+                    <publisher topic="topic.message.queue.config.03" disabled="disabled">
+                        <connection name="amqp" exchange="magento2" />
+                    </publisher>
+                </config>',
+                [
+                    "Element 'publisher', attribute 'disabled': 'disabled' is not a valid value of the atomic type 'xs:boolean'.",
+                ],
+            ],
+        ];
+        // @codingStandardsIgnoreEnd
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/PublisherTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/PublisherTest.php
new file mode 100644
index 00000000000..576da8b9a00
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/PublisherTest.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Test\Unit;
+
+use Magento\Framework\Amqp\Config as AmqpConfig;
+use Magento\Framework\MessageQueue\Envelope;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Magento\Framework\MessageQueue\ExchangeRepository;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\Publisher;
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConfigItem;
+use Magento\Framework\MessageQueue\Publisher\Config\PublisherConnection;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MysqlMq\Model\Driver\Exchange;
+
+/**
+ * Class PublisherTest @covers \Magento\Framework\MessageQueue\Publisher
+ */
+class PublisherTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var Publisher
+     */
+    private $publisher;
+
+    /**
+     * Publisher config mock.
+     *
+     * @var PublisherConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $publisherConfig;
+
+    /**
+     * Amqp config mock.
+     *
+     * @var AmqpConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $amqpConfig;
+
+    /**
+     * Message validator mock.
+     *
+     * @var MessageValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageValidator;
+
+    /**
+     * Message encoder mock.
+     *
+     * @var MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageEncoder;
+
+    /**
+     * Exchange repository mock.
+     *
+     * @var ExchangeRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $exchangeRepository;
+
+    /**
+     * Envelope factory mock.
+     *
+     * @var EnvelopeFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $envelopeFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->publisherConfig = $this->getMockBuilder(PublisherConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->amqpConfig = $this->getMockBuilder(AmqpConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->messageValidator = $this->getMockBuilder(MessageValidator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->messageEncoder = $this->getMockBuilder(MessageEncoder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->exchangeRepository = $this->getMockBuilder(ExchangeRepository::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->envelopeFactory = $this->getMockBuilder(EnvelopeFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManager = new ObjectManager($this);
+        $this->publisher = $objectManager->getObject(
+            Publisher::class,
+            [
+                'messageValidator' => $this->messageValidator,
+                'envelopeFactory' => $this->envelopeFactory,
+                'messageEncoder' => $this->messageEncoder,
+                'exchangeRepository' => $this->exchangeRepository,
+            ]
+        );
+        $objectManager->setBackwardCompatibleProperty($this->publisher, 'publisherConfig', $this->publisherConfig);
+        $objectManager->setBackwardCompatibleProperty($this->publisher, 'amqpConfig', $this->amqpConfig);
+    }
+
+    /**
+     * @covers \Magento\Framework\MessageQueue\Publisher::publish()
+     */
+    public function testPublish()
+    {
+        $topicName = 'tesTopicName';
+        $data = ['testData'];
+        $encodedData = 'testEncodedData';
+        $body = 'testBody';
+        $envelope = new Envelope($body);
+        $exchange = $this->getMockBuilder(Exchange::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $exchange->expects(self::once())
+            ->method('enqueue')
+            ->with(self::identicalTo($topicName), self::identicalTo($envelope))
+            ->willReturn(null);
+        $connection = $this->getMockBuilder(PublisherConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $connection->expects(self::once())
+            ->method('getName')
+            ->willReturn('amqp');
+        $publisher = $this->getMockBuilder(PublisherConfigItem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $publisher->expects(self::once())
+            ->method('getConnection')
+            ->willReturn($connection);
+        $this->messageValidator->expects(self::once())
+            ->method('validate');
+        $this->messageEncoder->expects(self::once())
+            ->method('encode')
+            ->with(self::identicalTo($topicName), self::identicalTo($data))
+            ->willReturn($encodedData);
+        $this->envelopeFactory->expects(self::once())
+            ->method('create')
+            ->willReturn($envelope);
+        $this->publisherConfig->expects(self::once())
+            ->method('getPublisher')
+            ->with($topicName)
+            ->willReturn($publisher);
+        $this->amqpConfig->expects(self::once())
+            ->method('getValue')
+            ->with(AmqpConfig::HOST)
+            ->willReturn('');
+        $this->exchangeRepository->expects(self::once())
+            ->method('getByConnectionName')
+            ->with('db')
+            ->willReturn($exchange);
+        self::assertNull($this->publisher->publish($topicName, $data));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Rpc/ResponseQueueNameBuilderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Rpc/ResponseQueueNameBuilderTest.php
new file mode 100644
index 00000000000..5034dc44d80
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Rpc/ResponseQueueNameBuilderTest.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Rpc;
+
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+
+class ResponseQueueNameBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetQueueName()
+    {
+        $model = new ResponseQueueNameBuilder();
+        $this->assertEquals('responseQueue.topic.01', $model->getQueueName('topic.01'));
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/QueueConfigItem/DataMapperTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/QueueConfigItem/DataMapperTest.php
new file mode 100644
index 00000000000..cc5c4ac8444
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/QueueConfigItem/DataMapperTest.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\QueueConfigItem;
+
+use Magento\Framework\MessageQueue\Topology\Config\Data;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem\DataMapper;
+
+class DataMapperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configData;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $communicationConfig;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $queueNameBuilder;
+
+    /**
+     * @var DataMapper
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->configData = $this->createMock(Data::class);
+        $this->communicationConfig = $this->createMock(CommunicationConfig::class);
+        $this->queueNameBuilder = $this->createMock(ResponseQueueNameBuilder::class);
+        $this->model = new DataMapper($this->configData, $this->communicationConfig, $this->queueNameBuilder);
+    }
+
+    public function testGetMappedData()
+    {
+        $data = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'topic01',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                    'bind02' => [
+                        'id' => 'bind02',
+                        'topic' => 'topic02',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+            'ex02' => [
+                'name' => 'ex02',
+                'type' => 'exchange',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'topic01',
+                        'destinationType' => 'exchange',
+                        'destination' => 'some.exchange',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+        ];
+
+        $communicationMap = [
+            ['topic01', ['name' => 'topic01', 'is_synchronous' => true]],
+            ['topic02', ['name' => 'topic02', 'is_synchronous' => false]],
+        ];
+
+        $this->communicationConfig->expects($this->exactly(2))->method('getTopic')->willReturnMap($communicationMap);
+        $this->configData->expects($this->once())->method('get')->willReturn($data);
+        $this->queueNameBuilder->expects($this->once())
+            ->method('getQueueName')
+            ->with('topic01')
+            ->willReturn('responseQueue.topic01');
+
+        $actualResult = $this->model->getMappedData();
+        $expectedResult = [
+            'responseQueue.topic01--amqp' => [
+                'name' => 'responseQueue.topic01',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'some.queue--amqp' => [
+                'name' => 'some.queue',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+        ];
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testGetMappedDataForWildcard()
+    {
+        $data = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => '#',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                    'bind02' => [
+                        'id' => 'bind02',
+                        'topic' => '*.*.*',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                    'bind03' => [
+                        'id' => 'bind03',
+                        'topic' => 'topic01',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+            'ex02' => [
+                'name' => 'ex02',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => '#.some.*',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+        ];
+
+        $communicationData = [
+            'topic01' =>  ['name' => 'topic01', 'is_synchronous' => true],
+            'topic02' =>  ['name' => 'topic02', 'is_synchronous' => true],
+            'topic03' =>  ['name' => 'topic03', 'is_synchronous' => true],
+            'topic04.04.04' =>  ['name' => 'topic04.04.04', 'is_synchronous' => true],
+            'topic05.05' =>  ['name' => 'topic05.05', 'is_synchronous' => true],
+            'topic06.06.06' =>  ['name' => 'topic06.06.06', 'is_synchronous' => false],
+            'topic07' =>  ['name' => 'topic07', 'is_synchronous' => false],
+            'topic08.part2.some.test' =>  ['name' => 'topic08.part2.some.test', 'is_synchronous' => true],
+        ];
+
+        $this->communicationConfig->expects($this->once())
+            ->method('getTopic')
+            ->with('topic01')
+            ->willReturn(['name' => 'topic01', 'is_synchronous' => true]);
+        $this->communicationConfig->expects($this->any())->method('getTopics')->willReturn($communicationData);
+        $this->configData->expects($this->once())->method('get')->willReturn($data);
+        $this->queueNameBuilder->expects($this->any())
+            ->method('getQueueName')
+            ->willReturnCallback(function ($value) {
+                return 'responseQueue.' . $value;
+            });
+
+        $actualResult = $this->model->getMappedData();
+        $expectedResult = [
+            'responseQueue.topic01--amqp' => [
+                'name' => 'responseQueue.topic01',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'some.queue--amqp' => [
+                'name' => 'some.queue',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'responseQueue.topic02--amqp' => [
+                'name' => 'responseQueue.topic02',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'responseQueue.topic03--amqp' => [
+                'name' => 'responseQueue.topic03',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'responseQueue.topic04.04.04--amqp' => [
+                'name' => 'responseQueue.topic04.04.04',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'responseQueue.topic05.05--amqp' => [
+                'name' => 'responseQueue.topic05.05',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ],
+            'responseQueue.topic08.part2.some.test--amqp' => [
+                'name' => 'responseQueue.topic08.part2.some.test',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ]
+        ];
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/RemoteService/ReaderTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/RemoteService/ReaderTest.php
new file mode 100644
index 00000000000..df402eb0331
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/RemoteService/ReaderTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\RemoteService;
+
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\Topology\Config\RemoteService\Reader;
+use Magento\Framework\ObjectManager\ConfigInterface as ObjectManagerConfig;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Reader
+     */
+    private $reader;
+
+    /**
+     * @var DefaultValueProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultValueProvider;
+
+    /**
+     * @var ObjectManagerConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerConfig;
+
+    /**
+     * @var ReflectionGenerator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $reflectionGenerator;
+
+    /**
+     * @var ServiceMethodsMap|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $serviceMethodsMap;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->defaultValueProvider = $this->createMock(DefaultValueProvider::class);
+        $this->objectManagerConfig = $this->createMock(ObjectManagerConfig::class);
+        $this->reflectionGenerator = $this->createMock(ReflectionGenerator::class);
+        $this->serviceMethodsMap = $this->createMock(ServiceMethodsMap::class);
+        $this->reader = $objectManager->getObject(
+            Reader::class,
+            [
+                'defaultValueProvider' => $this->defaultValueProvider,
+                'objectManagerConfig' => $this->objectManagerConfig,
+                'reflectionGenerator' => $this->reflectionGenerator,
+                'serviceMethodsMap' => $this->serviceMethodsMap,
+            ]
+        );
+    }
+
+    public function testRead()
+    {
+        $this->defaultValueProvider->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->defaultValueProvider->expects($this->any())->method('getExchange')->willReturn('magento');
+
+        $this->objectManagerConfig->expects($this->any())->method('getPreferences')->willReturn(
+            [
+                'Some\Service\NameInterface' => 'Some\Service\NameInterfaceRemote',
+                'Some\Service\NonRemoteInterface' => 'Some\Service\NonRemote'
+            ]
+        );
+
+        $this->serviceMethodsMap->expects($this->any())->method('getMethodsMap')->willReturn(
+            ['methodOne' => 'string', 'methodTwo' => 'string']
+        );
+
+        $this->reflectionGenerator->expects($this->exactly(2))->method('generateTopicName')->willReturnMap(
+            [
+                ['Some\Service\NameInterface', 'methodOne', 'topicOne'],
+                ['Some\Service\NameInterface', 'methodTwo', 'topicTwo']
+            ]
+        );
+
+        $expectedResult = [
+            'magento' => [
+                'name' => 'magento',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'autoDelete' => false,
+                'internal' => false,
+                'bindings' => [
+                    'topicOne--magento--queue.topicOne' => [
+                        'id' => 'topicOne--magento--queue.topicOne',
+                        'destinationType' => 'queue',
+                        'destination' => 'queue.topicOne',
+                        'disabled' => false,
+                        'topic' => 'topicOne',
+                        'arguments' => []
+                    ],
+                    'topicTwo--magento--queue.topicTwo' => [
+                        'id' => 'topicTwo--magento--queue.topicTwo',
+                        'destinationType' => 'queue',
+                        'destination' => 'queue.topicTwo',
+                        'disabled' => false,
+                        'topic' => 'topicTwo',
+                        'arguments' => []
+                    ]
+                ],
+                'arguments' => []
+            ]
+        ];
+
+        $this->assertEquals($expectedResult, $this->reader->read());
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Service interface was expected, "Some\Service\NameInterface" given
+     */
+    public function testReadInvalidService()
+    {
+        $this->defaultValueProvider->expects($this->any())->method('getConnection')->willReturn('amqp');
+        $this->defaultValueProvider->expects($this->any())->method('getExchange')->willReturn('magento');
+
+        $this->objectManagerConfig->expects($this->any())->method('getPreferences')->willReturn(
+            [
+                'Some\Service\NameInterface' => 'Some\Service\NameInterfaceRemote',
+                'Some\Service\NonRemoteInterface' => 'Some\Service\NonRemote'
+            ]
+        );
+
+        $this->serviceMethodsMap->expects($this->any())->method('getMethodsMap')
+            ->willThrowException(new \Exception(''));
+
+        $this->reflectionGenerator->expects($this->exactly(0))->method('generateTopicName');
+
+        $this->reader->read();
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php
new file mode 100644
index 00000000000..56c597dd8d8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/DependantFieldsTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\Validator;
+
+use \Magento\Framework\MessageQueue\Topology\Config\Validator\DependentFields;
+
+class DependantFieldsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DependentFields
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new DependentFields();
+    }
+
+    public function testValidateValidConfig()
+    {
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'bind01',
+                        'destinationType' => 'queue',
+                        'destination' => 'bind01',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+            'ex02' => [
+                'name' => 'ex01',
+                'type' => 'headers',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'destinationType' => 'queue',
+                        'destination' => 'some.queue',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ],
+        ];
+        $this->model->validate($configData);
+    }
+
+    public function testValidateMissingTopicField()
+    {
+        $expectedMessage = "Topic name is required for topic based exchange: ex01";
+        $this->expectException('\LogicException', $expectedMessage);
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'destinationType' => 'queue',
+                        'destination' => 'bind01',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php
new file mode 100644
index 00000000000..8e5106033b8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FieldsTypesTest.php
@@ -0,0 +1,458 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\Validator;
+
+use Magento\Framework\MessageQueue\Topology\Config\Validator\FieldsTypes;
+
+class FieldsTypesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FieldsTypes
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new FieldsTypes();
+    }
+
+    public function testValidateValidConfig()
+    {
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'bind01',
+                        'destinationType' => 'queue',
+                        'destination' => 'bind01',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @dataProvider invalidConfigDataProvider
+     * @param array $configData
+     * @param string $expectedExceptionMessage
+     */
+    public function testValidateInvalid($configData, $expectedExceptionMessage)
+    {
+        $this->expectException('\LogicException', $expectedExceptionMessage);
+        $this->model->validate($configData);
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function invalidConfigDataProvider()
+    {
+        return [
+            'type name' => [
+                [
+                    'ex01' => [
+                        'name' => true,
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'name' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'boolean', 'string' was expected."
+            ],
+            'type type' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 100,
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'type' field specified in configuration of 'ex01' exchange is invalid. Given 'integer"
+            ],
+            'invalid type' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'some',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Value of 'type' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'some', 'topic' was expected."
+            ],
+            'type connection' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => false,
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'connection' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'boolean', 'string' was expected."
+            ],
+            'type durable' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => 100,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'durable' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'integer', 'boolean' was expected."
+            ],
+            'type internal' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => null,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'internal' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'NULL', 'boolean' was expected."
+            ],
+            'type autoDelete' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => 1,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'autoDelete' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'integer', 'boolean' was expected."
+            ],
+            'type arguments' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => 'argument',
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'topic' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'bind01',
+                                'disabled' => false,
+                                'arguments' => ['some' => 'arguments'],
+                            ],
+                        ],
+                    ],
+                ],
+                "Type of 'arguments' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'string', 'array' was expected."
+            ],
+            'type bindings' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => false,
+                    ],
+                ],
+                "Type of 'bindings' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'boolean', 'array' was expected."
+            ],
+            'type binding id' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 100,
+                                'destinationType' => 'queue',
+                                'destination' => 'queue01',
+                                'disabled' => false,
+                                'topic' => 'topic01',
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ],
+                    ],
+                ],
+                "Type of 'id' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'integer', 'string' was expected."
+            ],
+            'type binding destinationType' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => false,
+                                'destination' => 'queue01',
+                                'disabled' => false,
+                                'topic' => 'topic01',
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ],
+                    ],
+                ],
+                "Type of 'destinationType' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'boolean', 'string' was expected."
+            ],
+            'invalid binding destinationType' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => 'test',
+                                'destination' => 'queue01',
+                                'disabled' => false,
+                                'topic' => 'topic01',
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ],
+                    ],
+                ],
+                "Value of 'destinationType' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'test', 'queue' was expected."
+            ],
+            'type binding destination' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => null,
+                                'disabled' => false,
+                                'topic' => 'topic01',
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ],
+                    ],
+                ],
+                "Type of 'destination' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'NULL', 'string' was expected."
+            ],
+            'type binding disabled' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'queue01',
+                                'disabled' => 1,
+                                'topic' => 'topic01',
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ],
+                    ],
+                ],
+                "Type of 'disabled' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'integer', 'boolean' was expected."
+            ],
+            'type binding topic' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'queue01',
+                                'disabled' => false,
+                                'topic' => false,
+                                'arguments' => ['some' => 'arg']
+                            ]
+                        ]
+                    ],
+                ],
+                "Type of 'topic' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'boolean', 'string' was expected."
+            ],
+            'type binding arguments' => [
+                [
+                    'ex01' => [
+                        'name' => 'ex01',
+                        'type' => 'topic',
+                        'connection' => 'amqp',
+                        'durable' => true,
+                        'internal' => false,
+                        'autoDelete' => false,
+                        'arguments' => ['some' => 'argument'],
+                        'bindings' => [
+                            'bind01' => [
+                                'id' => 'bind01',
+                                'destinationType' => 'queue',
+                                'destination' => 'queue01',
+                                'disabled' => false,
+                                'topic' => 'topic01',
+                                'arguments' => 'args'
+                            ]
+                        ]
+                    ],
+                ],
+                "Type of 'arguments' field specified in configuration of 'ex01' exchange is invalid."
+                . " Given 'string', 'array' was expected."
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php
new file mode 100644
index 00000000000..c918aecf983
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Validator/FormatTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\Validator;
+
+use \Magento\Framework\MessageQueue\Topology\Config\Validator\Format;
+
+class FormatTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Format
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new Format();
+    }
+
+    public function testValidateValidConfig()
+    {
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'bind01',
+                        'destinationType' => 'queue',
+                        'destination' => 'bind01',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    public function testValidateMissingRequiredExchangeFields()
+    {
+        $expectedMessage = "Missing [name] field for exchange ex01." . PHP_EOL .
+            "Missing [type] field for exchange ex01." . PHP_EOL .
+            "Missing [connection] field for exchange ex01." . PHP_EOL .
+            "Missing [durable] field for exchange ex01." . PHP_EOL .
+            "Missing [autoDelete] field for exchange ex01." . PHP_EOL .
+            "Missing [internal] field for exchange ex01." . PHP_EOL .
+            "Missing [arguments] field for exchange ex01.";
+        $this->expectException('\LogicException', $expectedMessage);
+        $configData = [
+            'ex01' => [
+                'invalid' => 'format',
+                'bindings' => [
+                    'bind01' => [
+                        'id' => 'bind01',
+                        'topic' => 'bind01',
+                        'destinationType' => 'bind01',
+                        'destination' => 'bind01',
+                        'disabled' => false,
+                        'arguments' => ['some' => 'arguments'],
+                    ],
+                ],
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    public function testValidateMissingRequiredBindingFields()
+    {
+        $expectedMessage = "Missing [id] field for binding ex01 in exchange config." . PHP_EOL .
+            "Missing [destinationType] field for binding ex01 in exchange config." . PHP_EOL .
+            "Missing [destination] field for binding ex01 in exchange config." . PHP_EOL .
+            "Missing [disabled] field for binding ex01 in exchange config." . PHP_EOL .
+            "Missing [topic] field for binding ex01 in exchange config." . PHP_EOL .
+            "Missing [arguments] field for binding ex01 in exchange config.";
+        $this->expectException('\LogicException', $expectedMessage);
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => [
+                    'bind01' => [
+                        'invalid' => 'format'
+                    ],
+                ],
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+
+    public function testValidateInvalidBindingsFormat()
+    {
+        $expectedMessage = "Invalid bindings format for exchange ex01.";
+        $this->expectException('\LogicException', $expectedMessage);
+        $configData = [
+            'ex01' => [
+                'name' => 'ex01',
+                'type' => 'topic',
+                'connection' => 'amqp',
+                'durable' => true,
+                'internal' => false,
+                'autoDelete' => false,
+                'arguments' => ['some' => 'argument'],
+                'bindings' => 'binding'
+            ]
+        ];
+        $this->model->validate($configData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Xml/ConverterTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Xml/ConverterTest.php
new file mode 100644
index 00000000000..9d574685730
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/Config/Xml/ConverterTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology\Config\Xml;
+
+use Magento\Framework\MessageQueue\Topology\Config\Xml\Converter;
+use Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\Data\Argument\InterpreterInterface;
+
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Converter
+     */
+    private $converter;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $interpreter;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $defaultConfigProviderMock;
+
+    /**
+     * Initialize parameters
+     */
+    protected function setUp()
+    {
+        $this->defaultConfigProviderMock =
+            $this->createMock(\Magento\Framework\MessageQueue\DefaultValueProvider::class);
+        $this->interpreter = $this->createMock(InterpreterInterface::class);
+        $this->converter = new Converter(new BooleanUtils(), $this->interpreter, $this->defaultConfigProviderMock);
+        $this->defaultConfigProviderMock->expects($this->any())->method('getConnection')->willReturn('amqp');
+    }
+
+    public function testConvert()
+    {
+        $fixtureDir = __DIR__ . '/../../../_files/queue_topology';
+        $xmlFile = $fixtureDir . '/valid.xml';
+        $dom = new \DOMDocument();
+        $dom->load($xmlFile);
+
+        $this->interpreter->expects($this->any())->method('evaluate')->willReturn(10);
+        $result = $this->converter->convert($dom);
+
+        $expectedData = include($fixtureDir . '/valid.php');
+        foreach ($expectedData as $key => $value) {
+            $this->assertEquals($value, $result[$key], 'Invalid data for ' . $key);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/MergedXsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/MergedXsdTest.php
new file mode 100644
index 00000000000..59f52c83a5f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/MergedXsdTest.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology;
+
+class MergedXsdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    private $schemaFile;
+
+    protected function setUp()
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+        $urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
+        $this->schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/topology_merged.xsd');
+    }
+
+    /**
+     * @param string $fixtureXml
+     * @param array $expectedErrors
+     * @dataProvider exemplarXmlDataProvider
+     */
+    public function testExemplarXml($fixtureXml, array $expectedErrors)
+    {
+        $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
+        $validationState->expects($this->any())
+            ->method('isValidationRequired')
+            ->willReturn(true);
+        $messageFormat = '%message%';
+        $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
+        $actualErrors = [];
+        $actualResult = $dom->validate($this->schemaFile, $actualErrors);
+        $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
+        $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exemplarXmlDataProvider()
+    {
+        // @codingStandardsIgnoreStart
+        return [
+            /** Valid configurations */
+            'valid' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" type="topic" connection="amqp" />
+                        <exchange name="ex02" type="topic" connection="amqp" />
+                        <exchange name="ex03" autoDelete="true" durable="false" internal="true" type="topic" connection="db">
+                            <arguments>
+                                <argument name="arg1" xsi:type="string">10</argument>
+                            </arguments>
+                        </exchange>
+                        <exchange name="ex04" type="topic" connection="amqp">
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" disabled="true" />
+                            <binding id="bind02" destinationType="queue" destination="queue01" topic="top01">
+                                <arguments>
+                                    <argument name="arg01" xsi:type="string">10</argument>
+                                </arguments>
+                            </binding>
+                        </exchange>
+                </config>',
+                [],
+            ],
+            'non-unique-exchange' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" type="topic" connection="amqp"/>
+                        <exchange name="ex01" type="topic" connection="amqp" />
+                </config>',
+                [
+                    "Element 'exchange': Duplicate key-sequence ['ex01', 'amqp'] in unique identity-constraint 'unique-exchange-name-connection'."
+                ],
+            ],
+            'non-unique-exchange-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" connection="amqp" type="topic">
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" disabled="true" />
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" />
+                        </exchange>
+                </config>',
+                [
+                    "Element 'binding': Duplicate key-sequence ['bind01'] in unique identity-constraint 'unique-binding-id'."
+                ],
+            ],
+            'invalid-destination-type-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                    <exchange name="ex01" type="topic" connection="amqp">
+                        <binding id="bind01" destinationType="topic" destination="queue01" topic="top01" />
+                    </exchange>
+                </config>',
+                [
+                    "Element 'binding', attribute 'destinationType': [facet 'enumeration'] The value 'topic' is not an element of the set {'queue'}.",
+                    "Element 'binding', attribute 'destinationType': 'topic' is not a valid value of the atomic type 'destinationType'."
+                ],
+            ],
+            'invalid-exchange-type-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                    <exchange name="ex01" type="exchange" connection="db">
+                        <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" />
+                    </exchange>
+                </config>',
+                [
+                    "Element 'exchange', attribute 'type': [facet 'enumeration'] The value 'exchange' is not an element of the set {'topic'}.",
+                    "Element 'exchange', attribute 'type': 'exchange' is not a valid value of the atomic type 'exchangeType'."
+                ],
+            ],
+            'missed-required-attributes' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" type="topic" />
+                        <exchange name="ex02" connection="amqp" />                        
+                </config>',
+                [
+                    "Element 'exchange': The attribute 'connection' is required but missing.",
+                    "Element 'exchange': The attribute 'type' is required but missing."
+                ],
+            ],
+        ];
+        // @codingStandardsIgnoreEnd
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/XsdTest.php
new file mode 100644
index 00000000000..46f57fc5729
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/XsdTest.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Test\Unit\Topology;
+
+class XsdTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    private $schemaFile;
+
+    protected function setUp()
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+        $urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
+        $this->schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/topology.xsd');
+    }
+
+    /**
+     * @param string $fixtureXml
+     * @param array $expectedErrors
+     * @dataProvider exemplarXmlDataProvider
+     */
+    public function testExemplarXml($fixtureXml, array $expectedErrors)
+    {
+        $validationState = $this->createMock(\Magento\Framework\Config\ValidationStateInterface::class);
+        $validationState->expects($this->any())
+            ->method('isValidationRequired')
+            ->willReturn(true);
+        $messageFormat = '%message%';
+        $dom = new \Magento\Framework\Config\Dom($fixtureXml, $validationState, [], null, null, $messageFormat);
+        $actualErrors = [];
+        $actualResult = $dom->validate($this->schemaFile, $actualErrors);
+        $this->assertEquals(empty($expectedErrors), $actualResult, "Validation result is invalid.");
+        $this->assertEquals($expectedErrors, $actualErrors, "Validation errors does not match.");
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function exemplarXmlDataProvider()
+    {
+        // @codingStandardsIgnoreStart
+        return [
+            /** Valid configurations */
+            'valid' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" type="topic" connection="amqp"/>
+                        <exchange name="ex02" type="topic" connection="amqp-02" />
+                        <exchange name="ex03" autoDelete="true" durable="false" internal="true" type="topic" connection="db">
+                            <arguments>
+                                <argument name="arg1" xsi:type="string">10</argument>
+                            </arguments>
+                        </exchange>
+                        <exchange name="ex04" connection="amqp-03">
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" disabled="true" />
+                            <binding id="bind02" destinationType="queue" destination="queue01" topic="top01">
+                                <arguments>
+                                    <argument name="arg01" xsi:type="string">10</argument>
+                                </arguments>
+                            </binding>
+                        </exchange>
+                </config>',
+                [],
+            ],
+            'non-unique-exchange' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" type="topic" connection="amqp"/>
+                        <exchange name="ex01" type="topic" connection="amqp" />
+                </config>',
+                [
+                    "Element 'exchange': Duplicate key-sequence ['ex01', 'amqp'] in unique identity-constraint 'unique-exchange-name-connection'."
+                ],
+            ],
+            'non-unique-exchange-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                        <exchange name="ex01" connection="amqp">
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" disabled="true" />
+                            <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" />
+                        </exchange>
+                </config>',
+                [
+                    "Element 'binding': Duplicate key-sequence ['bind01'] in unique identity-constraint 'unique-binding-id'."
+                ],
+            ],
+            'invalid-destination-type-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                    <exchange name="ex01" type="topic" connection="amqp">
+                        <binding id="bind01" destinationType="topic" destination="queue01" topic="top01" />
+                    </exchange>
+                </config>',
+                [
+                    "Element 'binding', attribute 'destinationType': [facet 'enumeration'] The value 'topic' is not an element of the set {'queue'}.",
+                    "Element 'binding', attribute 'destinationType': 'topic' is not a valid value of the atomic type 'destinationType'."
+                ],
+            ],
+            'invalid-exchange-type-binding' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+                    <exchange name="ex01" type="exchange" connection="amqp">
+                        <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" />
+                    </exchange>
+                </config>',
+                [
+                    "Element 'exchange', attribute 'type': [facet 'enumeration'] The value 'exchange' is not an element of the set {'topic'}.",
+                    "Element 'exchange', attribute 'type': 'exchange' is not a valid value of the atomic type 'exchangeType'."
+                ],
+            ],
+        ];
+        // @codingStandardsIgnoreEnd
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_1.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_1.php
new file mode 100644
index 00000000000..f73846d21f8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_1.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'publishers' => [
+        'amqp-magento' => [
+            'name' => 'amqp-magento',
+            'connection' => 'db',
+            'exchange' => 'magento-db'
+        ],
+    ],
+    'consumers' => [
+        'inventoryQtyCounter' => [
+            'connection' => 'db'
+        ],
+    ]
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_2.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_2.php
new file mode 100644
index 00000000000..c8f71fe7b47
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/env_2_2.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'config' => [
+        'publishers' => [
+            'inventory.counter.updated' => [
+                'connections' => [
+                    'amqp' => [
+                        'name' => 'db',
+                        'exchange' => 'magento-db'
+                    ],
+                ]
+            ]
+        ],
+        'consumers' => [
+            'inventoryQtyCounter' => [
+                'connection' => 'db'
+            ]
+        ]
+    ]
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_queue.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_queue.php
new file mode 100644
index 00000000000..5dacfb24118
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_queue.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'publishers' => [
+        'test-publisher-1' => [
+            'name' => 'test-publisher-1',
+            'connection' => 'amqp',
+            'exchange' => 'magento',
+        ],
+        'test-publisher-2' => [
+            'name' => 'test-publisher-2',
+            'connection' => 'db',
+            'exchange' => 'magento',
+        ],
+        'test-publisher-3' => [
+            'name' => 'test-publisher-3',
+            'connection' => 'amqp',
+            'exchange' => 'test-exchange-1',
+        ],
+    ],
+    'topics' => [
+        'customer.created' => [
+            'name' => 'customer.created',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-1',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'customer.created.one' => [
+            'name' => 'customer.created.one',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-1',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'customer.created.one.two' => [
+            'name' => 'customer.created.one.two',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-1',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'customer.created.two' => [
+            'name' => 'customer.created.two',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-1',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'customer.updated' => [
+            'name' => 'customer.updated',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-2',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'customer.deleted' => [
+            'name' => 'customer.deleted',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'test-publisher-2',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'cart.created' => [
+            'name' => 'cart.created',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Quote\Api\Data\CartInterface::class
+            ],
+            'publisher' => 'test-publisher-3',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+        'cart.created.one' => [
+            'name' => 'cart.created.one',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Quote\Api\Data\CartInterface::class
+            ],
+            'publisher' => 'test-publisher-3',
+            "response_schema" => [
+                "schema_type" => null,
+                "schema_value" => null
+            ],
+            'is_synchronous' => false,
+        ],
+    ],
+    'consumers' => [
+        'customerCreatedListener' => [
+            'name' => 'customerCreatedListener',
+            'queue' => 'test-queue-1',
+            'connection' => 'amqp',
+            'max_messages' => null,
+            'instance_type' => 'Test\Executor',
+            'consumer_type' => 'async',
+            'handlers' => [
+                'customer.created' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ],
+                'customer.created.one' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ],
+                'customer.created.one.two' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ],
+                'customer.created.two' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ],
+                'customer.updated' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ],
+                'cart.created' => [
+                    'defaultHandler' => [
+                        'type' => 'Data\Type',
+                        'method' => 'processMessage'
+                    ]
+                ]
+            ]
+        ],
+        'customerDeletedListener' => [
+            'name' => 'customerDeletedListener',
+            'queue' => 'test-queue-2',
+            'connection' => 'db',
+            'max_messages' => '98765',
+            'instance_type' => null,
+            'consumer_type' => 'async',
+            'handlers' => [
+                'customer.created' => [
+                    'defaultHandler' => [
+                        'type' => 'Other\Type',
+                        'method' => 'processMessage2'
+                    ]
+                ],
+                'customer.deleted' => [
+                    'defaultHandler' => [
+                        'type' => 'Other\Type',
+                        'method' => 'processMessage2'
+                    ]
+                ]
+            ]
+        ],
+        'cartCreatedListener' => [
+            'name' => 'cartCreatedListener',
+            'queue' => 'test-queue-3',
+            'connection' => 'amqp',
+            'max_messages' => null,
+            'instance_type' => null,
+            'consumer_type' => 'async',
+            'handlers' => [
+                'cart.created' => [
+                    'defaultHandler' => [
+                        'type' => 'Other\Type',
+                        'method' => 'processMessage3'
+                    ]
+                ],
+                'cart.created.one' => [
+                    'defaultHandler' => [
+                        'type' => 'Other\Type',
+                        'method' => 'processMessage3'
+                    ]
+                ]
+            ]
+        ],
+    ],
+    'binds' => [
+        'customer.created--magento--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "magento", 'topic' => "customer.created"],
+        'customer.created.one--magento--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "magento", 'topic' => "customer.created.one"],
+        'customer.created.one.two--magento--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "magento", 'topic' => "customer.created.one.two"],
+        'customer.created.two--magento--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "magento", 'topic' => "customer.created.two"],
+        'customer.updated--magento--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "magento", 'topic' => "customer.updated"],
+        'cart.created--test-exchange-1--test-queue-1' =>
+            ['queue' => "test-queue-1", 'exchange' => "test-exchange-1", 'topic' => "cart.created"],
+        'customer.created--magento--test-queue-2' =>
+            ['queue' => "test-queue-2", 'exchange' => "magento", 'topic' => "customer.created"],
+        'customer.deleted--magento--test-queue-2' =>
+            ['queue' => "test-queue-2", 'exchange' => "magento", 'topic' => "customer.deleted"],
+        'cart.created--magento--test-queue-3' =>
+            ['queue' => "test-queue-3", 'exchange' => "magento", 'topic' => "cart.created"],
+        'cart.created.one--magento--test-queue-3' =>
+            ['queue' => "test-queue-3", 'exchange' => "magento", 'topic' => "cart.created.one"],
+        'cart.created--test-exchange-1--test-queue-3' =>
+            ['queue' => "test-queue-3", 'exchange' => "test-exchange-1", 'topic' => "cart.created"],
+        'customer.*--magento--test-queue-4' =>
+            ['queue' => "test-queue-4", 'exchange' => "magento", 'topic' => "customer.*"],
+        'customer.#--magento--test-queue-5' =>
+            ['queue' => "test-queue-5", 'exchange' => "magento", 'topic' => "customer.#"],
+        'customer.*.one--magento--test-queue-6' =>
+            ['queue' => "test-queue-6", 'exchange' => "magento", 'topic' => "customer.*.one"],
+        '*.created.*--magento--test-queue-7' =>
+            ['queue' => "test-queue-7", 'exchange' => "magento", 'topic' => "*.created.*"],
+        '*.created.#--magento--test-queue-8' =>
+            ['queue' => "test-queue-8", 'exchange' => "magento", 'topic' => "*.created.#"],
+        '#--magento--test-queue-9' =>
+            ['queue' => "test-queue-9", 'exchange' => "magento", 'topic' => "#"],
+    ],
+    'exchange_topic_to_queues_map' => [
+        'magento--customer.created' => ['test-queue-1', 'test-queue-2', 'test-queue-4', 'test-queue-5', 'test-queue-9'],
+        'magento--customer.created.one' =>
+            ['test-queue-1', 'test-queue-5', 'test-queue-6', 'test-queue-7', 'test-queue-8', 'test-queue-9'],
+        'magento--customer.created.one.two' => ['test-queue-1', 'test-queue-5', 'test-queue-8', 'test-queue-9'],
+        'magento--customer.created.two' =>
+            ['test-queue-1', 'test-queue-5', 'test-queue-7', 'test-queue-8', 'test-queue-9'],
+        'magento--customer.updated' => ['test-queue-1', 'test-queue-4', 'test-queue-5', 'test-queue-9'],
+        'test-exchange-1--cart.created' => ['test-queue-1', 'test-queue-3'],
+        'magento--customer.deleted' => ['test-queue-2', 'test-queue-4', 'test-queue-5', 'test-queue-9'],
+        'magento--cart.created' => ['test-queue-3', 'test-queue-9'],
+        'magento--cart.created.one' => ['test-queue-3', 'test-queue-7', 'test-queue-8', 'test-queue-9'],
+    ]
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_topic_config.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_topic_config.php
new file mode 100644
index 00000000000..d2d1bfc2004
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/expected_topic_config.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'publishers' => [
+        'amqp-ex.01' => [
+            'name' => 'amqp-ex.01',
+            'connection' => 'amqp',
+            'exchange' => 'ex.01',
+        ],
+        'db-magento' => [
+            'name' => 'db-magento',
+            'connection' => 'db',
+            'exchange' => 'magento',
+        ],
+        'amqp-magento' => [
+            'name' => 'amqp-magento',
+            'connection' => 'amqp',
+            'exchange' => 'magento',
+        ],
+    ],
+    'binds' => [
+        'top.01--ex.01--q.01'   => ['queue' => 'q.01', 'exchange' => 'ex.01',   'topic' => 'top.01'],
+        'top.03--magento--q.03' => ['queue' => 'q.03', 'exchange' => 'magento', 'topic' => 'top.03'],
+        'top.04--magento--q.04' => ['queue' => 'q.04', 'exchange' => 'magento', 'topic' => 'top.04'],
+        'top.04--magento--q.05' => ['queue' => 'q.05', 'exchange' => 'magento', 'topic' => 'top.04'],
+        'top.04--magento--q.06' => ['queue' => 'q.06', 'exchange' => 'magento', 'topic' => 'top.04'],
+        'top.03--magento--q.04' => ['queue' => 'q.04', 'exchange' => 'magento', 'topic' => 'top.03'],
+        'user.created.remote--magento--q.log' => [
+            'queue' => 'q.log', 'exchange' => 'magento', 'topic' => 'user.created.remote'
+        ],
+        'product.created.local--magento--q.log' => [
+            'queue' => 'q.log', 'exchange' => 'magento', 'topic' => 'product.created.local'
+        ],
+    ],
+    'exchange_topic_to_queues_map' => [
+        'amqp-ex.01--top.01' => ['q.01'],
+        'amqp-magento--top.03' => ['q.03', 'q.04'],
+        'db-magento--top.04' => ['q.04', 'q.05', 'q.06'],
+        'amqp-magento--user.created.remote' => ['q.log'],
+        'amqp-magento--product.created.local' => ['q.log'],
+    ],
+    'consumers' => [
+        'cons.01' => [
+            'name' => 'cons.01',
+            'handlers' => [
+                'top.01' => [
+                    '0' => [
+                        'type' => 'Magento\Handler\Class\Name',
+                        'method' => 'methodName'
+                    ]
+                ]
+            ],
+            'instance_type' => 'Magento\Consumer\Instance',
+            'consumer_type' => 'async',
+            'max_messages' => '512',
+            'connection' => 'amqp',
+            'queue' => 'q.01'
+        ],
+        'cons.03' => [
+            'name' => 'cons.03',
+            'handlers' => [
+                'top.03' => [
+                    '0' => [
+                        'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                        'method' => 'save',
+                    ],
+                    '1' => [
+                        'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                        'method' => 'delete',
+                    ],
+                ]
+            ],
+            'instance_type' => 'Magento\Framework\MessageQueue\ConsumerInterface',
+            'consumer_type' => 'async',
+            'max_messages' => null,
+            'connection' => 'amqp',
+            'queue' => 'q.03'
+        ],
+        'cons.04' => [
+            'name' => 'cons.04',
+            'handlers' => [
+                'top.04' => [
+                    '0' => [
+                        'type' => 'Magento\Handler\Class\Name',
+                        'method' => 'methodName'
+                    ]
+                ]
+            ],
+            'instance_type' => 'Magento\Consumer\Instance',
+            'consumer_type' => 'async',
+            'max_messages' => '512',
+            'connection' => 'db',
+            'queue' => 'q.04'
+        ],
+        'cons.05' => [
+            'name' => 'cons.05',
+            'handlers' => [
+                'top.04' => [
+                    '0' => [
+                        'type' => 'Magento\Handler\Class\Name',
+                        'method' => 'methodName'
+                    ]
+                ]
+            ],
+            'instance_type' => 'Magento\Consumer\Instance',
+            'consumer_type' => 'async',
+            'max_messages' => '512',
+            'connection' => 'db',
+            'queue' => 'q.05'
+        ],
+         'cons.06' => [
+            'name' => 'cons.06',
+            'handlers' => [
+                'top.04' => [
+                    '0' => [
+                        'type' => 'Magento\Handler\Class\Name',
+                        'method' => 'methodName'
+                    ]
+                ]
+            ],
+            'instance_type' => 'Magento\Consumer\Instance',
+            'consumer_type' => 'async',
+            'max_messages' => '512',
+            'connection' => 'db',
+            'queue' => 'q.06'
+         ],
+        'cons.07' => [
+            'name' => 'cons.07',
+            'handlers' => [
+                'top.03' => [
+                    '0' => [
+                        'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                        'method' => 'save',
+                    ],
+                    '1' => [
+                        'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                        'method' => 'delete',
+                    ],
+                ]
+            ],
+            'instance_type' => 'Magento\Framework\MessageQueue\ConsumerInterface',
+            'consumer_type' => 'async',
+            'max_messages' => null,
+            'connection' => 'amqp',
+            'queue' => 'q.04'
+        ],
+        'cons.logger' => [
+            'name' => 'cons.logger',
+            'handlers' => [
+                'product.created.local' => [
+                    '0' => [
+                        'type' => 'Magento\Handler\Class\Name',
+                        'method' => 'logger'
+                    ]
+                ]
+            ],
+            'instance_type' => 'Magento\Framework\MessageQueue\ConsumerInterface',
+            'consumer_type' => 'async',
+            'max_messages' => null,
+            'connection' => 'amqp',
+            'queue' => 'q.log'
+        ],
+    ],
+    'topics' => [
+        'top.01' => [
+            'name' => 'top.01',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'response_schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'amqp-ex.01',
+            'is_synchronous' => false,
+        ],
+        'top.03' => [
+            'name' => 'top.03',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'response_schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'amqp-magento',
+            'is_synchronous' => false,
+        ],
+        'top.04' => [
+            'name' => 'top.04',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'response_schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'db-magento',
+            'is_synchronous' => false,
+        ],
+        'user.created.remote' => [
+            'name' => 'user.created.remote',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'response_schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'amqp-magento',
+            'is_synchronous' => false,
+        ],
+        'product.created.local' => [
+            'name' => 'product.created.local',
+            'schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'response_schema' => [
+                'schema_type' => 'object',
+                'schema_value' => \Magento\Customer\Api\Data\CustomerInterface::class
+            ],
+            'publisher' => 'amqp-magento',
+            'is_synchronous' => false,
+        ],
+    ]
+
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.php
new file mode 100644
index 00000000000..5d22103b4c5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'consumer1' => [
+        'name' => 'consumer1',
+        'queue' => 'queue1',
+        'consumerInstance' => 'consumerClass1',
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassOne',
+                'method' => 'handlerMethodOne'
+            ],
+        ],
+        'connection' => 'connection1',
+        'maxMessages' => '100',
+    ],
+    'consumer2' => [
+        'name' => 'consumer2',
+        'queue' => 'queue2',
+        'consumerInstance' => 'consumerClass2',
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassTwo',
+                'method' => 'handlerMethodTwo'
+            ],
+        ],
+        'connection' => 'connection2',
+        'maxMessages' => null,
+    ],
+    'consumer3' => [
+        'name' => 'consumer3',
+        'queue' => 'queue3',
+        'consumerInstance' => 'consumerClass3',
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassThree',
+                'method' => 'handlerMethodThree'
+            ],
+        ],
+        'connection' => 'amqp',
+        'maxMessages' => null,
+    ],
+    'consumer4' => [
+        'name' => 'consumer4',
+        'queue' => 'queue4',
+        'consumerInstance' => \Magento\Framework\MessageQueue\ConsumerInterface::class,
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassFour',
+                'method' => 'handlerMethodFour'
+            ],
+        ],
+        'connection' => 'amqp',
+        'maxMessages' => null,
+    ],
+    'consumer5' => [
+        'name' => 'consumer5',
+        'queue' => 'queue5',
+        'consumerInstance' => \Magento\Framework\MessageQueue\ConsumerInterface::class,
+        'handlers' => [],
+        'connection' => 'amqp',
+        'maxMessages' => null,
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.xml
new file mode 100644
index 00000000000..f020c64a069
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="connection1" maxMessages="100"/>
+    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="connection2"/>
+    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+    <consumer name="consumer5" queue="queue5"/>
+</config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/data_to_validate.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/data_to_validate.php
new file mode 100644
index 00000000000..c4b750767e7
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/data_to_validate.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'top04' => [
+        'topic' => 'top04',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'magento8', 'disabled' => true],
+            'db' => ['name' => 'db', 'exchange' => 'magento2', 'disabled' => false]
+        ]
+    ],
+    'top05' => [
+        'topic' => 'top05',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => false],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true],
+        ]
+    ],
+    'top06' => [
+        'topic' => 'top06',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false]
+        ]
+    ],
+    'top07' => [
+        'topic' => 'top07',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true],
+        ]
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/invalid.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/invalid.xml
new file mode 100644
index 00000000000..52a438b0a95
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/invalid.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+    <publisher topic="top04">
+        <connection ecxhange="exch01" />
+    </publisher>
+</config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_one.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_one.php
new file mode 100644
index 00000000000..37db3771d0f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_one.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'top04' => [
+        'topic' => 'top04',
+        'disabled' => false,
+        'connections' => ['amqp' => ['name' => 'amqp', 'exchange' => 'magento8', 'disabled' => false]]
+    ],
+    'top06' => [
+        'topic' => 'top06',
+        'disabled' => false,
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_two.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_two.php
new file mode 100644
index 00000000000..8f8c3486a53
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/reader_two.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'top04' => [
+        'topic' => 'top04',
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'disabled' => true],
+            'db' => ['name' => 'db', 'exchange' => 'magento2', 'disabled' => false]
+        ]
+    ],
+    'top05' => [
+        'topic' => 'top05',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => false],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true],
+        ]
+    ],
+    'top07' => [
+        'topic' => 'top07',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => true],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true],
+        ]
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.php
new file mode 100644
index 00000000000..f2266665aea
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'top01' => [
+        'topic' => 'top01',
+        'disabled' => false,
+        'connections' => []
+    ],
+    'top02' => [
+        'topic' => 'top02',
+        'disabled' => false,
+        'connections' => []
+    ],
+    'top03' => [
+        'topic' => 'top03',
+        'disabled' => true,
+        'connections' => []
+    ],
+    'top04' => [
+        'topic' => 'top04',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'magento', 'disabled' => false]
+        ]
+    ],
+    'top05' => [
+        'topic' => 'top05',
+        'disabled' => false,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => false],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true],
+        ]
+    ],
+    'top06' => [
+        'topic' => 'top06',
+        'disabled' => true,
+        'connections' => [
+            'amqp' => ['name' => 'amqp', 'exchange' => 'exch01', 'disabled' => false],
+            'db' => ['name' => 'db', 'exchange' => 'exch02', 'disabled' => true]
+        ]
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.xml
new file mode 100644
index 00000000000..8fd0b0a0e6b
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_publisher/valid.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
+    <publisher topic="top01" />
+    <publisher topic="top02" disabled="false" />
+    <publisher topic="top03" disabled="true" />
+    <publisher topic="top04">
+        <connection name="amqp" />
+    </publisher>
+    <publisher topic="top05">
+        <connection name="amqp" exchange="exch01" />
+        <connection name="db" exchange="exch02" disabled="true"/>
+    </publisher>
+    <publisher topic="top06" disabled="true">
+        <connection name="amqp" exchange="exch01" />
+        <connection name="db" exchange="exch02" disabled="true"/>
+    </publisher>
+</config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.php
new file mode 100644
index 00000000000..17049a5e097
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'ex01--amqp' => [
+        'name' => 'ex01',
+        'type' => 'topic',
+        'connection' => 'amqp',
+        'durable' => true,
+        'autoDelete' => false,
+        'internal' => false,
+        'bindings' => [],
+        'arguments' => [],
+    ],
+    'ex02--amqp' => [
+        'name' => 'ex02',
+        'type' => 'topic',
+        'connection' => 'amqp',
+        'durable' => true,
+        'autoDelete' => false,
+        'internal' => false,
+        'bindings' => [],
+        'arguments' => [],
+    ],
+    'ex03--amqp' => [
+        'name' => 'ex03',
+        'type' => 'topic',
+        'connection' => 'amqp',
+        'durable' => false,
+        'autoDelete' => true,
+        'internal' => true,
+        'bindings' => [],
+        'arguments' => [
+            'arg1' => '10',
+        ],
+    ],
+    'ex04--amqp' => [
+        'name' => 'ex04',
+        'type' => 'topic',
+        'connection' => 'amqp',
+        'durable' => true,
+        'autoDelete' => false,
+        'internal' => false,
+        'bindings' => [
+            'bind01' => [
+                'id' => 'bind01',
+                'destinationType' => 'queue',
+                'destination' => 'queue01',
+                'disabled' => true,
+                'topic' => 'top01',
+                'arguments' => []
+            ],
+            'bind02' => [
+                'id' => 'bind02',
+                'destinationType' => 'queue',
+                'destination' => 'queue01',
+                'disabled' => false,
+                'topic' => 'top01',
+                'arguments' => [
+                    'arg01' => 10
+                ]
+            ],
+        ],
+        'arguments' => [],
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.xml
new file mode 100644
index 00000000000..8686841e57f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_topology/valid.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+    <exchange name="ex01" type="topic" connection="amqp"/>
+    <exchange name="ex02" type="topic" connection="amqp" />
+    <exchange name="ex03" autoDelete="true" durable="false" internal="true" type="topic" connection="amqp">
+        <arguments>
+            <argument name="arg1" xsi:type="string">10</argument>
+        </arguments>
+    </exchange>
+    <exchange name="ex04" type="topic" connection="amqp">
+        <binding id="bind01" destinationType="queue" destination="queue01" topic="top01" disabled="true" />
+        <binding id="bind02" destinationType="queue" destination="queue01" topic="top01">
+            <arguments>
+                <argument name="arg01" xsi:type="string">10</argument>
+            </arguments>
+        </binding>
+    </exchange>
+</config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_config.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_config.xml
new file mode 100644
index 00000000000..6553d0468c3
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config>
+    <broker topic="top.01" type="amqp" exchange="ex.01">
+        <queue name="q.01" handler="Magento\Handler\Class\Name::methodName" consumer="cons.01" consumerInstance="Magento\Consumer\Instance" maxMessages="512" />
+    </broker>
+    <broker topic="top.03">
+        <queue name="q.03" consumer="cons.03" />
+        <queue name="q.04" consumer="cons.07" />
+    </broker>
+    <broker topic="top.04" type="db">
+        <queue name="q.04" handler="Magento\Handler\Class\Name::methodName" consumer="cons.04" consumerInstance="Magento\Consumer\Instance" maxMessages="512" />
+        <queue name="q.05" handler="Magento\Handler\Class\Name::methodName" consumer="cons.05" consumerInstance="Magento\Consumer\Instance" maxMessages="512" />
+        <queue name="q.06" handler="Magento\Handler\Class\Name::methodName" consumer="cons.06" consumerInstance="Magento\Consumer\Instance" maxMessages="512" />
+    </broker>
+    <broker topic="*.created.*">
+        <queue name="q.log" handler="Magento\Handler\Class\Name::logger" consumer="cons.logger" />
+    </broker>
+</config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_definitions_map.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_definitions_map.php
new file mode 100644
index 00000000000..27fe84a9ef8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/topic_definitions_map.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    [
+        'top.01',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+        ]
+    ],
+    [
+        'top.03',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'handlers' => [
+                'customerCreatedFirst' => [
+                    'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                    'method' => 'save',
+                ],
+                'customerCreatedSecond' => [
+                    'type' => \Magento\Customer\Api\CustomerRepositoryInterface::class,
+                    'method' => 'delete',
+                ],
+            ]
+        ]
+    ],
+    [
+        'top.04',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+        ]
+    ],
+    [
+        'top.05',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+        ]
+    ],
+    [
+        'user.created.remote',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+        ]
+    ],
+    [
+        'product.created.local',
+        [
+            'is_synchronous' => false,
+            'request' => \Magento\Customer\Api\Data\CustomerInterface::class,
+            'request_type' => 'object_interface',
+            'response' => \Magento\Customer\Api\Data\CustomerInterface::class,
+        ]
+    ],
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/wildcard_pattern_map.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/wildcard_pattern_map.php
new file mode 100644
index 00000000000..0f2f0b2a335
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/wildcard_pattern_map.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    ['customer.created', '/^customer\.created$/'],
+    ['customer.created.one', '/^customer\.created\.one$/'],
+    ['customer.created.one.two', '/^customer\.created\.one\.two$/'],
+    ['customer.created.two', '/^customer\.created\.two$/'],
+    ['customer.updated', '/^customer\.updated$/'],
+    ['cart.created', '/^cart\.created$/'],
+    ['customer.deleted', '/^customer\.deleted$/'],
+    ['cart.created.one', '/^cart\.created\.one$/'],
+    ['customer.*', '/^customer\.[^\.]+$/'],
+    ['customer.#', '/^customer\..+$/'],
+    ['customer.*.one', '/^customer\.[^\.]+\.one$/'],
+    ['*.created.*', '/^[^\.]+\.created\.[^\.]+$/'],
+    ['*.created.#', '/^[^\.]+\.created\..+$/'],
+    ['#', '/^.+$/']
+];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config.php
new file mode 100644
index 00000000000..7add2bd286e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\MessageQueue\Topology;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Iterator as ExchangeIterator;
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem\Iterator as QueueIterator;
+
+/**
+ * Topology config provides access to data declared in etc/queue_topology.xml
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * Exchange config data iterator.
+     *
+     * @var ExchangeIterator
+     */
+    private $exchangeIterator;
+
+    /**
+     * Exchange config data iterator.
+     *
+     * @var ExchangeIterator
+     */
+    private $queueIterator;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ExchangeIterator $exchangeIterator
+     * @param QueueIterator $queueIterator
+     */
+    public function __construct(ExchangeIterator $exchangeIterator, QueueIterator $queueIterator)
+    {
+        $this->exchangeIterator = $exchangeIterator;
+        $this->queueIterator = $queueIterator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getExchange($name, $connection)
+    {
+        $topology = $this->exchangeIterator[$name . '--' . $connection];
+        if (!$topology) {
+            throw new LocalizedException(
+                new Phrase(
+                    'The "%exchange" exchange is not declared for the "%connection" connection. Verify and try again.',
+                    [
+                        'exchange' => $name,
+                        'connection' => $connection
+                    ]
+                )
+            );
+        }
+        return $topology;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getExchanges()
+    {
+        return $this->exchangeIterator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueues()
+    {
+        return $this->queueIterator;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeReader.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeReader.php
new file mode 100644
index 00000000000..b565916c724
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeReader.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+use Magento\Framework\Phrase;
+
+/**
+ * Composite reader for topology config.
+ */
+class CompositeReader implements ReaderInterface
+{
+    /**
+     * Config validator.
+     *
+     * @var ValidatorInterface
+     */
+    private $validator;
+
+    /**
+     * Config reade list.
+     *
+     * @var ReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param ValidatorInterface $validator
+     * @param ReaderInterface[] $readers
+     */
+    public function __construct(ValidatorInterface $validator, array $readers)
+    {
+        $this->validator = $validator;
+        $this->readers = $readers;
+    }
+
+    /**
+     * Read config.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        foreach ($this->readers as $reader) {
+            $result = array_replace_recursive($result, $reader->read($scope));
+        }
+        $this->validator->validate($result);
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeValidator.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeValidator.php
new file mode 100644
index 00000000000..27965241998
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/CompositeValidator.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Topology config data validator.
+ */
+class CompositeValidator implements ValidatorInterface
+{
+    /**
+     * Config validator list.
+     *
+     * @var ValidatorInterface[]
+     */
+    private $validators;
+
+    /**
+     * Validator constructor.
+     *
+     * @param ValidatorInterface[] $validators
+     */
+    public function __construct($validators)
+    {
+        $this->validators = $validators;
+    }
+
+    /**
+     * Validate merged topology config data.
+     *
+     * @param array $configData
+     * @throws \LogicException
+     * @return void
+     * @throws \LogicException
+     */
+    public function validate($configData)
+    {
+        foreach ($this->validators as $validator) {
+            if (!$validator instanceof ValidatorInterface) {
+                throw new \LogicException(
+                    sprintf(
+                        'Validator [%s] does not implements %s',
+                        ValidatorInterface::class,
+                        get_class($validator)
+                    )
+                );
+            }
+            $validator->validate($configData);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Data.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Data.php
new file mode 100644
index 00000000000..6711428f066
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Data.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Topology config data storage. Caches merged config.
+ */
+class Data extends \Magento\Framework\Config\Data
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        ReaderInterface $reader,
+        \Magento\Framework\Config\CacheInterface $cache,
+        $cacheId = 'message_queue_topology_config_cache',
+        SerializerInterface $serializer = null
+    ) {
+        parent::__construct($reader, $cache, $cacheId, $serializer);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem.php
new file mode 100644
index 00000000000..b767a516833
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding\IteratorFactory;
+
+/**
+ * {@inheritdoc}
+ */
+class ExchangeConfigItem implements ExchangeConfigItemInterface
+{
+    /**
+     * Exchange name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Exchange type.
+     *
+     * @var string
+     */
+    private $type;
+
+    /**
+     * Connection name.
+     *
+     * @var string
+     */
+    private $connection;
+
+    /**
+     * Exchange bindings.
+     *
+     * @var BindingInterface[]
+     */
+    private $bindings;
+
+    /**
+     * Exchange arguments.
+     *
+     * @var array
+     */
+    private $arguments;
+
+    /**
+     * Flag. Is exchange durable.
+     *
+     * @var bool
+     */
+    private $isDurable;
+
+    /**
+     * Flag. Is auto-delete
+     *
+     * @var bool
+     */
+    private $isAutoDelete;
+
+    /**
+     * Flag. Is exchange internal.
+     *
+     * @var bool
+     */
+    private $isInternal;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param IteratorFactory $iteratorFactory
+     */
+    public function __construct(IteratorFactory $iteratorFactory)
+    {
+        $this->bindings = $iteratorFactory->create();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDurable()
+    {
+        return $this->isDurable;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isAutoDelete()
+    {
+        return $this->isAutoDelete;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isInternal()
+    {
+        return $this->isInternal;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBindings()
+    {
+        return $this->bindings;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * Set exchange config item data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->name = $data['name'];
+        $this->type = $data['type'];
+        $this->connection = $data['connection'];
+        $this->isInternal = $data['internal'];
+        $this->isDurable = $data['durable'];
+        $this->isAutoDelete = $data['autoDelete'];
+        $this->arguments = $data['arguments'];
+        $this->bindings->setData($data['bindings']);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding.php
new file mode 100644
index 00000000000..f6d964c3d08
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem;
+
+/**
+ * Instances of this class represent config binding items declared in etc/queue_topology.xsd
+ */
+class Binding implements BindingInterface
+{
+    /**
+     * Binding id.
+     *
+     * @var string
+     */
+    private $id;
+
+    /**
+     * Binding destination type.
+     *
+     * @var string
+     */
+    private $destinationType;
+
+    /**
+     * Binding destination.
+     *
+     * @var string
+     */
+    private $destination;
+
+    /**
+     * Flag. Is binding disabled.
+     * @var bool
+     */
+    private $isDisabled;
+
+    /**
+     * Topic name.
+     *
+     * @var string
+     */
+    private $topic;
+
+    /**
+     * Binding arguments.
+     *
+     * @var array
+     */
+    private $arguments;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDestinationType()
+    {
+        return $this->destinationType;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDestination()
+    {
+        return $this->destination;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDisabled()
+    {
+        return $this->isDisabled;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTopic()
+    {
+        return $this->topic;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * Set binding data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->id = $data['id'];
+        $this->destinationType = $data['destinationType'];
+        $this->destination = $data['destination'];
+        $this->arguments = $data['arguments'];
+        $this->topic = $data['topic'];
+        $this->isDisabled = $data['disabled'];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/Iterator.php
new file mode 100644
index 00000000000..1bc9adef61f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/Iterator.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding;
+
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingFactory;
+
+/**
+ * Exchange binding config data iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Exchange binding config.
+     *
+     * @var Binding
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param BindingFactory $itemFactory
+     */
+    public function __construct(BindingFactory $itemFactory)
+    {
+        $this->object = $itemFactory->create();
+    }
+
+    /**
+     * Set iterator data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return Binding
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+            if ($this->current()->isDisabled()) {
+                $this->next();
+            }
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+            if ($this->current()->isDisabled()) {
+                $this->next();
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset) || $this->data[$offset]['disabled'] == true) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/IteratorFactory.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/IteratorFactory.php
new file mode 100644
index 00000000000..bc2faca4f34
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Binding/IteratorFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding;
+
+/**
+ * Factory class for @see Iterator
+ */
+class IteratorFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = Iterator::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return Iterator
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingFactory.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingFactory.php
new file mode 100644
index 00000000000..be83da69799
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\Binding
+ */
+class BindingFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = Binding::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return Binding
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingInterface.php
new file mode 100644
index 00000000000..d6a5689f5b4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/BindingInterface.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem;
+
+/**
+ * Instances of this interface represent config binging items declared in etc/queue_topology.xsd
+ */
+interface BindingInterface
+{
+    /**
+     * Get binding name.
+     *
+     * @return string
+     */
+    public function getId();
+
+    /**
+     * Get binding destination type.
+     *
+     * @return string
+     */
+    public function getDestinationType();
+
+    /**
+     * Get destination.
+     *
+     * @return string
+     */
+    public function getDestination();
+
+    /**
+     * Check if binding is disabled.
+     *
+     * @return bool
+     */
+    public function isDisabled();
+
+    /**
+     * Get topic name.
+     *
+     * @return string
+     */
+    public function getTopic();
+
+    /**
+     * Get binding arguments
+     *
+     * @return array
+     */
+    public function getArguments();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Iterator.php
new file mode 100644
index 00000000000..85dad637191
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Iterator.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem;
+
+use Magento\Framework\MessageQueue\Topology\Config\Data;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemFactory;
+
+/**
+ * Exchange config data iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Exchange config.
+     *
+     * @var ExchangeConfigItem
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Data $configData
+     * @param ExchangeConfigItemFactory $itemFactory
+     */
+    public function __construct(Data $configData, ExchangeConfigItemFactory $itemFactory)
+    {
+        $this->data = $configData->get();
+        $this->object = $itemFactory->create();
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return ExchangeConfigItem
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset)) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemFactory.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemFactory.php
new file mode 100644
index 00000000000..b684f366736
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem
+ */
+class ExchangeConfigItemFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = ExchangeConfigItem::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemInterface.php
new file mode 100644
index 00000000000..c5d6680a4bb
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItemInterface.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+use \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface;
+
+/**
+ * Instances of this class represent config items declared in etc/queue_topology.xsd
+ */
+interface ExchangeConfigItemInterface
+{
+    /**
+     * Get exchange name.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get exchange type.
+     *
+     * @return string
+     */
+    public function getType();
+
+    /**
+     * Get exchange connection.
+     *
+     * @return string
+     */
+    public function getConnection();
+
+    /**
+     * Check if exchange is durable.
+     *
+     * @return bool
+     */
+    public function isDurable();
+
+    /**
+     * Check if exchange is auto delete.
+     *
+     * @return bool
+     */
+    public function isAutoDelete();
+
+    /**
+     * Check if exchange is internal.
+     *
+     * @return bool
+     */
+    public function isInternal();
+
+    /**
+     * Get exchange bindings.
+     *
+     * @return BindingInterface[]
+     */
+    public function getBindings();
+
+    /**
+     * Get exchange arguments
+     *
+     * @return array
+     */
+    public function getArguments();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem.php
new file mode 100644
index 00000000000..ba201cdc1b6
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Instances of this class represent queue config items.
+ */
+class QueueConfigItem implements QueueConfigItemInterface
+{
+    /**
+     * Queue name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Connection name.
+     *
+     * @var string
+     */
+    private $connection;
+
+    /**
+     * Queue arguments.
+     *
+     * @var array
+     */
+    private $arguments;
+
+    /**
+     * Flag. Is queue durable.
+     *
+     * @var bool
+     */
+    private $isDurable;
+
+    /**
+     * Flag. Is auto-delete
+     *
+     * @var bool
+     */
+    private $isAutoDelete;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isDurable()
+    {
+        return $this->isDurable;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isAutoDelete()
+    {
+        return $this->isAutoDelete;
+    }
+
+    /**
+     * Set exchange config item data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function setData(array $data)
+    {
+        $this->name = $data['name'];
+        $this->connection = $data['connection'];
+        $this->isDurable = $data['durable'];
+        $this->isAutoDelete = $data['autoDelete'];
+        $this->arguments = $data['arguments'];
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/DataMapper.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/DataMapper.php
new file mode 100644
index 00000000000..7e8d35fb094
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/DataMapper.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem;
+
+use Magento\Framework\MessageQueue\Topology\Config\Data;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+use Magento\Framework\Phrase;
+
+/**
+ * Topology queue config data mapper.
+ */
+class DataMapper
+{
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $mappedData;
+
+    /**
+     * @var Data
+     */
+    private $configData;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * @var ResponseQueueNameBuilder
+     */
+    private $queueNameBuilder;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Data $configData
+     * @param CommunicationConfig $communicationConfig
+     * @param ResponseQueueNameBuilder $queueNameBuilder
+     */
+    public function __construct(
+        Data $configData,
+        CommunicationConfig $communicationConfig,
+        ResponseQueueNameBuilder $queueNameBuilder
+    ) {
+        $this->configData = $configData;
+        $this->communicationConfig = $communicationConfig;
+        $this->queueNameBuilder = $queueNameBuilder;
+    }
+
+    /**
+     * Get mapped config data.
+     *
+     * @return array
+     */
+    public function getMappedData()
+    {
+        if (null === $this->mappedData) {
+            $this->mappedData = [];
+            foreach ($this->configData->get() as $exchange) {
+                $connection = $exchange['connection'];
+                foreach ($exchange['bindings'] as $binding) {
+                    if ($binding['destinationType'] === 'queue') {
+                        $queueItems = $this->createQueueItems($binding['destination'], $binding['topic'], $connection);
+                        $this->mappedData = array_merge($this->mappedData, $queueItems);
+                    }
+                }
+            }
+        }
+        return $this->mappedData;
+    }
+
+    /**
+     * Create queue config item.
+     *
+     * @param string $name
+     * @param string $topic
+     * @param string $connection
+     * @return array
+     */
+    private function createQueueItems($name, $topic, $connection)
+    {
+        $output = [];
+        $synchronousTopics = [];
+
+        if (strpos($topic, '*') !== false || strpos($topic, '#') !== false) {
+            $synchronousTopics = $this->matchSynchronousTopics($topic);
+        } elseif ($this->isSynchronousTopic($topic)) {
+            $synchronousTopics[$topic] = $topic;
+        }
+
+        foreach ($synchronousTopics as $topicName) {
+            $callbackQueueName = $this->queueNameBuilder->getQueueName($topicName);
+            $output[$callbackQueueName . '--' . $connection] = [
+                'name' => $callbackQueueName,
+                'connection' => $connection,
+                'durable' => true,
+                'autoDelete' => false,
+                'arguments' => [],
+            ];
+        }
+
+        $output[$name . '--' . $connection] = [
+            'name' => $name,
+            'connection' => $connection,
+            'durable' => true,
+            'autoDelete' => false,
+            'arguments' => [],
+        ];
+        return $output;
+    }
+
+    /**
+     * Check whether the topic is in synchronous mode
+     *
+     * @param string $topicName
+     * @return bool
+     * @throws LocalizedException
+     */
+    private function isSynchronousTopic($topicName)
+    {
+        try {
+            $topic = $this->communicationConfig->getTopic($topicName);
+            $isSync = (bool)$topic[CommunicationConfig::TOPIC_IS_SYNCHRONOUS];
+        } catch (LocalizedException $e) {
+            throw new LocalizedException(new Phrase('Error while checking if topic is synchronous'));
+        }
+        return $isSync;
+    }
+
+    /**
+     * Generate topics list based on wildcards.
+     *
+     * @param string $wildcard
+     * @return array
+     */
+    private function matchSynchronousTopics($wildcard)
+    {
+        $topicDefinitions = array_filter(
+            $this->communicationConfig->getTopics(),
+            function ($item) {
+                return (bool)$item[CommunicationConfig::TOPIC_IS_SYNCHRONOUS];
+            }
+        );
+
+        $topics = [];
+        $pattern = $this->buildWildcardPattern($wildcard);
+        foreach (array_keys($topicDefinitions) as $topicName) {
+            if (preg_match($pattern, $topicName)) {
+                $topics[$topicName] = $topicName;
+            }
+        }
+        return $topics;
+    }
+
+    /**
+     * Construct perl regexp pattern for matching topic names from wildcard key.
+     *
+     * @param string $wildcardKey
+     * @return string
+     */
+    private function buildWildcardPattern($wildcardKey)
+    {
+        $pattern = '/^' . str_replace('.', '\.', $wildcardKey);
+        $pattern = str_replace('#', '.+', $pattern);
+        $pattern = str_replace('*', '[^\.]+', $pattern);
+        $pattern .= strpos($wildcardKey, '#') === strlen($wildcardKey) ? '/' : '$/';
+        return $pattern;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/Iterator.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/Iterator.php
new file mode 100644
index 00000000000..e76c88f556a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItem/Iterator.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem;
+
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItem;
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItemFactory;
+
+/**
+ * Queue config item iterator.
+ */
+class Iterator implements \Iterator, \ArrayAccess
+{
+    /**
+     * Consumer config item.
+     *
+     * @var QueueConfigItem
+     */
+    private $object;
+
+    /**
+     * Config data.
+     *
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param DataMapper $configData
+     * @param QueueConfigItemFactory $itemFactory
+     */
+    public function __construct(DataMapper $configData, QueueConfigItemFactory $itemFactory)
+    {
+        $this->data = $configData->getMappedData();
+        $this->object = $itemFactory->create();
+        $this->rewind();
+    }
+
+    /**
+     * Get current item.
+     *
+     * @return QueueConfigItem
+     */
+    public function current()
+    {
+        return $this->object;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        next($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * Initialize object.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function initObject(array $data)
+    {
+        $this->object->setData($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        key($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return (bool)current($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        reset($this->data);
+        if (current($this->data)) {
+            $this->initObject(current($this->data));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetGet($offset)
+    {
+        if (!$this->offsetExists($offset)) {
+            return null;
+        }
+        $item = clone $this->object;
+        $item->setData($this->data[$offset]);
+        return $item;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemFactory.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemFactory.php
new file mode 100644
index 00000000000..977bc80cd35
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemFactory.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Factory class for @see \Magento\Framework\MessageQueue\Queue\Config\QueueConfigItem
+ */
+class QueueConfigItemFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    private $instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = QueueConfigItem::class
+    ) {
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return QueueConfigItem
+     */
+    public function create(array $data = [])
+    {
+        return $this->objectManager->create($this->instanceName, $data);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemInterface.php
new file mode 100644
index 00000000000..fbae97a9c17
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/QueueConfigItemInterface.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Instances of this class represent queue config items.
+ */
+interface QueueConfigItemInterface
+{
+    /**
+     * Get queue name.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get queue connection.
+     *
+     * @return string
+     */
+    public function getConnection();
+
+    /**
+     * Check if queue is durable.
+     *
+     * @return bool
+     */
+    public function isDurable();
+
+    /**
+     * Check if queue is auto delete.
+     *
+     * @return bool
+     */
+    public function isAutoDelete();
+
+    /**
+     * Get queue arguments
+     *
+     * @return array
+     */
+    public function getArguments();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ReaderInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ReaderInterface.php
new file mode 100644
index 00000000000..60eda0d3b8a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ReaderInterface.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Topology config reader interface
+ */
+interface ReaderInterface extends \Magento\Framework\Config\ReaderInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/RemoteService/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/RemoteService/Reader.php
new file mode 100644
index 00000000000..59b3fb716a4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/RemoteService/Reader.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\RemoteService;
+
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+use Magento\Framework\MessageQueue\Code\Generator\RemoteServiceGenerator;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+use Magento\Framework\MessageQueue\Topology\Config\ReaderInterface;
+use Magento\Framework\ObjectManager\ConfigInterface as ObjectManagerConfig;
+use Magento\Framework\Reflection\MethodsMap as ServiceMethodsMap;
+
+/**
+ * Reader for queue topology configs based on remote service declaration in DI configs.
+ */
+class Reader implements ReaderInterface
+{
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * @var ObjectManagerConfig
+     */
+    private $objectManagerConfig;
+
+    /**
+     * @var ReflectionGenerator
+     */
+    private $reflectionGenerator;
+
+    /**
+     * @var ServiceMethodsMap
+     */
+    private $serviceMethodsMap;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param DefaultValueProvider $defaultValueProvider
+     * @param ObjectManagerConfig $objectManagerConfig
+     * @param ReflectionGenerator $reflectionGenerator
+     * @param ServiceMethodsMap $serviceMethodsMap
+     */
+    public function __construct(
+        DefaultValueProvider $defaultValueProvider,
+        ObjectManagerConfig $objectManagerConfig,
+        ReflectionGenerator $reflectionGenerator,
+        ServiceMethodsMap $serviceMethodsMap
+    ) {
+        $this->defaultValueProvider = $defaultValueProvider;
+        $this->objectManagerConfig = $objectManagerConfig;
+        $this->reflectionGenerator = $reflectionGenerator;
+        $this->serviceMethodsMap = $serviceMethodsMap;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($scope = null)
+    {
+        $exchangeName = $this->defaultValueProvider->getExchange();
+        return [
+            $exchangeName => [
+                'name' => $exchangeName,
+                'type' => 'topic',
+                'connection' => $this->defaultValueProvider->getConnection(),
+                'durable' => true,
+                'autoDelete' => false,
+                'internal' => false,
+                'bindings' => $this->generateBindings(),
+                'arguments' => [],
+            ]
+        ];
+    }
+
+    /**
+     * Generate list of bindings based on information about remote services declared in DI config.
+     *
+     * @return array
+     *
+     * @throws \LogicException
+     *
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function generateBindings()
+    {
+        $bindings = [];
+        foreach ($this->getRemoteServices() as $serviceInterface => $remoteImplementation) {
+            try {
+                $methodsMap = $this->serviceMethodsMap->getMethodsMap($serviceInterface);
+            } catch (\Exception $e) {
+                throw new \LogicException(sprintf('Service interface was expected, "%s" given', $serviceInterface));
+            }
+            foreach ($methodsMap as $methodName => $returnType) {
+                $topic = $this->reflectionGenerator->generateTopicName($serviceInterface, $methodName);
+                $exchangeName = $this->defaultValueProvider->getExchange();
+                $destination = 'queue.' . $topic;
+                $id = $topic . '--' . $exchangeName . '--' . $destination;
+                $bindings[$id] = [
+                    'id' => $id,
+                    'destinationType' => 'queue',
+                    'destination' => $destination,
+                    'disabled' => false,
+                    'topic' => $topic,
+                    'arguments' => []
+                ];
+            }
+        }
+        return $bindings;
+    }
+
+    /**
+     * Get list of remote services declared in DI config.
+     *
+     * @return array
+     */
+    private function getRemoteServices()
+    {
+        $preferences = $this->objectManagerConfig->getPreferences();
+        $remoteServices = [];
+        foreach ($preferences as $type => $preference) {
+            if ($preference == $type . RemoteServiceGenerator::REMOTE_SERVICE_SUFFIX) {
+                $remoteServices[$type] = $preference;
+            }
+        }
+        return $remoteServices;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/DependentFields.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/DependentFields.php
new file mode 100644
index 00000000000..fcf10053e41
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/DependentFields.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Validator;
+
+use Magento\Framework\MessageQueue\Topology\Config\ValidatorInterface;
+
+/**
+ * Topology config data validator.
+ */
+class DependentFields implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        $errors = [];
+        foreach ($configData as $name => $data) {
+            foreach ((array)$data['bindings'] as $binding) {
+                if (isset($data['type']) && $data['type'] == 'topic' && !isset($binding['topic'])) {
+                    $errors[] = 'Topic name is required for topic based exchange: ' . $name;
+                }
+            }
+        }
+
+        if (!empty($errors)) {
+            throw new \LogicException(implode(PHP_EOL, $errors));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/FieldsTypes.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/FieldsTypes.php
new file mode 100644
index 00000000000..2e1cf52ee4c
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/FieldsTypes.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Validator;
+
+use Magento\Framework\MessageQueue\Topology\Config\ValidatorInterface;
+
+/**
+ * Consumer config data validator for fields types.
+ */
+class FieldsTypes implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        foreach ($configData as $exchangeName => $exchangeConfig) {
+            $this->validateFieldsTypes($exchangeName, $exchangeConfig);
+        }
+    }
+
+    /**
+     * Make sure types of all fields in the exchange item config are correct.
+     *
+     * @param string $exchangeName
+     * @param array $exchangeConfig
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateFieldsTypes($exchangeName, $exchangeConfig)
+    {
+        $fields = [
+            'name' => ['type' => 'string', 'value' => null],
+            'type' => ['type' => 'string', 'value' => ['topic']],
+            'connection' => ['type' => 'string', 'value' => null],
+            'durable' => ['type' => 'boolean', 'value' => null],
+            'autoDelete' => ['type' => 'boolean', 'value' => null],
+            'internal' => ['type' => 'boolean', 'value' => null],
+            'bindings' => ['type' => 'array', 'value' => null],
+            'arguments' => ['type' => 'array', 'value' => null],
+        ];
+
+        $bindingFields = [
+            'id' => ['type' => 'string', 'value' => null],
+            'destinationType' => ['type' => 'string', 'value' => ['queue']],
+            'destination' => ['type' => 'string', 'value' => null],
+            'disabled' => ['type' => 'boolean', 'value' => null],
+            'topic' => ['type' => 'string', 'value' => null],
+            'arguments' => ['type' => 'array', 'value' => null],
+        ];
+
+        foreach ($fields as $fieldName => $expectedType) {
+            $actualType = gettype($exchangeConfig[$fieldName]);
+            if ($actualType !== $expectedType['type']) {
+                throw new \LogicException(
+                    sprintf(
+                        "Type of '%s' field specified in configuration of '%s' exchange is invalid. "
+                        . "Given '%s', '%s' was expected.",
+                        $fieldName,
+                        $exchangeName,
+                        $actualType,
+                        $expectedType['type']
+                    )
+                );
+            }
+
+            if ($expectedType['value'] && !in_array($exchangeConfig[$fieldName], $expectedType['value'])) {
+                throw new \LogicException(
+                    sprintf(
+                        "Value of '%s' field specified in configuration of '%s' exchange is invalid. "
+                        . "Given '%s', '%s' was expected.",
+                        $fieldName,
+                        $exchangeName,
+                        $exchangeConfig[$fieldName],
+                        implode(' or ', $expectedType['value'])
+                    )
+                );
+            }
+        }
+
+        $this->validateBindings($exchangeName, $exchangeConfig, $bindingFields);
+    }
+
+    /**
+     * Validate binding config.
+     *
+     * @param string $exchangeName
+     * @param array $exchangeConfig
+     * @param array $bindingFields
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateBindings($exchangeName, $exchangeConfig, $bindingFields)
+    {
+        foreach ($bindingFields as $bindFieldName => $bindExpectedType) {
+            foreach ($exchangeConfig['bindings'] as $bindingConfig) {
+                $actualType = gettype($bindingConfig[$bindFieldName]);
+                if ($actualType !== $bindExpectedType['type']) {
+                    throw new \LogicException(
+                        sprintf(
+                            "Type of '%s' field specified in configuration of '%s' exchange is invalid. "
+                            . "Given '%s', '%s' was expected.",
+                            $bindFieldName,
+                            $exchangeName,
+                            $actualType,
+                            $bindExpectedType['type']
+                        )
+                    );
+                }
+
+                if ($bindExpectedType['value'] &&
+                    !in_array($bindingConfig[$bindFieldName], $bindExpectedType['value'])
+                ) {
+                    throw new \LogicException(
+                        sprintf(
+                            "Value of '%s' field specified in configuration of '%s' exchange is invalid. "
+                            . "Given '%s', '%s' was expected.",
+                            $bindFieldName,
+                            $exchangeName,
+                            $bindingConfig[$bindFieldName],
+                            implode(' or ', $bindExpectedType['value'])
+                        )
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/Format.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/Format.php
new file mode 100644
index 00000000000..50acb6cbd5f
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Validator/Format.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Validator;
+
+use Magento\Framework\MessageQueue\Topology\Config\ValidatorInterface;
+
+/**
+ * Topology config data validator.
+ */
+class Format implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($configData)
+    {
+        $requiredFields = ['name', 'type', 'connection', 'durable', 'autoDelete', 'internal', 'bindings', 'arguments'];
+        $requiredBindingFields = ['id', 'destinationType', 'destination', 'disabled', 'topic', 'arguments'];
+        $errors = [];
+        foreach ($configData as $name => $data) {
+            $diff = array_diff($requiredFields, array_keys($data));
+            foreach ($diff as $field) {
+                $errors[] = sprintf('Missing [%s] field for exchange %s.', $field, $name);
+            }
+
+            if (!array_key_exists('bindings', $data) || !is_array($data['bindings'])) {
+                $errors[] = sprintf('Invalid bindings format for exchange %s.', $name);
+                continue;
+            }
+
+            foreach ($data['bindings'] as $bindingConfig) {
+                $diff = array_diff($requiredBindingFields, array_keys($bindingConfig));
+                foreach ($diff as $field) {
+                    $errors[] = sprintf('Missing [%s] field for binding %s in exchange config.', $field, $name);
+                }
+            }
+        }
+
+        if (!empty($errors)) {
+            throw new \LogicException(implode(PHP_EOL, $errors));
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ValidatorInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ValidatorInterface.php
new file mode 100644
index 00000000000..49967171173
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/ValidatorInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config;
+
+/**
+ * Topology config data validator.
+ */
+interface ValidatorInterface
+{
+    /**
+     * Validate topology config data.
+     *
+     * @param array $configData
+     * @throws \LogicException
+     * @return void
+     */
+    public function validate($configData);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Converter.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Converter.php
new file mode 100644
index 00000000000..516a4f08097
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Converter.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Xml;
+
+use Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\Data\Argument\InterpreterInterface;
+use Magento\Framework\Config\Converter\Dom\Flat as FlatConverter;
+use Magento\Framework\Config\Dom\ArrayNodeConfig;
+use Magento\Framework\Config\Dom\NodePathMatcher;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+
+/**
+ * Converts MessageQueue topology config from \DOMDocument to array
+ */
+class Converter implements \Magento\Framework\Config\ConverterInterface
+{
+    /**
+     * @var FlatConverter
+     */
+    private $converter;
+
+    /**
+     * Boolean value converter.
+     *
+     * @var BooleanUtils
+     */
+    private $booleanUtils;
+
+    /**
+     * Argument interpreter.
+     *
+     * @var InterpreterInterface
+     */
+    private $argumentInterpreter;
+
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValue;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param BooleanUtils $booleanUtils
+     * @param InterpreterInterface $argumentInterpreter
+     * @param DefaultValueProvider $defaultValueProvider
+     */
+    public function __construct(
+        BooleanUtils $booleanUtils,
+        InterpreterInterface $argumentInterpreter,
+        DefaultValueProvider $defaultValueProvider
+    ) {
+        $this->booleanUtils = $booleanUtils;
+        $this->argumentInterpreter = $argumentInterpreter;
+        $this->defaultValue = $defaultValueProvider;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convert($source)
+    {
+        $result = [];
+        /** @var $exchange \DOMElement */
+        foreach ($source->getElementsByTagName('exchange') as $exchange) {
+            $name = $this->getAttributeValue($exchange, 'name');
+            $connection = $this->getAttributeValue($exchange, 'connection');
+
+            $bindings = [];
+            $exchangeArguments = [];
+            /** @var \DOMNode $node */
+            foreach ($exchange->childNodes as $node) {
+                if (!in_array($node->nodeName, ['binding', 'arguments']) || $node->nodeType != XML_ELEMENT_NODE) {
+                    continue;
+                }
+                switch ($node->nodeName) {
+                    case 'binding':
+                        $bindings = $this->processBindings($node, $bindings);
+                        break;
+
+                    case 'arguments':
+                        $exchangeArguments = $this->processArguments($node);
+                        break;
+                }
+            }
+
+            $autoDelete = $this->getAttributeValue($exchange, 'autoDelete', false);
+            $result[$name . '--' . $connection] = [
+                'name' => $name,
+                'type' => $this->getAttributeValue($exchange, 'type'),
+                'connection' => $connection,
+                'durable' => $this->booleanUtils->toBoolean($this->getAttributeValue($exchange, 'durable', true)),
+                'autoDelete' => $this->booleanUtils->toBoolean($autoDelete),
+                'internal' => $this->booleanUtils->toBoolean($this->getAttributeValue($exchange, 'internal', false)),
+                'bindings' => $bindings,
+                'arguments' => $exchangeArguments,
+            ];
+        }
+        return $result;
+    }
+
+    /**
+     * Retrieve instance of XML converter
+     *
+     * @return FlatConverter
+     */
+    private function getConverter()
+    {
+        if (!$this->converter) {
+            $arrayNodeConfig = new ArrayNodeConfig(new NodePathMatcher(), ['argument(/item)+' => 'name']);
+            $this->converter = new FlatConverter($arrayNodeConfig);
+        }
+        return $this->converter;
+    }
+
+    /**
+     * Process arguments.
+     *
+     * @param \DOMNode $node
+     * @return array
+     */
+    private function processArguments(\DOMNode $node)
+    {
+        $output = [];
+        /** @var \DOMNode $argumentNode */
+        foreach ($node->childNodes as $argumentNode) {
+            if ($argumentNode->nodeType != XML_ELEMENT_NODE || $argumentNode->nodeName != 'argument') {
+                continue;
+            }
+            $argumentName = $argumentNode->attributes->getNamedItem('name')->nodeValue;
+            $argumentData = $this->getConverter()->convert($argumentNode, 'argument');
+            $output[$argumentName] = $this->argumentInterpreter->evaluate($argumentData);
+        }
+        return $output;
+    }
+
+    /**
+     * Get attribute value of the given node
+     *
+     * @param \DOMNode $node
+     * @param string $attributeName
+     * @param mixed $default
+     * @return string|null
+     */
+    private function getAttributeValue(\DOMNode $node, $attributeName, $default = null)
+    {
+        $item = $node->attributes->getNamedItem($attributeName);
+        return $item ? $item->nodeValue : $default;
+    }
+
+    /**
+     * Parse bindings.
+     *
+     * @param \DOMNode $node
+     * @param array $bindings
+     * @return array
+     */
+    private function processBindings($node, $bindings)
+    {
+        $bindingArguments = [];
+        $id = $this->getAttributeValue($node, 'id');
+        $isDisabled = $this->booleanUtils->toBoolean(
+            $this->getAttributeValue($node, 'disabled', false)
+        );
+        foreach ($node->childNodes as $arguments) {
+            if ($arguments->nodeName != 'arguments' || $arguments->nodeType != XML_ELEMENT_NODE) {
+                continue;
+            }
+            $bindingArguments = $this->processArguments($arguments);
+        }
+        $bindings[$id] = [
+            'id' => $id,
+            'destinationType' => $this->getAttributeValue($node, 'destinationType'),
+            'destination' => $this->getAttributeValue($node, 'destination'),
+            'disabled' => $isDisabled,
+            'topic' => $this->getAttributeValue($node, 'topic'),
+            'arguments' => $bindingArguments
+        ];
+        return $bindings;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Reader.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Reader.php
new file mode 100644
index 00000000000..6dbdf78d1f0
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Reader.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Xml;
+
+use \Magento\Framework\MessageQueue\Topology\Config\ReaderInterface;
+
+/**
+ * Reader for etc/queue_topology.xml configs.
+ */
+class Reader extends \Magento\Framework\Config\Reader\Filesystem implements ReaderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected $_idAttributes = [
+        '/config/exchange' => ['name', 'connection'],
+        '/config/exchange/arguments/argument' => 'name',
+        '/config/exchange/arguments/argument(/item)+' => 'name',
+        '/config/exchange/binding' => 'id',
+        '/config/exchange/binding/arguments/argument' => 'name',
+        '/config/exchange/binding/arguments/argument(/item)+' => 'name',
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        \Magento\Framework\Config\FileResolverInterface $fileResolver,
+        Converter $converter,
+        SchemaLocator $schemaLocator,
+        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        $fileName = 'queue_topology.xml',
+        $idAttributes = [],
+        $domDocumentClass = \Magento\Framework\Config\Dom::class,
+        $defaultScope = 'global'
+    ) {
+        parent::__construct(
+            $fileResolver,
+            $converter,
+            $schemaLocator,
+            $validationState,
+            $fileName,
+            $idAttributes,
+            $domDocumentClass,
+            $defaultScope
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/SchemaLocator.php b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/SchemaLocator.php
new file mode 100644
index 00000000000..0ed9f3f21df
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/SchemaLocator.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology\Config\Xml;
+
+/**
+ * Schema locator for etc/queue_topology.xml
+ */
+class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    protected $schema;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     *
+     * @var string
+     */
+    protected $perFileSchema;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
+     */
+    public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
+    {
+        $this->schema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/topology_merged.xsd');
+        $this->perFileSchema = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/topology.xsd');
+    }
+
+    /**
+     * Get path to merged config schema
+     *
+     * @return string|null
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * Get path to per file validation schema
+     *
+     * @return string|null
+     */
+    public function getPerFileSchema()
+    {
+        return $this->perFileSchema;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/ConfigInterface.php
new file mode 100644
index 00000000000..81d056999b5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/ConfigInterface.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\MessageQueue\Topology;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemInterface;
+use Magento\Framework\MessageQueue\Topology\Config\QueueConfigItemInterface;
+
+/**
+ * Topology config interface provides access data declared in etc/queue_topology.xml
+ *
+ * @api
+ * @since 100.2.0
+ */
+interface ConfigInterface
+{
+    /**
+     * Get exchange configuration by exchange name.
+     *
+     * @param string $name
+     * @param string $connection
+     * @return ExchangeConfigItemInterface
+     * @throws LocalizedException
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getExchange($name, $connection);
+
+    /**
+     * Get list of all exchanges declared in the system.
+     *
+     * @return ExchangeConfigItemInterface[]
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getExchanges();
+
+    /**
+     * Get list of all queues declared in the system.
+     *
+     * @return QueueConfigItemInterface[]
+     * @throws \LogicException
+     * @since 100.2.0
+     */
+    public function getQueues();
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/composer.json b/lib/internal/Magento/Framework/MessageQueue/composer.json
new file mode 100644
index 00000000000..05f119630a4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/framework-message-queue",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "type": "magento2-library",
+    "version": "100.3.0-dev",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "require": {
+        "magento/framework": "100.3.*",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\Framework\\MessageQueue\\": ""
+        },
+        "files": [
+            "registration.php"
+        ]
+    }
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd
new file mode 100644
index 00000000000..52bfc77bbb5
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="config">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="consumer" type="consumerType" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="consumer-unique-name">
+            <xs:selector xpath="consumer"/>
+            <xs:field xpath="@name"/>
+        </xs:unique>
+    </xs:element>
+    <xs:complexType name="consumerType">
+        <xs:attribute type="xs:string" name="name" use="required"/>
+        <xs:attribute type="xs:string" name="queue" use="required"/>
+        <xs:attribute type="handlerType" name="handler" use="optional"/>
+        <xs:attribute type="xs:string" name="consumerInstance" use="optional"/>
+        <xs:attribute name="connection" use="optional" type="xs:string" />
+        <xs:attribute type="xs:integer" name="maxMessages" use="optional"/>
+    </xs:complexType>
+    <xs:simpleType name="handlerType">
+        <xs:annotation>
+            <xs:documentation>
+                Handler is expected in a format "Vendor\Module\Api\ServiceName::methodName".
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z\\]+::[a-zA-Z]+" />
+            <xs:minLength value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/publisher.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/publisher.xsd
new file mode 100644
index 00000000000..812c4690545
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/publisher.xsd
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="config">
+        <xs:annotation>
+            <xs:documentation>XML Schema Definition for queue_publisher.xml</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element type="publisherType" name="publisher" minOccurs="1" maxOccurs="unbounded">
+                    <xs:unique name="unique-connection-name">
+                        <xs:annotation>
+                            <xs:documentation>
+                                Publisher connection name must be unique
+                            </xs:documentation>
+                        </xs:annotation>
+                        <xs:selector xpath="connection"/>
+                        <xs:field xpath="@name"/>
+                    </xs:unique>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="unique-publisher-topic">
+            <xs:annotation>
+                <xs:documentation>
+                    Publisher topic must be unique
+                </xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath="publisher"/>
+            <xs:field xpath="@topic"/>
+        </xs:unique>
+    </xs:element>
+
+    <xs:complexType name="publisherType">
+        <xs:sequence>
+            <xs:element type="connectionType" name="connection" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="topic" use="required" />
+        <xs:attribute type="xs:boolean" name="disabled" use="optional" />
+    </xs:complexType>
+
+    <xs:complexType name="connectionType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="name" use="required" type="xs:string" />
+                <xs:attribute type="xs:string" name="exchange" use="optional"/>
+                <xs:attribute type="xs:boolean" name="disabled" use="optional"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/queue.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/queue.xsd
new file mode 100644
index 00000000000..7c018403d17
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/queue.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:include schemaLocation="urn:magento:framework-message-queue:etc/queue_base.xsd" />
+    <xs:element name="config">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="broker" type="brokerType"/>
+            </xs:choice>
+        </xs:complexType>
+        <xs:unique name="broker-unique-name">
+            <xs:selector xpath="broker"/>
+            <xs:field xpath="@topic"/>
+        </xs:unique>
+        <xs:unique name="broker-queue-unique-name">
+            <xs:selector xpath="broker/queue"/>
+            <xs:field xpath="@name"/>
+        </xs:unique>
+    </xs:element>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/queue_base.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/queue_base.xsd
new file mode 100644
index 00000000000..4b326d637f2
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/queue_base.xsd
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:complexType name="brokerType">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+                Broker configuration describes relations for topic, publisher, consumer, queue and exchange server
+            </xs:documentation>
+        </xs:annotation>
+        <xs:sequence  minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="queue" type="brokerQueueType" />
+        </xs:sequence>
+        <xs:attribute name="topic" type="xs:string" use="required"/>
+        <xs:attribute name="type" type="xs:string" use="optional"/>
+        <xs:attribute name="exchange" type="xs:string" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="brokerQueueType">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+                Queue element of the broker element
+            </xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="name" type="xs:string" use="required" />
+        <xs:attribute name="handler" type="handlerType" use="optional" />
+        <xs:attribute name="consumer" type="xs:string" use="required" />
+        <xs:attribute name="consumerInstance" type="instanceType" use="optional" />
+        <xs:attribute name="maxMessages" type="xs:integer" use="optional"/>
+    </xs:complexType>
+    <xs:simpleType name="instanceType">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+                Instance is expected in a format "Vendor\Module\Api\ServiceName".
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z\\]+" />
+            <xs:minLength value="4" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="handlerType">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+                Handler is expected in a format "Vendor\Module\Api\ServiceName::methodName".
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z\\]+::[a-zA-Z]+" />
+            <xs:minLength value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/queue_merged.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/queue_merged.xsd
new file mode 100644
index 00000000000..2c3f9479691
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/queue_merged.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:include schemaLocation="urn:magento:framework-message-queue:etc/queue_base.xsd" />
+    <xs:element name="config">
+        <xs:annotation>
+            <xs:documentation>
+                @deprecated
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="broker" type="brokerType"/>
+            </xs:choice>
+        </xs:complexType>
+        <xs:unique name="broker-unique-name">
+            <xs:selector xpath="broker"/>
+            <xs:field xpath="@topic"/>
+        </xs:unique>
+    </xs:element>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/topology.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/topology.xsd
new file mode 100644
index 00000000000..39862007b1d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/topology.xsd
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:complexType name="argumentType" abstract="true" mixed="true">
+        <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="argumentsType">
+        <xs:sequence>
+            <xs:element name="argument" type="argumentType" minOccurs="1" maxOccurs="unbounded">
+                <xs:key name="argumentItemName">
+                    <xs:selector xpath="item"></xs:selector>
+                    <xs:field xpath="@name"></xs:field>
+                </xs:key>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="array" mixed="true">
+        <xs:complexContent>
+            <xs:extension base="argumentType">
+                <xs:sequence>
+                    <xs:element name="item" type="argumentType" minOccurs="0" maxOccurs="unbounded">
+                        <xs:key name="itemName">
+                            <xs:selector xpath="item"></xs:selector>
+                            <xs:field xpath="@name"></xs:field>
+                        </xs:key>
+                    </xs:element>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="number">
+        <xs:complexContent>
+            <xs:extension base="argumentType"/>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="boolean">
+        <xs:complexContent>
+            <xs:extension base="argumentType"/>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="string">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="config">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element type="exchangeConfigType" name="exchange" maxOccurs="unbounded" minOccurs="0">
+                    <xs:unique name="unique-binding-id">
+                        <xs:annotation>
+                            <xs:documentation>
+                                Binding id must be unique
+                            </xs:documentation>
+                        </xs:annotation>
+                        <xs:selector xpath="binding"/>
+                        <xs:field xpath="@id"/>
+                    </xs:unique>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+        <xs:unique name="unique-exchange-name-connection">
+            <xs:annotation>
+                <xs:documentation>
+                    Exchange name must be unique
+                </xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath="exchange"/>
+            <xs:field xpath="@name"/>
+            <xs:field xpath="@connection"/>
+        </xs:unique>
+    </xs:element>
+
+    <xs:complexType name="bindingType" mixed="true">
+        <xs:sequence>
+            <xs:element type="argumentsType" name="arguments" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="id" use="required"/>
+        <xs:attribute type="destinationType" name="destinationType" use="optional"/>
+        <xs:attribute type="xs:string" name="destination" use="optional"/>
+        <xs:attribute type="xs:boolean" name="disabled" use="optional"/>
+        <xs:attribute type="xs:string" name="topic" use="optional"/>
+    </xs:complexType>
+
+    <xs:complexType name="exchangeConfigType">
+        <xs:choice maxOccurs="unbounded">
+            <xs:element type="argumentsType" name="arguments" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element type="bindingType" name="binding" maxOccurs="unbounded" minOccurs="0"/>
+        </xs:choice>
+        <xs:attribute type="xs:string" name="name" use="required"/>
+        <xs:attribute type="exchangeType" name="type" use="optional"/>
+        <xs:attribute name="connection" type="xs:string" use="required" />
+        <xs:attribute type="xs:boolean" name="durable" use="optional"/>
+        <xs:attribute type="xs:boolean" name="autoDelete" use="optional"/>
+        <xs:attribute type="xs:boolean" name="internal" use="optional"/>
+    </xs:complexType>
+
+    <xs:simpleType name="exchangeType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="topic" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="destinationType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="queue" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/topology_merged.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/topology_merged.xsd
new file mode 100644
index 00000000000..e2b90343110
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/topology_merged.xsd
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:redefine schemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+        <xs:complexType name="bindingType" mixed="true">
+            <xs:complexContent>
+                <xs:restriction base="bindingType">
+                    <xs:sequence>
+                        <xs:element type="argumentsType" name="arguments" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                    <xs:attribute type="xs:string" name="id" use="required"/>
+                    <xs:attribute type="destinationType" name="destinationType" use="required"/>
+                    <xs:attribute type="xs:string" name="destination" use="required"/>
+                    <xs:attribute type="xs:boolean" name="disabled" use="optional"/>
+                    <xs:attribute type="xs:string" name="topic" use="optional"/>
+                </xs:restriction>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:redefine>
+
+    <xs:redefine schemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
+        <xs:complexType name="exchangeConfigType">
+            <xs:complexContent>
+                <xs:restriction base="exchangeConfigType">
+                    <xs:choice maxOccurs="unbounded">
+                        <xs:element type="argumentsType" name="arguments" minOccurs="0" maxOccurs="unbounded"/>
+                        <xs:element type="bindingType" name="binding" maxOccurs="unbounded" minOccurs="0"/>
+                    </xs:choice>
+                    <xs:attribute type="xs:string" name="name" use="required"/>
+                    <xs:attribute type="exchangeType" name="type" use="required"/>
+                    <xs:attribute name="connection" type="xs:string" use="required" />
+                    <xs:attribute type="xs:boolean" name="durable" use="optional"/>
+                    <xs:attribute type="xs:boolean" name="autoDelete" use="optional"/>
+                    <xs:attribute type="xs:boolean" name="internal" use="optional"/>
+                </xs:restriction>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:redefine>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/MessageQueue/registration.php b/lib/internal/Magento/Framework/MessageQueue/registration.php
new file mode 100644
index 00000000000..aafb0fcffa7
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::LIBRARY, 'magento/framework-message-queue', __DIR__);
diff --git a/lib/internal/Magento/Framework/Module/ModuleResource.php b/lib/internal/Magento/Framework/Module/ModuleResource.php
index 781e84730d6..427f8a6f8e9 100644
--- a/lib/internal/Magento/Framework/Module/ModuleResource.php
+++ b/lib/internal/Magento/Framework/Module/ModuleResource.php
@@ -10,6 +10,9 @@
 
 /**
  * Resource Model
+ *
+ * @deprecated Declarative schema and data patches replace old functionality and setup_module table
+ * So all resources related to this table, will be deprecated since 2.3.0
  */
 class ModuleResource extends AbstractDb implements ResourceInterface
 {
@@ -138,11 +141,13 @@ public function setDataVersion($moduleName, $version)
     /**
      * Flush all class cache
      *
+     * @deprecated This method was added as temporary solution, to increase modularity:
+     * Because before new modules appears in resource only on next bootstrap
      * @return void
      */
-    public function flush()
+    public static function flush()
     {
         self::$dataVersions = null;
-        self::$schemaVersions = null;
+        self::$schemaVersions = [];
     }
 }
diff --git a/lib/internal/Magento/Framework/Session/SidResolver.php b/lib/internal/Magento/Framework/Session/SidResolver.php
index 18f6138b661..feb4877028d 100644
--- a/lib/internal/Magento/Framework/Session/SidResolver.php
+++ b/lib/internal/Magento/Framework/Session/SidResolver.php
@@ -7,6 +7,8 @@
  */
 namespace Magento\Framework\Session;
 
+use Magento\Framework\App\State;
+
 class SidResolver implements SidResolverInterface
 {
     /**
@@ -54,34 +56,47 @@ class SidResolver implements SidResolverInterface
      */
     protected $_scopeType;
 
+    /**
+     * @var State
+     */
+    private $appState;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $scopeType
      * @param array $sidNameMap
+     * @param State|null $appState
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\App\RequestInterface $request,
         $scopeType,
-        array $sidNameMap = []
+        array $sidNameMap = [],
+        State $appState = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->urlBuilder = $urlBuilder;
         $this->request = $request;
         $this->sidNameMap = $sidNameMap;
         $this->_scopeType = $scopeType;
+        $this->appState = $appState ?: \Magento\Framework\App\ObjectManager::getInstance()->get(State::class);
     }
 
     /**
      * @param SessionManagerInterface $session
-     * @return string
+     * @return string|null
      */
     public function getSid(SessionManagerInterface $session)
     {
+        if ($this->appState->getAreaCode() !== \Magento\Framework\App\Area::AREA_FRONTEND) {
+            return null;
+        }
+
         $sidKey = null;
+
         $useSidOnFrontend = $this->getUseSessionInUrl();
         if ($useSidOnFrontend && $this->request->getQuery(
             $this->getSessionIdQueryParam($session),
diff --git a/lib/internal/Magento/Framework/Session/SidResolverInterface.php b/lib/internal/Magento/Framework/Session/SidResolverInterface.php
index 8dd044adb68..6f242c1c9e3 100644
--- a/lib/internal/Magento/Framework/Session/SidResolverInterface.php
+++ b/lib/internal/Magento/Framework/Session/SidResolverInterface.php
@@ -22,7 +22,7 @@ interface SidResolverInterface
      * Get SID
      *
      * @param \Magento\Framework\Session\SessionManagerInterface $session
-     * @return string
+     * @return string|null
      */
     public function getSid(\Magento\Framework\Session\SessionManagerInterface $session);
 
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Comparator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Comparator.php
similarity index 77%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Comparator.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Comparator.php
index b862e19ced3..0c1f9ae42ea 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Comparator.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Comparator.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Declaration\Schema;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Comparator allows to compare only sensitive params of 2 nodes
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Config/Converter.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php
similarity index 96%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Config/Converter.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php
index 839c4d17c34..ed3f6326cd6 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/Converter.php
@@ -5,12 +5,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Config;
+namespace Magento\Framework\Setup\Declaration\Schema\Config;
 
 /**
  * This converter is required for Declaration Filesystem reader:
  *
- * @see \Magento\Setup\Model\Declaration\Schema\FileSystem\XmlReader
+ * @see \Magento\Framework\Setup\Declaration\Schema\FileSystem\XmlReader
  *
  * Allows to convert declarative schema to raw array and add default values
  * for column types and for constraints.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/SchemaLocator.php
similarity index 90%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Config/SchemaLocator.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/SchemaLocator.php
index df6779122c4..5319c469f04 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Config/SchemaLocator.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Config;
+namespace Magento\Framework\Setup\Declaration\Schema\Config;
 
 /**
  * This is system class that provides .xsd file for validation XML schema.
@@ -32,7 +32,7 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
      */
     public function __construct(
         \Magento\Framework\Config\Dom\UrnResolver $urnResolver,
-        $schemaUrn = 'urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd'
+        $schemaUrn = 'urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd'
     ) {
         $this->_schema = $urnResolver->getRealPath($schemaUrn);
         $this->_perFileSchema = $this->_schema;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/ColumnSavior.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/ColumnSavior.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/ColumnSavior.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/ColumnSavior.php
index 039fd293cf3..8394e9e1620 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/ColumnSavior.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/ColumnSavior.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\DataSavior;
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\SelectFactory;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Allows to dump and restore data for one specific field
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/DataSaviorInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DataSaviorInterface.php
similarity index 90%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/DataSaviorInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DataSaviorInterface.php
index de404b4bd7b..d8453b3a762 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/DataSaviorInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DataSaviorInterface.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\DataSavior;
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * This interface allows to dump data during declarative installation process
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/DumpAccessorInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DumpAccessorInterface.php
similarity index 93%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/DumpAccessorInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DumpAccessorInterface.php
index 828ab8cc92f..dbfb5eb8512 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/DumpAccessorInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/DumpAccessorInterface.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\DataSavior;
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
 
 /**
  * Allows to access dump, that can be persisted in any file format or in database
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/SelectGenerator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php
similarity index 96%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/SelectGenerator.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php
index 28966e604c9..9e560acf1f6 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/SelectGenerator.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGenerator.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\DataSavior;
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Db\Select;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/SelectGeneratorFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGeneratorFactory.php
similarity index 93%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/SelectGeneratorFactory.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGeneratorFactory.php
index 0dfdf7ff4b4..35b39a520d2 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/SelectGeneratorFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/SelectGeneratorFactory.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\DataSavior;
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
 
 use Magento\Framework\ObjectManagerInterface;
 
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/TableSavior.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/TableSavior.php
similarity index 95%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/TableSavior.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/TableSavior.php
index 7a715b81b5f..806f5df0c77 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/TableSavior.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/TableSavior.php
@@ -4,12 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\DataSavior;
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\SelectFactory;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Allows to dump and restore data for specific table
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/UniqueConstraintsResolver.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/UniqueConstraintsResolver.php
similarity index 82%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/UniqueConstraintsResolver.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/UniqueConstraintsResolver.php
index 1ac2f5648e9..823f6e3e915 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/DataSavior/UniqueConstraintsResolver.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DataSavior/UniqueConstraintsResolver.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\DataSavior;
+namespace Magento\Framework\Setup\Declaration\Schema\DataSavior;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Search for any unique constraints in table
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/DDLTriggerInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php
similarity index 84%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/DDLTriggerInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php
index ede8f74cd10..fa074d4ba16 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/DDLTriggerInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DDLTriggerInterface.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * DDL triggers is events that can be fired:
@@ -31,7 +31,7 @@ public function isApplicable($statement);
      * Setup callback to current statement, can generate new statements.
      *
      * @param ElementInterface $element
-     * @return Callable
+     * @return callable
      */
     public function getCallback(ElementInterface $element);
 }
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/DbDefinitionProcessorInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbDefinitionProcessorInterface.php
similarity index 85%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/DbDefinitionProcessorInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbDefinitionProcessorInterface.php
index b9837937d99..1bfae476015 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/DbDefinitionProcessorInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbDefinitionProcessorInterface.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Do processing strings to desired format:
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/DbSchemaReaderInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaReaderInterface.php
similarity index 96%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/DbSchemaReaderInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaReaderInterface.php
index af34442d894..9f1391970e9 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/DbSchemaReaderInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaReaderInterface.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
 /**
  * This class is responsible for read different schema
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/DbSchemaWriterInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaWriterInterface.php
similarity index 96%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/DbSchemaWriterInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaWriterInterface.php
index 6f06b7e49ef..d8c2e714856 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/DbSchemaWriterInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DbSchemaWriterInterface.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
 /**
  * This class is responsible for read different schema structural elements: indexes, constraints,
@@ -109,7 +109,8 @@ public function dropElement($resource, $elementName, $tableName, $type);
      * Compile statements and make SQL request from them.
      *
      * @param StatementAggregator $statementAggregator
+     * @param bool $dryRun
      * @return void
      */
-    public function compile(StatementAggregator $statementAggregator);
+    public function compile(StatementAggregator $statementAggregator, $dryRun);
 }
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/DefinitionAggregator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DefinitionAggregator.php
similarity index 92%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/DefinitionAggregator.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DefinitionAggregator.php
index 1785058c6b6..f9918a1b8d5 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/DefinitionAggregator.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DefinitionAggregator.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Holds different definitions and apply them depends on column, constraint, index types.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php
index 61651403d28..b2cc0f4d913 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFrom.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\DDL\Triggers;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Sql\Expression;
-use Magento\Setup\Model\Declaration\Schema\Db\DDLTriggerInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DDLTriggerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Used to migrate data from one column to another in scope of one table.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DbSchemaReader.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaReader.php
similarity index 95%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DbSchemaReader.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaReader.php
index 96edcfab68b..fed4aa32d9e 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DbSchemaReader.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaReader.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Sql\Expression;
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaReaderInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
 
 /**
  * @inheritdoc
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DbSchemaWriter.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaWriter.php
similarity index 75%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DbSchemaWriter.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaWriter.php
index 40f97ef43d0..ab3d0c7fb0b 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DbSchemaWriter.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaWriter.php
@@ -4,18 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal;
-use Magento\Setup\Model\Declaration\Schema\Db\Statement;
-use Magento\Setup\Model\Declaration\Schema\Db\StatementAggregator;
-use Magento\Setup\Model\Declaration\Schema\Db\StatementFactory;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraint;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 
 /**
  * @inheritdoc
@@ -43,18 +42,26 @@ class DbSchemaWriter implements DbSchemaWriterInterface
      */
     private $statementFactory;
 
+    /**
+     * @var DryRunLogger
+     */
+    private $dryRunLogger;
+
     /**
      * Constructor.
      *
      * @param ResourceConnection $resourceConnection
      * @param StatementFactory $statementFactory
+     * @param DryRunLogger $dryRunLogger
      */
     public function __construct(
         ResourceConnection $resourceConnection,
-        StatementFactory $statementFactory
+        StatementFactory $statementFactory,
+        DryRunLogger $dryRunLogger
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->statementFactory = $statementFactory;
+        $this->dryRunLogger = $dryRunLogger;
     }
 
     /**
@@ -110,7 +117,7 @@ private function getDropElementSQL($type, $name)
                 return 'DROP PRIMARY KEY';
             case Constraint::UNIQUE_TYPE:
                 return sprintf('DROP KEY %s', $name);
-            case \Magento\Setup\Model\Declaration\Schema\Dto\Index::TYPE:
+            case \Magento\Framework\Setup\Declaration\Schema\Dto\Index::TYPE:
                 return sprintf('DROP INDEX %s', $name);
             case Reference::TYPE:
                 return sprintf('DROP FOREIGN KEY %s', $name);
@@ -217,7 +224,7 @@ public function resetAutoIncrement($tableName, $resource)
     /**
      * @inheritdoc
      */
-    public function compile(StatementAggregator $statementAggregator)
+    public function compile(StatementAggregator $statementAggregator, $dryRun)
     {
         foreach ($statementAggregator->getStatementsBank() as $statementBank) {
             $statementsSql = [];
@@ -225,18 +232,28 @@ public function compile(StatementAggregator $statementAggregator)
             foreach ($statementBank as $statement) {
                 $statementsSql[] = $statement->getStatement();
             }
-
             $adapter = $this->resourceConnection->getConnection($statement->getResource());
-            $adapter->query(
-                sprintf(
-                    $this->statementDirectives[$statement->getType()],
-                    $adapter->quoteIdentifier($statement->getTableName()),
-                    implode(", ", $statementsSql)
-                )
-            );
-            //Do post update, like SQL DML operations or etc...
-            foreach ($statement->getTriggers() as $trigger) {
-                call_user_func($trigger);
+
+            if ($dryRun) {
+                $this->dryRunLogger->log(
+                    sprintf(
+                        $this->statementDirectives[$statement->getType()],
+                        $adapter->quoteIdentifier($statement->getTableName()),
+                        implode(", ", $statementsSql)
+                    )
+                );
+            } else {
+                $adapter->query(
+                    sprintf(
+                        $this->statementDirectives[$statement->getType()],
+                        $adapter->quoteIdentifier($statement->getTableName()),
+                        implode(", ", $statementsSql)
+                    )
+                );
+                //Do post update, like SQL DML operations or etc...
+                foreach ($statement->getTriggers() as $trigger) {
+                    call_user_func($trigger);
+                }
             }
         }
     }
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Blob.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Blob.php
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Blob.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Blob.php
index fd0209241e5..213e4a52bee 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Blob.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Blob.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Process blob and text types.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Boolean.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Boolean.php
similarity index 88%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Boolean.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Boolean.php
index f81db3464f2..5b8c5e2d4a6 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Boolean.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Boolean.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * As all MySQL aliases as BOOL or BOOLEAN are converted to TINYINT(1)
@@ -66,7 +66,7 @@ public function __construct(
     }
 
     /**
-     * @param \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Boolean $column
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean $column
      * @inheritdoc
      */
     public function toDefinition(ElementInterface $column)
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Comment.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Comment.php
similarity index 60%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Comment.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Comment.php
index a3147f53b41..203c9d7f862 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Comment.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Comment.php
@@ -4,12 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\ColumnNullableAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnNullableAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Comment definition processor.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Date.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Date.php
similarity index 81%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Date.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Date.php
index 536b5e8f34b..bc933e12f67 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Date.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Date.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Date type processor.
@@ -47,7 +47,7 @@ public function __construct(ResourceConnection $resourceConnection, Nullable $nu
     }
 
     /**
-     * @param \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp $column
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp $column
      * @inheritdoc
      */
     public function toDefinition(ElementInterface $column)
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Identity.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Identity.php
similarity index 72%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Identity.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Identity.php
index 2b1f876c9b6..cf0c2b6edd2 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Identity.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Identity.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\ColumnIdentityAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnIdentityAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Identity (auto_increment) column processor.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
index 68ed3d4d101..07ba03d0331 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Integer type processor.
@@ -25,7 +25,7 @@ class Integer implements DbDefinitionProcessorInterface
     private $unsigned;
 
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean
      */
     private $boolean;
 
@@ -76,7 +76,7 @@ public function __construct(
     }
 
     /**
-     * @param \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer $column
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer $column
      * @inheritdoc
      */
     public function toDefinition(ElementInterface $column)
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Nullable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Nullable.php
similarity index 67%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Nullable.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Nullable.php
index 8439c32116f..95b2a5eed54 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Nullable.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Nullable.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\ColumnNullableAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnNullableAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Nullable columns processor.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdate.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdate.php
similarity index 63%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdate.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdate.php
index f8c8822ba3f..187f710b40e 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdate.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdate.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * On update statement processor.
@@ -17,12 +17,12 @@
 class OnUpdate implements DbDefinitionProcessorInterface
 {
     /**
-     * @param \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp $column
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp $column
      * @inheritdoc
      */
     public function toDefinition(ElementInterface $column)
     {
-        if ($column instanceof \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp) {
+        if ($column instanceof \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp) {
             return $column->getOnUpdate() ?
                 'ON UPDATE CURRENT_TIMESTAMP' : '';
         }
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Real.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Real.php
similarity index 89%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Real.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Real.php
index d3a0e3038d4..43542f617f8 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Real.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Real.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Process real types and separate them into type, scale and precision.
@@ -57,7 +57,7 @@ public function __construct(
     }
 
     /**
-     * @param \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Real $column
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real $column
      * @inheritdoc
      */
     public function toDefinition(ElementInterface $column)
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinary.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinary.php
similarity index 84%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinary.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinary.php
index 44286e7a953..c2fd270a8f9 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinary.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinary.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Processor for following types: char, varchar, varbinary, binary.
@@ -44,7 +44,7 @@ public function __construct(Nullable $nullable, ResourceConnection $resourceConn
     }
 
     /**
-     * @param \Magento\Setup\Model\Declaration\Schema\Dto\Columns\StringBinary $column
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\StringBinary $column
      * @inheritdoc
      */
     public function toDefinition(ElementInterface $column)
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Timestamp.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Timestamp.php
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Timestamp.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Timestamp.php
index 7df37fd28a9..6313fa7286d 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Timestamp.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Timestamp.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Processor for timestamp/datetime types.
@@ -63,7 +63,7 @@ public function __construct(
     }
 
     /**
-     * @param \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp $column
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp $column
      * @inheritdoc
      */
     public function toDefinition(ElementInterface $column)
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Unsigned.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Unsigned.php
similarity index 71%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Unsigned.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Unsigned.php
index 9b85fa9862d..776998e8bc4 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Columns/Unsigned.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Unsigned.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\ColumnUnsignedAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnUnsignedAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Unsigned flag processor.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php
similarity index 90%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php
index 5e108a1510b..b2c520de4e7 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKey.php
@@ -4,12 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Constraints;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Foreign key constraint processor.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/Internal.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/Internal.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/Internal.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/Internal.php
index 8a69a591420..52abd28a1c7 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/Internal.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Constraints/Internal.php
@@ -4,12 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Constraints;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Internal key (index) processor.
@@ -51,7 +51,7 @@ public function __construct(ResourceConnection $resourceConnection)
     }
 
     /**
-     * @param \Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal $constraint
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal $constraint
      * @inheritdoc
      */
     public function toDefinition(ElementInterface $constraint)
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Index.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Index.php
similarity index 81%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Index.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Index.php
index 010de012dd9..30150efd517 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/Definition/Index.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Index.php
@@ -4,12 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition;
+namespace Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Index (key) processor.
@@ -39,7 +39,7 @@ public function __construct(ResourceConnection $resourceConnection)
     }
 
     /**
-     * @param \Magento\Setup\Model\Declaration\Schema\Dto\Index $index
+     * @param \Magento\Framework\Setup\Declaration\Schema\Dto\Index $index
      * @inheritdoc
      */
     public function toDefinition(ElementInterface $index)
@@ -47,7 +47,7 @@ public function toDefinition(ElementInterface $index)
         $indexType = $index->getIndexType();
         //There is no matter what connection to use -> so use default one
         $adapter = $this->resourceConnection->getConnection();
-        $isFullText = $indexType === \Magento\Setup\Model\Declaration\Schema\Dto\Index::FULLTEXT_INDEX;
+        $isFullText = $indexType === \Magento\Framework\Setup\Declaration\Schema\Dto\Index::FULLTEXT_INDEX;
         //index types, that are similar to MySQL ones, can just be uppercased.
         //[FULLTEXT ]INDEX `name` [USING [BTREE|HASH]] (columns)
         return sprintf(
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/ReferenceStatement.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/ReferenceStatement.php
similarity index 78%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/ReferenceStatement.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/ReferenceStatement.php
index e7279af28e7..234f3f048c5 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/ReferenceStatement.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/ReferenceStatement.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
 /**
  * Foreign key statement.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/SchemaBuilder.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php
similarity index 84%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/SchemaBuilder.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php
index b487d7e1a31..2b9e593975d 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/SchemaBuilder.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php
@@ -4,13 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementFactory;
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\Sharding;
+use Magento\Framework\Phrase;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
+use Magento\Framework\Setup\Exception;
 
 /**
  * This type of builder is responsible for converting ENTIRE data, that comes from db
@@ -98,15 +100,15 @@ public function build(Schema $schema)
                 $table->addColumns($columns);
                 //Process indexes
                 foreach ($indexesData as $indexData) {
-                    $indexData['columns'] = $this->resolveInternalRelations($columns, $indexData);
                     $indexData['table'] = $table;
+                    $indexData['columns'] = $this->resolveInternalRelations($columns, $indexData);
                     $index = $this->elementFactory->create('index', $indexData);
                     $indexes[$index->getName()] = $index;
                 }
                 //Process internal constraints
                 foreach ($constrainsData as $constraintData) {
-                    $constraintData['columns'] = $this->resolveInternalRelations($columns, $constraintData);
                     $constraintData['table'] = $table;
+                    $constraintData['columns'] = $this->resolveInternalRelations($columns, $constraintData);
                     $constraint = $this->elementFactory->create($constraintData['type'], $constraintData);
                     $constraints[$constraint->getName()] = $constraint;
                 }
@@ -159,19 +161,31 @@ private function processReferenceKeys(array $tables)
      * @param  Column[] $columns
      * @param  array    $data
      * @return Column[]
+     * @throws Exception
      */
     private function resolveInternalRelations(array $columns, array $data)
     {
         if (!is_array($data['column'])) {
-            throw new \InvalidArgumentException("Cannot find columns for internal index");
+            throw new Exception(
+                new Phrase("Cannot find columns for internal index")
+            );
         }
 
         $referenceColumns = [];
         foreach ($data['column'] as $columnName) {
             if (!isset($columns[$columnName])) {
-                //Depends on business logic, can either ignore non-existing column
-                //or throw exception if db is not consistent and there is no column
-                //that was specified for key
+                $tableName = isset($data['table']) ? $data['table']->getName() : '';
+                trigger_error(
+                    new Phrase(
+                        'Column %1 does not exist for index/constraint %2 in table %3.',
+                        [
+                            $columnName,
+                            $data['name'],
+                            $tableName
+                        ]
+                    ),
+                    E_USER_WARNING
+                );
             } else {
                 $referenceColumns[] = $columns[$columnName];
             }
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/Statement.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/Statement.php
similarity index 95%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/Statement.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/Statement.php
index 8c40deced27..ccc4e38968e 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/Statement.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/Statement.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
 /**
  * Statement aggregator for SQL statements for one table.
@@ -36,7 +36,7 @@ class Statement
     private $resource;
 
     /**
-     * @var Callable[]
+     * @var callable[]
      */
     private $triggers = [];
 
@@ -122,7 +122,7 @@ public function getResource(): string
     /**
      * Get triggers array.
      *
-     * @return Callable[]
+     * @return callable[]
      */
     public function getTriggers(): array
     {
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/StatementAggregator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregator.php
similarity index 98%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/StatementAggregator.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregator.php
index 31a49833527..2003ff18900 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/StatementAggregator.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregator.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
 /**
  * Statement aggregator.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/StatementAggregatorFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregatorFactory.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/StatementAggregatorFactory.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregatorFactory.php
index f7bcefceede..474742de26a 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/StatementAggregatorFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementAggregatorFactory.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
 use Magento\Framework\ObjectManagerInterface;
 
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/StatementFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementFactory.php
similarity index 93%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Db/StatementFactory.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementFactory.php
index 94326a1bebf..ecc2bf08331 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/StatementFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/StatementFactory.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
 
 /**
  * Statement factory.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ReaderComposite.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ReaderComposite.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ReaderComposite.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ReaderComposite.php
index 098f2f473b9..5f3d5af4d3b 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ReaderComposite.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ReaderComposite.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Declaration;
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration;
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ReaderInterface;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/SchemaBuilder.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
similarity index 85%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/SchemaBuilder.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
index a724ed2ffdf..63d42e182e7 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/SchemaBuilder.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
@@ -3,16 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Declaration;
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration;
 
+use Magento\Framework\Phrase;
 use Magento\Framework\Stdlib\BooleanUtils;
-use Magento\Setup\Exception;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraint;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementFactory;
-use Magento\Setup\Model\Declaration\Schema\Dto\Index;
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\Sharding;
+use Magento\Framework\Setup\Exception;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
 
 /**
  * This type of builder is responsible for converting ENTIRE data, that comes from XML
@@ -29,6 +31,8 @@
  *    -internal (unique, primary, check, nullable)
  *    -reference (referenceTable=<DTO>, referenceColumn=<DTO>, ...)
  *   -index
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SchemaBuilder
 {
@@ -115,7 +119,7 @@ private function validate(Schema $schema)
                 $messages .= sprintf("%s%s", PHP_EOL, $error['message']);
             }
 
-            throw new Exception($messages);
+            throw new Exception(new Phrase($messages));
         }
     }
 
@@ -213,7 +217,7 @@ private function processGenericData(array $elementData, $resource, Table $table)
      *
      * @param  Schema $schema
      * @param  array  $tableData
-     * @return \Magento\Setup\Model\Declaration\Schema\Dto\Table
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Table
      */
     private function processTable(Schema $schema, array $tableData)
     {
@@ -239,6 +243,24 @@ private function processTable(Schema $schema, array $tableData)
         return $schema->getTableByName($tableData['name']);
     }
 
+    /**
+     * @param string $columnName
+     * @param Table $table
+     * @return Column
+     */
+    private function getColumnByName(string $columnName, Table $table)
+    {
+        $columnCandidate = $table->getColumnByName($columnName);
+
+        if (!$columnCandidate) {
+            throw new \LogicException(
+                sprintf('Table %s do not have column with name %s', $table->getName(), $columnName)
+            );
+        }
+
+        return $columnCandidate;
+    }
+
     /**
      * Convert column names to objects.
      *
@@ -251,7 +273,7 @@ private function convertColumnNamesToObjects(array $columnNames, Table $table)
         $columns = [];
 
         foreach ($columnNames as $columnName) {
-            $columns[] = $table->getColumnByName($columnName);
+            $columns[] = $this->getColumnByName($columnName, $table);
         }
 
         return $columns;
@@ -311,7 +333,7 @@ private function processConstraints(array $tableData, $resource, Schema $schema,
             $constraintData = $this->processGenericData($constraintData, $resource, $table);
             //As foreign constraint has different schema we need to process it in different way
             if ($constraintData['type'] === 'foreign') {
-                $constraintData['column'] = $table->getColumnByName($constraintData['column']);
+                $constraintData['column'] = $this->getColumnByName($constraintData['column'], $table);
                 $referenceTableData = $this->tablesData[$constraintData['referenceTable']];
                 //If we are referenced to the same table we need to specify it
                 //Get table name from resource connection regarding prefix settings
@@ -327,11 +349,14 @@ private function processConstraints(array $tableData, $resource, Schema $schema,
                 $constraintData['referenceTable'] = $referenceTable;
 
                 if (!$constraintData['referenceTable']) {
-                    throw new \LogicException("Cannot find reference table");
+                    throw new \LogicException(
+                        sprintf('Cannot find reference table with name %s', $constraints['referenceTable'])
+                    );
                 }
 
-                $constraintData['referenceColumn'] = $constraintData['referenceTable']->getColumnByName(
-                    $constraintData['referenceColumn']
+                $constraintData['referenceColumn'] = $this->getColumnByName(
+                    $constraintData['referenceColumn'],
+                    $constraintData['referenceTable']
                 );
                 $constraint = $this->elementFactory->create($constraintData['type'], $constraintData);
                 $constraints[$constraint->getName()] = $constraint;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationComposite.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationComposite.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationComposite.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationComposite.php
index 2b788c24ad6..bf04f80c0e4 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationComposite.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationComposite.php
@@ -3,9 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Declaration;
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
 
 /**
  * This validator holds different validations rules.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationInterface.php
similarity index 77%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationInterface.php
index c2057d4326c..0f90a6bb8b1 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationInterface.php
@@ -3,9 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Declaration;
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
 
 /**
  * This class is responsible for basic validation rules.
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/AutoIncrementColumnValidation.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/AutoIncrementColumnValidation.php
new file mode 100644
index 00000000000..fb31f7fcc6d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/AutoIncrementColumnValidation.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules;
+
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnIdentityAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * Check whether autoincrement column is valid
+ *
+ * @inheritdoc
+ */
+class AutoIncrementColumnValidation implements ValidationInterface
+{
+    /**
+     * Error code.
+     */
+    const ERROR_TYPE = 'auto_increment_column_is_valid';
+
+    /**
+     * Error message, that will be shown.
+     */
+    const ERROR_MESSAGE = 'Auto Increment column do not have index. Column - "%s", table - "%s"';
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Schema $schema)
+    {
+        $errors = [];
+        foreach ($schema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column instanceof ColumnIdentityAwareInterface && $column->isIdentity()) {
+                    foreach ($table->getConstraints() as $constraint) {
+                        if ($constraint instanceof Internal &&
+                            in_array($column->getName(), $constraint->getColumnNames())
+                        ) {
+                            //If we find that for auto increment column we have index or key
+                            continue 3;
+                        }
+                    }
+
+                    foreach ($table->getIndexes() as $index) {
+                        if (in_array($column->getName(), $index->getColumnNames())) {
+                            //If we find that for auto increment column we have index or key
+                            continue 3;
+                        }
+                    }
+
+                    $errors[] = [
+                        'column' => $column->getName(),
+                        'message' => sprintf(self::ERROR_MESSAGE, $column->getName(), $table->getName())
+                    ];
+                }
+            }
+        }
+
+        return $errors;
+    }
+}
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationRules/CheckReferenceColumnHasIndex.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/CheckReferenceColumnHasIndex.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationRules/CheckReferenceColumnHasIndex.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/CheckReferenceColumnHasIndex.php
index 81d516f2b75..21c62ec2b29 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationRules/CheckReferenceColumnHasIndex.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/CheckReferenceColumnHasIndex.php
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules;
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules;
 
-use Magento\Setup\Model\Declaration\Schema\Declaration\ValidationInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal;
-use Magento\Setup\Model\Declaration\Schema\Dto\Index;
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
 
 /**
  * Go through all tables in schema and see if reference columns in foreign keys
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/IncosistentReferenceDefinition.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/IncosistentReferenceDefinition.php
new file mode 100644
index 00000000000..02d2cee9979
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/IncosistentReferenceDefinition.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules;
+
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnNullableAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnUnsignedAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\StringBinary;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * Go through all tables and find out what foreign keys columns definitions are not match each other
+ *
+ * @inheritdoc
+ */
+class IncosistentReferenceDefinition implements ValidationInterface
+{
+    /**
+     * Error code.
+     */
+    const ERROR_TYPE = 'reference_incosistence_definition';
+
+    /**
+     * Assert that column dimensions are the same
+     *
+     * This check should goes after types assertion
+     *
+     * @param Column $column
+     * @param Column | ColumnUnsignedAwareInterface | ColumnNullableAwareInterface $referenceColumn
+     * @return bool
+     */
+    private function assertDefinitionEqual(Column $column, Column $referenceColumn)
+    {
+        /**
+         * Columns should have the same types
+         */
+        if ($column->getType() !== $referenceColumn->getType()) {
+            return true;
+        }
+
+        return $this->assertUnsigned($column, $referenceColumn) &&
+            $this->assertIntegersEquals($column, $referenceColumn) &&
+            $this->assertStringBinariesEqual($column, $referenceColumn);
+    }
+
+    /**
+     * @param Column $column
+     * @param Column | ColumnUnsignedAwareInterface $referenceColumn
+     * @return bool
+     */
+    private function assertUnsigned(Column $column, Column $referenceColumn)
+    {
+        /**
+         * Check on unsigned
+         */
+        if ($column instanceof ColumnUnsignedAwareInterface &&
+            $column->isUnsigned() !== $referenceColumn->isUnsigned()
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param Column $column
+     * @param Column $referenceColumn
+     * @return bool
+     */
+    private function assertStringBinariesEqual(Column $column, Column $referenceColumn)
+    {
+        /**
+         * Check whether column sizes are equal
+         * @var StringBinary $referenceColumn
+         */
+        if ($column instanceof StringBinary &&
+            $column->getLength() !== $referenceColumn->getLength()
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param Column $column
+     * @param Column | Integer $referenceColumn
+     * @return bool
+     */
+    private function assertIntegersEquals(Column $column, Column $referenceColumn)
+    {
+        /**
+         * Check whether column sizes are equal
+         */
+        if ($column instanceof Integer &&
+            $column->getPadding() !== $referenceColumn->getPadding()
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Schema $schema)
+    {
+        $message = 'Column definition "%s" and reference column definition "%s" are different in tables "%s" and "%s"';
+        $errors = [];
+        foreach ($schema->getTables() as $table) {
+            foreach ($table->getReferenceConstraints() as $reference) {
+                $column = $reference->getColumn();
+                $referenceColumn = $reference->getReferenceColumn();
+
+                if (!$this->assertDefinitionEqual($column, $referenceColumn)) {
+                    $errors[] = [
+                        'column' => $column->getName(),
+                        'message' => sprintf(
+                            $message,
+                            $column->getName(),
+                            $referenceColumn->getName(),
+                            $column->getTable()->getName(),
+                            $referenceColumn->getTable()->getName()
+                        )
+                    ];
+                }
+            }
+        }
+
+        return $errors;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/PrimaryKeyCanBeCreated.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/PrimaryKeyCanBeCreated.php
new file mode 100644
index 00000000000..6e3703af9b0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/PrimaryKeyCanBeCreated.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules;
+
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\ColumnNullableAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+
+/**
+ * Go through all tables and find out if primary keys can be applied
+ *
+ * @inheritdoc
+ */
+class PrimaryKeyCanBeCreated implements ValidationInterface
+{
+    /**
+     * Error code.
+     */
+    const ERROR_TYPE = 'primary_key_cant_be_applied';
+
+    /**
+     * Error message, that will be shown.
+     */
+    const ERROR_MESSAGE = 'Primary key can`t be applied on table "%s". ';
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(Schema $schema)
+    {
+        $errors = [];
+        foreach ($schema->getTables() as $table) {
+            $primaryConstraint = $table->getPrimaryConstraint();
+
+            if (!$primaryConstraint) {
+                continue;
+            }
+
+            foreach ($primaryConstraint->getColumns() as $column) {
+                if ($column instanceof ColumnNullableAwareInterface &&
+                    $column->isNullable()
+                ) {
+                    $errors[] = [
+                        'column' => $column->getName(),
+                        'message' => sprintf(self::ERROR_MESSAGE, $table->getName()) .
+                            "All columns should be not nullable"
+                    ];
+                }
+            }
+        }
+
+        return $errors;
+    }
+}
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationRules/RealTypes.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/RealTypes.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationRules/RealTypes.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/RealTypes.php
index 866896da25e..8cb6ff3f95c 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ValidationRules/RealTypes.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/ValidationRules/RealTypes.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules;
+namespace Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules;
 
-use Magento\Setup\Model\Declaration\Schema\Declaration\ValidationInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Real;
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
 
 /**
  * Go through all tables in schema and validate real types basis and fraction sizes are valid.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/Diff.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/Diff.php
similarity index 90%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Diff/Diff.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/Diff.php
index 37f9ea4d223..70711d4900a 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/Diff.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/Diff.php
@@ -4,15 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Diff;
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
 
-use Magento\Developer\Console\Command\TablesWhitelistGenerateCommand;
 use Magento\Framework\Component\ComponentRegistrar;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\Dto\TableElementInterface;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\ElementHistoryFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\TableElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistoryFactory;
 
 /**
  * Holds information about all changes between 2 schemas: db and declaration XML.
@@ -22,6 +21,11 @@
  */
 class Diff implements DiffInterface
 {
+    /**
+     * Whitelist file name.
+     */
+    const GENERATED_WHITELIST_FILE_NAME = 'db_schema_whitelist.json';
+
     /**
      * @var array
      */
@@ -125,7 +129,7 @@ private function getWhiteListTables()
         if (!$this->whiteListTables) {
             foreach ($this->componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $path) {
                 $whiteListPath = $path . DIRECTORY_SEPARATOR . 'etc' .
-                    DIRECTORY_SEPARATOR . TablesWhitelistGenerateCommand::GENERATED_FILE_NAME;
+                    DIRECTORY_SEPARATOR . 'db_schema_whitelist.json';
 
                 if (file_exists($whiteListPath)) {
                     $this->whiteListTables = array_replace_recursive(
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/DiffFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffFactory.php
similarity index 92%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Diff/DiffFactory.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffFactory.php
index 05c395e07c5..342bb87e180 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/DiffFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffFactory.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Diff;
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
 
 use Magento\Framework\ObjectManagerInterface;
 
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/DiffInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffInterface.php
similarity index 76%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Diff/DiffInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffInterface.php
index 03e659d0b98..4b6e3555256 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/DiffInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffInterface.php
@@ -4,12 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Diff;
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\Request;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\Request;
 
 /**
  * DiffInterface is type of classes, that holds all information
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/DiffManager.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffManager.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Diff/DiffManager.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffManager.php
index eb1dc1b267d..9a268d0eaa9 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/DiffManager.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/DiffManager.php
@@ -4,22 +4,22 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Diff;
-
-use Magento\Setup\Model\Declaration\Schema\Comparator;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\Operations\AddColumn;
-use Magento\Setup\Model\Declaration\Schema\Operations\AddComplexElement;
-use Magento\Setup\Model\Declaration\Schema\Operations\CreateTable;
-use Magento\Setup\Model\Declaration\Schema\Operations\DropElement;
-use Magento\Setup\Model\Declaration\Schema\Operations\DropReference;
-use Magento\Setup\Model\Declaration\Schema\Operations\DropTable;
-use Magento\Setup\Model\Declaration\Schema\Operations\ModifyColumn;
-use Magento\Setup\Model\Declaration\Schema\Operations\ModifyTable;
-use Magento\Setup\Model\Declaration\Schema\Operations\ReCreateTable;
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
+
+use Magento\Framework\Setup\Declaration\Schema\Comparator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddColumn;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddComplexElement;
+use Magento\Framework\Setup\Declaration\Schema\Operations\CreateTable;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropElement;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropReference;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropTable;
+use Magento\Framework\Setup\Declaration\Schema\Operations\ModifyColumn;
+use Magento\Framework\Setup\Declaration\Schema\Operations\ModifyTable;
+use Magento\Framework\Setup\Declaration\Schema\Operations\ReCreateTable;
 
 /**
  * Helper which provide methods, that helps to compare 2 different nodes:
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/SchemaDiff.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/SchemaDiff.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Diff/SchemaDiff.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/SchemaDiff.php
index b609618b621..0486b5f645d 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/SchemaDiff.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/SchemaDiff.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Diff;
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
-use Magento\Setup\Model\Declaration\Schema\OperationsExecutor;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
 
 /**
  * Aggregation root of all diffs.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/TableDiff.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/TableDiff.php
similarity index 92%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Diff/TableDiff.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/TableDiff.php
index 1a2750b657e..73a1d86f262 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Diff/TableDiff.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/TableDiff.php
@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Diff;
-
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Index;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\Operations\AddComplexElement;
-use Magento\Setup\Model\Declaration\Schema\Operations\ModifyColumn;
+namespace Magento\Framework\Setup\Declaration\Schema\Diff;
+
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddComplexElement;
+use Magento\Framework\Setup\Declaration\Schema\Operations\ModifyColumn;
 
 /**
  * As table can have different types of elements inside itself.
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/DryRunLogger.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DryRunLogger.php
new file mode 100644
index 00000000000..dcecfc41596
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/DryRunLogger.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Declaration\Schema;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * This class is responsible for logging dry run SQL`s
+ * By default it logs them into filesystem, but it can be extended and you can log them in CLI
+ * Current problem with logging output to CLI, is that we have redudant things in CLI output, like modules progress
+ */
+class DryRunLogger
+{
+    /**
+     * We will run installation or upgrade in Dry Run mode
+     */
+    const INPUT_KEY_DRY_RUN_MODE = 'dry-run';
+
+    /**
+     * File name, where all dry-run SQL`s will be puted
+     */
+    const FILE_NAME = 'dry-run-installation.log';
+
+    /**
+     * Allows to separate 2 different sql statements with this separator
+     * Be default is used 2 empty lines
+     */
+    const LINE_SEPARATOR = "\n\n";
+
+    /**
+     * @var \Magento\Framework\Filesystem\Driver\File
+     */
+    private $fileDriver;
+
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
+    /**
+     * @param \Magento\Framework\Filesystem\Driver\File $fileDriver
+     * @param DirectoryList $directoryList
+     */
+    public function __construct(
+        \Magento\Framework\Filesystem\Driver\File $fileDriver,
+        DirectoryList $directoryList
+    ) {
+        $this->fileDriver = $fileDriver;
+        $this->directoryList = $directoryList;
+    }
+
+    /**
+     * Create log directory if it doest not exists
+     *
+     * @param string $logFolderPath
+     * @throws \Exception
+     */
+    private function assertLogFolderExists($logFolderPath)
+    {
+        if (!$this->fileDriver->isDirectory($logFolderPath)) {
+            $this->fileDriver->createDirectory($logFolderPath);
+        }
+
+        if (!$this->fileDriver->isDirectory($logFolderPath)) {
+            throw new \Exception(sprintf("Can`t create log directory: %s", $logFolderPath));
+        }
+    }
+
+    /**
+     * @param string $fileName
+     * @throws \Exception
+     */
+    private function assertFileExists($fileName)
+    {
+        if (!$this->fileDriver->isExists($fileName)) {
+            $this->fileDriver->touch($fileName);
+        }
+
+        if (!$this->fileDriver->isExists($fileName)) {
+            throw new \Exception(sprintf("Can`t create file %s", $fileName));
+        }
+    }
+
+    /**
+     * Make file empty from request to request
+     * @throws \Exception
+     * @return void
+     */
+    public function prepareToDryRun()
+    {
+        if ($this->fileDriver->isExists($this->getLoggerFile())) {
+            if (!$this->fileDriver->isWritable($this->getLoggerFile())) {
+                throw new \Exception(sprintf('Dry run logger file is not writable'));
+            }
+
+            $this->fileDriver->deleteFile($this->getLoggerFile());
+            $this->fileDriver->touch($this->getLoggerFile());
+        }
+    }
+
+    /**
+     * Return folder path, where dry run logged file will be placed
+     *
+     * @return string
+     */
+    private function getLoggerFolder()
+    {
+        return $this->directoryList->getPath(DirectoryList::VAR_DIR) .
+            DIRECTORY_SEPARATOR . 'log';
+    }
+
+    /**
+     * Return dry run logger file
+     *
+     * @return string
+     */
+    private function getLoggerFile()
+    {
+        return $this->getLoggerFolder() . DIRECTORY_SEPARATOR . self::FILE_NAME;
+    }
+
+    /**
+     * Do log of SQL query, 2 different SQL`s will be divided by one empty line
+     *
+     * @param string $sql
+     * @throws \Exception
+     * @return void
+     */
+    public function log($sql)
+    {
+        $loggerFolder = $this->getLoggerFolder();
+        $loggerFile = $this->getLoggerFile();
+        $this->assertLogFolderExists($loggerFolder);
+        $this->assertFileExists($loggerFile);
+
+        if ($this->fileDriver->isWritable($loggerFile)) {
+            $fd = $this->fileDriver->fileOpen($loggerFile, 'a');
+            $this->fileDriver->fileWrite($fd, $sql . self::LINE_SEPARATOR);
+        } else {
+            throw new \Exception(sprintf('Can`t write to file %s', $loggerFile));
+        }
+    }
+}
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Column.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Column.php
similarity index 96%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Column.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Column.php
index 95cf6e2dd0d..6dd2f554c68 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Column.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Column.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
 /**
  * Column structural element.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Blob.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Blob.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Blob.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Blob.php
index a31515f1000..0f202d9d98b 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Blob.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Blob.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * This column represent binary type.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Boolean.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Boolean.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Boolean.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Boolean.php
index 4b678bf0c01..df1ee502d46 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Boolean.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Boolean.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Boolean column.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnDefaultAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnDefaultAwareInterface.php
similarity index 82%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnDefaultAwareInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnDefaultAwareInterface.php
index 91c206373d1..6c043cd8ed8 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnDefaultAwareInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnDefaultAwareInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
 /**
  * Provides default value for column.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnIdentityAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnIdentityAwareInterface.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnIdentityAwareInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnIdentityAwareInterface.php
index 6f0a5aa572d..63c13711404 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnIdentityAwareInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnIdentityAwareInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
 /**
  * Provides auto_increment flag for column.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php
index 91db2b41a44..0ae403abd57 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnNullableAwareInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
 /**
  * Provides nullable flag for element.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php
index 6f5c5263b6d..be5d6bf91ef 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/ColumnUnsignedAwareInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
 /**
  * Unsigned flag provider for element.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Date.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Date.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Date.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Date.php
index 7406a7fb87f..13f6c0da049 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Date.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Date.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Date column.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Integer.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Integer.php
similarity index 92%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Integer.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Integer.php
index 116e078da0e..5c0c89dd0b4 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Integer.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Integer.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Integer column.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Real.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Real.php
similarity index 92%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Real.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Real.php
index 92b83057ba1..fd24ff1c552 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Real.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Real.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Real data column.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/StringBinary.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/StringBinary.php
similarity index 89%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/StringBinary.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/StringBinary.php
index 39f83dba17a..58e6df11463 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/StringBinary.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/StringBinary.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * String or Binary column.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Text.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Text.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Text.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Text.php
index 216c2aadf60..b127d5d50e0 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Text.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Text.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Text column.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Timestamp.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Timestamp.php
similarity index 88%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Timestamp.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Timestamp.php
index 30aa212ffca..240a4bd755d 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Columns/Timestamp.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Columns/Timestamp.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Columns;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Columns;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Timestamp column.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Constraint.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraint.php
similarity index 95%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Constraint.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraint.php
index 211965385cf..a7f7fcb2e66 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Constraint.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraint.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
 /**
  * Constraint structural element.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Constraints/Internal.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Internal.php
similarity index 82%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Constraints/Internal.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Internal.php
index 88d0a9a538b..e15407a4a83 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Constraints/Internal.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Internal.php
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Constraints;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Constraints;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraint;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Internal key constraint is constraint that add KEY onto table columns, on which it is declared.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Constraints/Reference.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Reference.php
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Constraints/Reference.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Reference.php
index 5050cde16b4..b79e8fdd3cc 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Constraints/Reference.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Constraints/Reference.php
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Constraints;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Constraints;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraint;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementDiffAwareInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementDiffAwareInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Reference (Foreign Key) constraint.
@@ -51,6 +51,7 @@ class Reference extends Constraint implements ElementDiffAwareInterface
      * @param Table  $referenceTable
      * @param Column $referenceColumn
      * @param string $onDelete
+     * @SuppressWarnings(Magento.TypeDuplication)
      */
     public function __construct(
         string $name,
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/ElementDiffAwareInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementDiffAwareInterface.php
similarity index 92%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/ElementDiffAwareInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementDiffAwareInterface.php
index 4fa23955685..54413cc7234 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/ElementDiffAwareInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementDiffAwareInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
 /**
  * Element diff provider interface.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/ElementFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementFactory.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/ElementFactory.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementFactory.php
index 0976f48da88..ff770e2d0dc 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/ElementFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementFactory.php
@@ -3,10 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
 use Magento\Framework\Stdlib\BooleanUtils;
-use Magento\Setup\Model\Declaration\Schema\Dto\Factories\FactoryInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\FactoryInterface;
 
 /**
  * DTO Element factory.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/ElementInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementInterface.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/ElementInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementInterface.php
index 0fd0a9e4a67..1471dba2dfb 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/ElementInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
 /**
  * Generic DTO Element interface.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Blob.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Blob.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Blob.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Blob.php
index 3a9b1cae062..739f42fd171 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Blob.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Blob.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -35,7 +35,7 @@ class Blob implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Blob::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Blob::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Boolean.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Boolean.php
similarity index 89%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Boolean.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Boolean.php
index 442ab477924..5e22fa70f6f 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Boolean.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Boolean.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Stdlib\BooleanUtils;
@@ -44,7 +44,7 @@ class Boolean implements FactoryInterface
     public function __construct(
         ObjectManagerInterface $objectManager,
         BooleanUtils $booleanUtils,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Boolean::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Date.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Date.php
similarity index 85%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Date.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Date.php
index 4356479f138..f5e3271c5ff 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Date.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Date.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -31,7 +31,7 @@ class Date implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Date::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Date::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/FactoryInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/FactoryInterface.php
similarity index 72%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/FactoryInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/FactoryInterface.php
index 06bdf2c21c5..26ed3e8a4d2 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/FactoryInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/FactoryInterface.php
@@ -3,9 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * DTO Element Factory Interface.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Foreign.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Foreign.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Foreign.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Foreign.php
index 76febc2b09d..030f2a49d81 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Foreign.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Foreign.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -35,7 +35,7 @@ class Foreign implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Index.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Index.php
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Index.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Index.php
index d040a7ae00e..919aa056345 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Index.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Index.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -35,7 +35,7 @@ class Index implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Index::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Index::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Integer.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Integer.php
similarity index 90%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Integer.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Integer.php
index e66681fb700..5cd7bcac397 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Integer.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Integer.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -43,7 +43,7 @@ class Integer implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/LongBlob.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongBlob.php
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/LongBlob.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongBlob.php
index b6507151cd5..17c0c9d27dc 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/LongBlob.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongBlob.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -35,7 +35,7 @@ class LongBlob implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Blob::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Blob::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/LongText.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongText.php
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/LongText.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongText.php
index 790a8bb573c..2e364a40a4b 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/LongText.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/LongText.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -35,7 +35,7 @@ class LongText implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Text::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Text::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/MediumBlob.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumBlob.php
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/MediumBlob.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumBlob.php
index 5520d32a2da..ae771d6e378 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/MediumBlob.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumBlob.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -35,7 +35,7 @@ class MediumBlob implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Blob::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Blob::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/MediumText.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumText.php
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/MediumText.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumText.php
index 63254aead32..36c02074601 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/MediumText.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/MediumText.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -35,7 +35,7 @@ class MediumText implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Text::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Text::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Primary.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Primary.php
similarity index 81%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Primary.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Primary.php
index 3327f9818de..ca87ab34f00 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Primary.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Primary.php
@@ -3,10 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
 
 /**
  * Primary key DTO element factory.
@@ -33,7 +33,7 @@ class Primary implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Real.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php
similarity index 90%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Real.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php
index 9af53fb05b8..cdb740ea0a9 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Real.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Real.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -43,7 +43,7 @@ class Real implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Real::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/StringBinary.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/StringBinary.php
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/StringBinary.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/StringBinary.php
index f87e291b694..71b955ad736 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/StringBinary.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/StringBinary.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -37,7 +37,7 @@ class StringBinary implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\StringBinary::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\StringBinary::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Table.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Table.php
similarity index 90%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Table.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Table.php
index 3e17ce30003..807b5b83db1 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Table.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Table.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\ObjectManagerInterface;
@@ -16,7 +16,7 @@ class Table implements FactoryInterface
 {
     /**
      * Default engine.
-     * May be overriden for another DBMS.
+     * May be redefined for other DBMS.
      */
     const DEFAULT_ENGINE = 'innodb';
 
@@ -45,7 +45,7 @@ class Table implements FactoryInterface
     public function __construct(
         ObjectManagerInterface $objectManager,
         ResourceConnection $resourceConnection,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Table::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Table::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Text.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Text.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Text.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Text.php
index 32663e9f43a..24b3168d567 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Text.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Text.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -35,7 +35,7 @@ class Text implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Text::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Text::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Timestamp.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Timestamp.php
similarity index 93%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Timestamp.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Timestamp.php
index 51ab394d7f0..4a7cca43919 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Timestamp.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Timestamp.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Stdlib\BooleanUtils;
@@ -51,7 +51,7 @@ class Timestamp implements FactoryInterface
     public function __construct(
         ObjectManagerInterface $objectManager,
         BooleanUtils $booleanUtils,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Unique.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Unique.php
similarity index 84%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Unique.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Unique.php
index 506f988dbf9..3709f035fe3 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Factories/Unique.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Unique.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -30,7 +30,7 @@ class Unique implements FactoryInterface
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        $className = \Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal::class
+        $className = \Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal::class
     ) {
         $this->objectManager = $objectManager;
         $this->className = $className;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/GenericElement.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/GenericElement.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/GenericElement.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/GenericElement.php
index f2cff401103..122f1afd6f9 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/GenericElement.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/GenericElement.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
 /**
  * Generic element DTO.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Index.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Index.php
similarity index 97%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Index.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Index.php
index 0e2ce23e771..ea8c07bf19e 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Index.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Index.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
 /**
  * Index structural element.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Schema.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php
similarity index 96%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Schema.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php
index f524d767f9d..3e68b985283 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Schema.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Schema.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
 use Magento\Framework\App\ResourceConnection;
 
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/SchemaFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/SchemaFactory.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/SchemaFactory.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/SchemaFactory.php
index e8bb65c55f7..561ed427e70 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/SchemaFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/SchemaFactory.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -35,7 +35,7 @@ public function __construct(ObjectManagerInterface $objectManager)
     /**
      * Create class instance with specified parameters.
      *
-     * @return \Magento\Setup\Model\Declaration\Schema\Dto\Schema
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Schema
      */
     public function create()
     {
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Table.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php
similarity index 95%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Table.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php
index 7c97702e578..76b87ea8fc8 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/Table.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Table.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
 
 /**
  * Table structural element
@@ -78,8 +78,8 @@ class Table extends GenericElement implements
      */
     public function __construct(
         string $name,
-        string $nameWithoutPrefix,
         string $type,
+        string $nameWithoutPrefix,
         string $resource,
         string $engine,
         string $comment = null,
@@ -216,7 +216,7 @@ public function addColumns(array $columns)
      * If column exists - retrieve column
      *
      * @param  string $nameOrId
-     * @return Column
+     * @return Column | bool
      */
     public function getColumnByName($nameOrId)
     {
@@ -224,7 +224,7 @@ public function getColumnByName($nameOrId)
             return $this->columns[$nameOrId];
         }
 
-        throw new \LogicException(sprintf("Cannot find column with name or id %s", $nameOrId));
+        return false;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/TableElementInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/TableElementInterface.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Dto/TableElementInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/TableElementInterface.php
index 371c756d7c4..630f09b18aa 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Dto/TableElementInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/TableElementInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Declaration\Schema\Dto;
+namespace Magento\Framework\Setup\Declaration\Schema\Dto;
 
 /**
  * Table DTO Element interface.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/ElementHistory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistory.php
similarity index 89%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/ElementHistory.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistory.php
index af6f857a5b7..f609d2715d3 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/ElementHistory.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistory.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Declaration\Schema;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Element history container.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/ElementHistoryFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistoryFactory.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/ElementHistoryFactory.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistoryFactory.php
index 5f2cff36a0a..174e213e75b 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/ElementHistoryFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/ElementHistoryFactory.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Declaration\Schema;
 
 use Magento\Framework\ObjectManagerInterface;
 
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/FileSystem/Csv.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/Csv.php
similarity index 96%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/FileSystem/Csv.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/Csv.php
index def2123e6a7..1720938c945 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/FileSystem/Csv.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/Csv.php
@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\FileSystem;
+namespace Magento\Framework\Setup\Declaration\Schema\FileSystem;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * CSV file operations wrapper.
  */
-class Csv implements \Magento\Setup\Model\Declaration\Schema\DataSavior\DumpAccessorInterface
+class Csv implements \Magento\Framework\Setup\Declaration\Schema\DataSavior\DumpAccessorInterface
 {
     /**
      * Folder where will be persisted all csv dumps
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/FileSystem/XmlReader.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/XmlReader.php
similarity index 80%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/FileSystem/XmlReader.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/XmlReader.php
index a250a742204..bd835c35fd8 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/FileSystem/XmlReader.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/FileSystem/XmlReader.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\FileSystem;
+namespace Magento\Framework\Setup\Declaration\Schema\FileSystem;
 
 use Magento\Framework\Config\FileResolverByModule;
 use Magento\Framework\Config\ReaderInterface;
@@ -33,8 +33,8 @@ class XmlReader extends \Magento\Framework\Config\Reader\Filesystem implements R
      * XmlReader constructor.
      *
      * @param FileResolverByModule $fileResolver
-     * @param \Magento\Setup\Model\Declaration\Schema\Config\Converter $converter
-     * @param \Magento\Setup\Model\Declaration\Schema\Config\SchemaLocator $schemaLocator
+     * @param \Magento\Framework\Setup\Declaration\Schema\Config\Converter $converter
+     * @param \Magento\Framework\Setup\Declaration\Schema\Config\SchemaLocator $schemaLocator
      * @param \Magento\Framework\Config\ValidationStateInterface $validationState
      * @param string $fileName
      * @param string $domDocumentClass
@@ -42,8 +42,8 @@ class XmlReader extends \Magento\Framework\Config\Reader\Filesystem implements R
      */
     public function __construct(
         FileResolverByModule $fileResolver,
-        \Magento\Setup\Model\Declaration\Schema\Config\Converter $converter,
-        \Magento\Setup\Model\Declaration\Schema\Config\SchemaLocator $schemaLocator,
+        \Magento\Framework\Setup\Declaration\Schema\Config\Converter $converter,
+        \Magento\Framework\Setup\Declaration\Schema\Config\SchemaLocator $schemaLocator,
         \Magento\Framework\Config\ValidationStateInterface $validationState,
         $fileName = 'db_schema.xml',
         $domDocumentClass = \Magento\Framework\Config\Dom::class,
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/OperationInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationInterface.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/OperationInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationInterface.php
index 56f35e27407..00490a96047 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/OperationInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationInterface.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Declaration\Schema;
 
 /**
  * Schema operation interface.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/AddColumn.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php
similarity index 88%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Operations/AddColumn.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php
index 86cf5859096..5810c78a209 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/AddColumn.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddColumn.php
@@ -4,19 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Operations;
-
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DDLTriggerInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator;
-use Magento\Setup\Model\Declaration\Schema\Db\Statement;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementFactory;
-use Magento\Setup\Model\Declaration\Schema\Dto\Index;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\ElementHistoryFactory;
-use Magento\Setup\Model\Declaration\Schema\OperationInterface;
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
+
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DDLTriggerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistoryFactory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
 
 /**
  * Add column to table operation.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/AddComplexElement.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddComplexElement.php
similarity index 79%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Operations/AddComplexElement.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddComplexElement.php
index f333eca43e8..7e1d94eeed8 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/AddComplexElement.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/AddComplexElement.php
@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Operations;
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
 
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\TableElementInterface;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\OperationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\TableElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
 
 /**
  * Add complex element operation.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/CreateTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/CreateTable.php
similarity index 79%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Operations/CreateTable.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/CreateTable.php
index 338c0f52e55..18726001c19 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/CreateTable.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/CreateTable.php
@@ -4,18 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Operations;
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
 
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DDLTriggerInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraint;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Index;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\OperationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DDLTriggerInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraint;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
 
 /**
  * Create table operation.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/DropElement.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropElement.php
similarity index 74%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Operations/DropElement.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropElement.php
index 9b428c0b386..97fb5359783 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/DropElement.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropElement.php
@@ -4,15 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Operations;
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
 
-use Magento\Setup\Model\Declaration\Schema\Db\AdapterMediator;
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\TableElementInterface;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\OperationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\AdapterMediator;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\TableElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
 
 /**
  * Drop element operation.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/DropReference.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php
similarity index 84%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Operations/DropReference.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php
index c5a1b3a67f2..4a5f651a108 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/DropReference.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Operations;
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
 
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\OperationInterface;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
 
 /**
  * Drop foreign key operation.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/DropTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropTable.php
similarity index 77%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Operations/DropTable.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropTable.php
index 9b7249e6366..759fd15903f 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/DropTable.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropTable.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Operations;
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
 
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\OperationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
 
 /**
  * Drop table operation.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/ModifyColumn.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyColumn.php
similarity index 79%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Operations/ModifyColumn.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyColumn.php
index 285b44bcdbe..6bafc790c34 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/ModifyColumn.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyColumn.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Operations;
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
 
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\OperationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
 
 /**
  * Modify column in table operation.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/ModifyTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyTable.php
similarity index 73%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Operations/ModifyTable.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyTable.php
index e25d0cf3e6d..d30b3271106 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/ModifyTable.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ModifyTable.php
@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Operations;
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
 
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\OperationInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
 
 /**
  * Modify table operation.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/ReCreateTable.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ReCreateTable.php
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Operations/ReCreateTable.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ReCreateTable.php
index ba5ad86b4c2..a06c7c10325 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Operations/ReCreateTable.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/ReCreateTable.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema\Operations;
+namespace Magento\Framework\Setup\Declaration\Schema\Operations;
 
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\OperationInterface;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\OperationInterface;
 
 /**
  * Recreate table operation.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/OperationsExecutor.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationsExecutor.php
similarity index 82%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/OperationsExecutor.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationsExecutor.php
index 60f9b32912b..ed1baff1d33 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/OperationsExecutor.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/OperationsExecutor.php
@@ -4,19 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Declaration\Schema;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Setup\Console\Command\InstallCommand;
-use Magento\Setup\Model\Declaration\Schema\DataSavior\DataSaviorInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\StatementAggregatorFactory;
-use Magento\Setup\Model\Declaration\Schema\Db\StatementFactory;
-use Magento\Setup\Model\Declaration\Schema\Diff\DiffInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-use Magento\Setup\Model\Declaration\Schema\Operations\AddColumn;
-use Magento\Setup\Model\Declaration\Schema\Operations\CreateTable;
-use Magento\Setup\Model\Declaration\Schema\Operations\ReCreateTable;
+use Magento\Framework\Setup\Declaration\Schema\DataSavior\DataSaviorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregatorFactory;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Diff\DiffInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddColumn;
+use Magento\Framework\Setup\Declaration\Schema\Operations\CreateTable;
+use Magento\Framework\Setup\Declaration\Schema\Operations\ReCreateTable;
 
 /**
  * Schema operations executor.
@@ -26,6 +25,12 @@
  */
 class OperationsExecutor
 {
+    /**
+     * Request keys.
+     */
+    const KEY_SAFE_MODE = 'safe-mode';
+    const KEY_DATA_RESTORE = 'data-restore';
+
     /**
      * @var OperationInterface[]
      */
@@ -61,16 +66,22 @@ class OperationsExecutor
      */
     private $dataSaviorsCollection;
 
+    /**
+     * @var DryRunLogger
+     */
+    private $dryRunLogger;
+
     /**
      * Constructor.
      *
      * @param array $operations
+     * @param array $dataSaviorsCollection
      * @param Sharding $sharding
      * @param ResourceConnection $resourceConnection
      * @param StatementFactory $statementFactory
      * @param DbSchemaWriterInterface $dbSchemaWriter
      * @param StatementAggregatorFactory $statementAggregatorFactory
-     * @param array $dataSaviorsCollection
+     * @param DryRunLogger $dryRunLogger
      */
     public function __construct(
         array $operations,
@@ -79,7 +90,8 @@ public function __construct(
         ResourceConnection $resourceConnection,
         StatementFactory $statementFactory,
         DbSchemaWriterInterface $dbSchemaWriter,
-        StatementAggregatorFactory $statementAggregatorFactory
+        StatementAggregatorFactory $statementAggregatorFactory,
+        DryRunLogger $dryRunLogger
     ) {
         $this->operations = $operations;
         $this->sharding = $sharding;
@@ -88,6 +100,7 @@ public function __construct(
         $this->dbSchemaWriter = $dbSchemaWriter;
         $this->statementAggregatorFactory = $statementAggregatorFactory;
         $this->dataSaviorsCollection = $dataSaviorsCollection;
+        $this->dryRunLogger = $dryRunLogger;
     }
 
     /**
@@ -168,6 +181,13 @@ public function execute(DiffInterface $diff, array $requestData)
     {
         $this->startSetupForAllConnections();
         $tableHistories = $diff->getAll();
+        $dryRun = isset($requestData[DryRunLogger::INPUT_KEY_DRY_RUN_MODE]) &&
+            $requestData[DryRunLogger::INPUT_KEY_DRY_RUN_MODE];
+
+        if ($dryRun) {
+            $this->dryRunLogger->prepareToDryRun();
+        }
+
         if (is_array($tableHistories)) {
             foreach ($tableHistories as $tableHistory) {
                 $destructiveElements = [];
@@ -190,7 +210,7 @@ public function execute(DiffInterface $diff, array $requestData)
                 }
 
                 $this->doDump($destructiveElements, $requestData);
-                $this->dbSchemaWriter->compile($statementAggregator);
+                $this->dbSchemaWriter->compile($statementAggregator, $dryRun);
                 $this->doRestore($oppositeToDestructiveElements, $requestData);
             }
         }
@@ -206,8 +226,7 @@ public function execute(DiffInterface $diff, array $requestData)
      */
     private function doRestore(array $elements, array $requestData)
     {
-        $restoreMode = isset($requestData[InstallCommand::INPUT_KEY_DATA_RESTORE]) &&
-            $requestData[InstallCommand::INPUT_KEY_DATA_RESTORE];
+        $restoreMode = isset($requestData[self::KEY_DATA_RESTORE]) && $requestData[self::KEY_DATA_RESTORE];
 
         if ($restoreMode) {
             /**
@@ -232,8 +251,7 @@ private function doRestore(array $elements, array $requestData)
      */
     private function doDump(array $elements, array $requestData)
     {
-        $safeMode = isset($requestData[InstallCommand::INPUT_KEY_SAFE_INSTALLER_MODE]) &&
-            $requestData[InstallCommand::INPUT_KEY_SAFE_INSTALLER_MODE];
+        $safeMode = isset($requestData[self::KEY_SAFE_MODE]) && $requestData[self::KEY_SAFE_MODE];
 
         if ($safeMode) {
             /**
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Request.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Request.php
similarity index 93%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Request.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Request.php
index 4d1e13944dd..2ffe29cc769 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Request.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Request.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Declaration\Schema;
 
 /**
  * CLI or Ui params transport object.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/RequestFactory.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/RequestFactory.php
similarity index 93%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/RequestFactory.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/RequestFactory.php
index 9a62aa34db9..8f76815d4dc 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/RequestFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/RequestFactory.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Declaration\Schema;
 
 use Zend\Di\Di;
 
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/SchemaConfig.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/SchemaConfig.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php
index 2b693f59cc3..4cd90cb35b2 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/SchemaConfig.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfig.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Declaration\Schema;
 
 use Magento\Framework\Config\FileResolverByModule;
-use Magento\Setup\Model\Declaration\Schema\Db\SchemaBuilder as DbSchemaBuilder;
-use Magento\Setup\Model\Declaration\Schema\Declaration\SchemaBuilder as DeclarativeSchemaBuilder;
-use Magento\Setup\Model\Declaration\Schema\Declaration\ReaderComposite;
-use Magento\Setup\Model\Declaration\Schema\Dto\SchemaFactory;
+use Magento\Framework\Setup\Declaration\Schema\Db\SchemaBuilder as DbSchemaBuilder;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\SchemaBuilder as DeclarativeSchemaBuilder;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
+use Magento\Framework\Setup\Declaration\Schema\Dto\SchemaFactory;
 
 /**
  * {@inheritdoc}
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/SchemaConfigInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfigInterface.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/SchemaConfigInterface.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfigInterface.php
index cc0b5319fdf..1e6c5d63c8b 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/SchemaConfigInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/SchemaConfigInterface.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Declaration\Schema;
 
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
 
 /**
  * Schema configuration interface.
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Sharding.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Sharding.php
similarity index 97%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/Sharding.php
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/Sharding.php
index a04540cb6d9..eff8d7c3c03 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Sharding.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Sharding.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Declaration\Schema;
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/constraint.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/constraint.xsd
similarity index 80%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/constraint.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/constraint.xsd
index 06b99c88e43..61540ecc616 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/constraint.xsd
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/constraint.xsd
@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/operations.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/operations.xsd" />
 
     <xs:attributeGroup name="baseConstraint">
         <xs:attributeGroup ref="basicOperations" />
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/foreign.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/foreign.xsd
similarity index 92%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/foreign.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/foreign.xsd
index 32cd05caa3f..950fbf66f90 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/foreign.xsd
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/foreign.xsd
@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/constraints/constraint.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/constraint.xsd" />
     <!--@TODO: why we need to specify table?-->
     <xs:complexType name="foreign">
         <xs:annotation>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/primary.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/primary.xsd
similarity index 89%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/primary.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/primary.xsd
index 826f30c2fd8..f6d1e09823a 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/primary.xsd
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/primary.xsd
@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/constraints/constraint.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/constraint.xsd" />
     
     <xs:complexType name="primary">
         <xs:annotation>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/unique.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/unique.xsd
similarity index 87%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/unique.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/unique.xsd
index 76c3c39dad0..e2d24ea6574 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/constraints/unique.xsd
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/constraints/unique.xsd
@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/constraints/constraint.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/constraint.xsd" />
     
     <xs:complexType name="unique">
         <xs:annotation>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/index.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/index.xsd
similarity index 100%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/index.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/index.xsd
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/name.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/name.xsd
similarity index 100%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/name.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/name.xsd
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/operations.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/operations.xsd
similarity index 100%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/operations.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/operations.xsd
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd
new file mode 100644
index 00000000000..fa1894bb486
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/schema.xsd
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+* Copyright © Magento, Inc. All rights reserved.
+* See COPYING.txt for license details.
+*/
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <!--Types-->
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/name.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/real/decimal.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/real/float.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/real/double.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/integer.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/biginteger.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/smallinteger.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/tinyinteger.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/texts/text.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/texts/longtext.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/texts/mediumtext.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/texts/varchar.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/binaries/blob.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/binaries/mediumblob.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/binaries/longblob.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/binaries/varbinary.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/datetime/timestamp.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/datetime/datetime.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/datetime/date.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/boolean.xsd" />
+    <!--Constraints-->
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/foreign.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/unique.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/constraints/primary.xsd" />
+    <!--Indexes-->
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/index.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd" />
+
+    <xs:element name="schema">
+        <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="table" type="table"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="table">
+        <xs:annotation>
+            <xs:documentation>
+                Table definition. Here we can found column, constraints and indexes
+            </xs:documentation>
+        </xs:annotation>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="column" type="abstractColumnType"/>
+            <xs:element name="constraint" />
+            <xs:element name="index" type="index" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string" />
+        <xs:attribute name="resource" type="resourceType" />
+        <xs:attribute name="engine" type="engineType" />
+        <xs:attribute name="comment" type="xs:string" />
+    </xs:complexType>
+
+    <xs:simpleType name="resourceType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="default" />
+            <xs:enumeration value="quote" />
+            <xs:enumeration value="sales" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="engineType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="innodb" />
+            <xs:enumeration value="memory" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/blob.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/blob.xsd
new file mode 100644
index 00000000000..b3812cedeb6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/blob.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="blob">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Can be used as binary source
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/longblob.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/longblob.xsd
new file mode 100644
index 00000000000..f69ea7c7164
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/longblob.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="longblob">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Can be used as binary source. Different types can be used depends on data size
+                        you want to persist
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/mediumblob.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/mediumblob.xsd
new file mode 100644
index 00000000000..ac81024f318
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/mediumblob.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="mediumblob">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Can be used as binary source
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/varbinary.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/varbinary.xsd
new file mode 100644
index 00000000000..0ee79199c29
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/binaries/varbinary.xsd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="varbinary">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Can be used as binary source
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="length">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:maxInclusive value="255"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="default" type="xs:string" />
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/boolean.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/boolean.xsd
new file mode 100644
index 00000000000..65dec3ae218
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/boolean.xsd
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd" />
+
+    <xs:complexType name="boolean">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:attribute name="default" type="xs:boolean" />
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/column.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/column.xsd
similarity index 78%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/column.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/column.xsd
index 2fcf6c59e12..df485e38869 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/column.xsd
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/column.xsd
@@ -6,8 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/operations.xsd" />
-
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/operations.xsd" />
     <xs:attributeGroup name="baseColumn">
         <xs:attributeGroup ref="basicOperations" />
         <xs:attribute name="name" type="nameType" use="required" />
@@ -20,4 +19,8 @@
             </xs:annotation>
         </xs:attribute>
     </xs:attributeGroup>
+
+    <xs:complexType name="abstractColumnType">
+        <xs:attributeGroup ref="baseColumn" />
+    </xs:complexType>
 </xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/date.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/date.xsd
new file mode 100644
index 00000000000..aeb6f34c41a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/date.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd" />
+
+    <xs:complexType name="date">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        This format is used to save date (year, month, day).
+                        Probably your SQL engine will save date in this format: 'YYYY-MM-DD'
+                        Dates in invalid format will be converted to '0000-00-00' string
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/datetime.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/datetime.xsd
new file mode 100644
index 00000000000..c9c9d4052e1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/datetime.xsd
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/datetime/default.xsd"/>
+
+    <xs:complexType name="datetime">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        This format is used to save date (year, month, day).
+                        Probably your SQL engine will save date in this format: 'YYYY-MM-DD HH:MM::SS'
+                        Date time in invalid format will be converted to '0000-00-00 00:00:00' string
+                        Supported range is '1000-01-01 00:00:00' to '9999-12-31 23:59:59'
+                        DateTime format save date and time in your local time zone
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attributeGroup ref="default" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/default.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/default.xsd
similarity index 100%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/default.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/default.xsd
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/timestamp.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/timestamp.xsd
new file mode 100644
index 00000000000..0fd94540bae
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/datetime/timestamp.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd" />
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/datetime/default.xsd"/>
+
+    <xs:complexType name="timestamp">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        This format is used to save date (year, month, day).
+                        Probably your SQL engine will save date in this format: 'YYYY-MM-DD HH:MM::SS'
+                        Date time in invalid format will be converted to '0000-00-00 00:00:00' string
+                        MySQL timestamp is similar to UNIX timestamp. You can pass you local time there and it will
+                        be converted to UTC timezone. Then when you will try to pull your time back it will be converted
+                        to your local time again.
+                        Unix range: 1970-01-01 00:00:01' UTC to '2038-01-09 03:14:07'
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attributeGroup ref="default" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/biginteger.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/biginteger.xsd
similarity index 78%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/biginteger.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/biginteger.xsd
index 186779afb53..df222eb93a3 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/biginteger.xsd
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/biginteger.xsd
@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/integers/integer.xsd"/>
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/integer.xsd"/>
 
     <xs:complexType name="bigint">
         <xs:complexContent>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/integer.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/integer.xsd
new file mode 100644
index 00000000000..e264060cba6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/integer.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="int">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Serves needs in integer digits. Default padding is 11.
+                        Size is 4 bytes.
+                    </xs:documentation>
+                </xs:annotation>
+                <xs:attribute name="default" type="xs:integer" />
+                <xs:attribute name="padding">
+                    <xs:annotation>
+                        <xs:documentation>
+                            We can use padding only from 2, because padding 1 used for boolean type.
+                            And we need to distinguish boolean and integer
+                        </xs:documentation>
+                    </xs:annotation>
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:maxInclusive value="255" />
+                            <xs:minInclusive value="2" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="unsigned" type="xs:boolean" />
+                <xs:attribute name="identity" type="xs:boolean" />
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/smallinteger.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/smallinteger.xsd
similarity index 84%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/smallinteger.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/smallinteger.xsd
index 7c77d738f9b..5306fbc1d9f 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/smallinteger.xsd
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/smallinteger.xsd
@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/integers/integer.xsd"/>
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/integer.xsd"/>
 
     <xs:complexType name="smallint">
         <xs:annotation>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/tinyinteger.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/tinyinteger.xsd
similarity index 78%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/tinyinteger.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/tinyinteger.xsd
index e35d4b27921..32d8294d9dc 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/tinyinteger.xsd
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/integers/tinyinteger.xsd
@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/integers/integer.xsd"/>
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/integers/integer.xsd"/>
 
     <xs:complexType name="tinyint">
         <xs:complexContent>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/decimal.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/decimal.xsd
new file mode 100644
index 00000000000..2aa5387df49
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/decimal.xsd
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="decimal">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        A fixed point decimal fraction equal to SQL DECIMAL(PRECISION,SCALE) type, where
+                        - SCALE is a size of number in fractional part,
+                        - PRECISION is a whole size of decimal fraction.
+                        Please use this type for business oriented math like price or qty storages.
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="default" type="xs:decimal" />
+                <!--Note that scale must not be more than precision-->
+                <xs:attribute name="precision">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:minInclusive value="0" />
+                            <xs:maxInclusive value="65" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="unsigned" type="xs:boolean" />
+                <xs:attribute name="scale">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:minInclusive value="0" />
+                            <xs:maxInclusive value="30" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/real/double.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/double.xsd
similarity index 86%
rename from setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/real/double.xsd
rename to lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/double.xsd
index be83da3016b..652626ee9c1 100644
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/real/double.xsd
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/double.xsd
@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/real/float.xsd"/>
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/real/float.xsd"/>
 
     <xs:complexType name="double">
         <xs:annotation>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/float.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/float.xsd
new file mode 100644
index 00000000000..3ddaed993a6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/real/float.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="float">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        A floating point binary value with single precision. Has rounding issues.
+                        Float is good for scientific calculations.
+                        For business oriented math like price or qty storages please use decimal type.
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="default" type="xs:float" />
+                <!--Note that scale must not be more than precision-->
+                <xs:attribute name="precision">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:minInclusive value="0" />
+                            <xs:maxInclusive value="255" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="scale">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:minInclusive value="0" />
+                            <xs:maxInclusive value="253" />
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="nullable" type="xs:boolean" />
+                <xs:attribute name="unsigned" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/longtext.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/longtext.xsd
new file mode 100644
index 00000000000..90b1b910c06
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/longtext.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="longtext">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Here plain text can be persisted. Length of this field is more than more than 16777216
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/mediumtext.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/mediumtext.xsd
new file mode 100644
index 00000000000..652d4b5cf46
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/mediumtext.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="mediumtext">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Here plain text can be persisted. Length of this field is more than 65536 characters
+                        and less than 16777216
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/text.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/text.xsd
new file mode 100644
index 00000000000..d1efce61248
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/text.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="text">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Here plain text can be persisted. Length of this field is more than 255 characters
+                        and less than 65536
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/varchar.xsd b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/varchar.xsd
new file mode 100644
index 00000000000..a667b0b2481
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/etc/types/texts/varchar.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:include schemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/types/column.xsd"/>
+
+    <xs:complexType name="varchar">
+        <xs:complexContent>
+            <xs:extension base="abstractColumnType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Varchar is the small text field. It do not have max length. But we suppose, that this field can be used for
+                        string columns that are in role of some key, like customer email or product sku. We add limitation for 1024 characters
+                        on this type. This limitation is justified by SQL engine limitations, like {max sort size} or {max index size}.
+                        For example, in MySQL, default max sort size (max_sort_length) is 1024 symbols.
+                    </xs:documentation>
+                </xs:annotation>
+
+                <xs:attribute name="length">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:integer">
+                            <xs:maxInclusive value="1024"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="default" type="xs:string" />
+                <xs:attribute name="nullable" type="xs:boolean" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/lib/internal/Magento/Framework/Setup/Exception.php b/lib/internal/Magento/Framework/Setup/Exception.php
new file mode 100644
index 00000000000..c21bd1c5032
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Exception.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Exception thrown if an error occurs on setup process.
+ */
+class Exception extends LocalizedException
+{
+}
diff --git a/lib/internal/Magento/Framework/Setup/Lists.php b/lib/internal/Magento/Framework/Setup/Lists.php
index ce0dd8348ac..1ee5baf2865 100644
--- a/lib/internal/Magento/Framework/Setup/Lists.php
+++ b/lib/internal/Magento/Framework/Setup/Lists.php
@@ -21,12 +21,20 @@ class Lists
      */
     protected $allowedLocales;
 
+    /**
+     * List of allowed currencies
+     *
+     * @var array
+     */
+    private $allowedCurrencies;
+
     /**
      * @param ConfigInterface $localeConfig
      */
     public function __construct(ConfigInterface $localeConfig)
     {
         $this->allowedLocales = $localeConfig->getAllowedLocales();
+        $this->allowedCurrencies = $localeConfig->getAllowedCurrencies();
     }
 
     /**
@@ -64,6 +72,10 @@ public function getCurrencyList()
         $currencies = (new CurrencyBundle())->get(Resolver::DEFAULT_LOCALE)['Currencies'];
         $list = [];
         foreach ($currencies as $code => $data) {
+            $isAllowedCurrency = array_search($code, $this->allowedCurrencies) !== false;
+            if (!$isAllowedCurrency) {
+                continue;
+            }
             $list[$code] = $data[1] . ' (' . $code . ')';
         }
         asort($list);
diff --git a/setup/src/Magento/Setup/Model/Patch/DataPatchInterface.php b/lib/internal/Magento/Framework/Setup/Patch/DataPatchInterface.php
similarity index 89%
rename from setup/src/Magento/Setup/Model/Patch/DataPatchInterface.php
rename to lib/internal/Magento/Framework/Setup/Patch/DataPatchInterface.php
index 2c81df6f176..e768d045e83 100644
--- a/setup/src/Magento/Setup/Model/Patch/DataPatchInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/DataPatchInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 /**
  * This interface describe script, that atomic operations with data (DML, DQL) in SQL database
diff --git a/setup/src/Magento/Setup/Model/Patch/DependentPatchInterface.php b/lib/internal/Magento/Framework/Setup/Patch/DependentPatchInterface.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Patch/DependentPatchInterface.php
rename to lib/internal/Magento/Framework/Setup/Patch/DependentPatchInterface.php
index f0c20cbad46..abda94a0e6f 100644
--- a/setup/src/Magento/Setup/Model/Patch/DependentPatchInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/DependentPatchInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 /**
  * Each patch can have dependecies, that should be applied before such patch
diff --git a/setup/src/Magento/Setup/Model/Patch/NonTransactionableInterface.php b/lib/internal/Magento/Framework/Setup/Patch/NonTransactionableInterface.php
similarity index 83%
rename from setup/src/Magento/Setup/Model/Patch/NonTransactionableInterface.php
rename to lib/internal/Magento/Framework/Setup/Patch/NonTransactionableInterface.php
index 3b06f21de5c..30800b3c893 100644
--- a/setup/src/Magento/Setup/Model/Patch/NonTransactionableInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/NonTransactionableInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 /**
  * Means that patch can`t be run in transaction
diff --git a/setup/src/Magento/Setup/Model/Patch/PatchApplier.php b/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
similarity index 91%
rename from setup/src/Magento/Setup/Model/Patch/PatchApplier.php
rename to lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
index 14ebd79add7..4ffc4f18283 100644
--- a/setup/src/Magento/Setup/Model/Patch/PatchApplier.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
@@ -4,13 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Module\ModuleResource;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\Setup\Exception;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Setup\Exception;
 
 /**
  * Apply patches per specific module
@@ -81,6 +82,7 @@ class PatchApplier
      * @param \Magento\Framework\Setup\SchemaSetupInterface $schemaSetup
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(Magento.TypeDuplication)
      */
     public function __construct(
         PatchReader $dataPatchReader,
@@ -159,7 +161,7 @@ public function applyDataPatch($moduleName = null)
             );
             if (!$dataPatch instanceof DataPatchInterface) {
                 throw new Exception(
-                    sprintf("Patch %s should implement DataPatchInterface", get_class($dataPatch))
+                    new Phrase("Patch %1 should implement DataPatchInterface", [get_class($dataPatch)])
                 );
             }
             if ($dataPatch instanceof NonTransactionableInterface) {
@@ -173,7 +175,7 @@ public function applyDataPatch($moduleName = null)
                     $this->moduleDataSetup->getConnection()->commit();
                 } catch (\Exception $e) {
                     $this->moduleDataSetup->getConnection()->rollBack();
-                    throw new Exception($e->getMessage());
+                    throw new Exception(new Phrase($e->getMessage()));
                 } finally {
                     unset($dataPatch);
                 }
@@ -226,7 +228,16 @@ public function applySchemaPatch($moduleName = null)
                 $schemaPatch->apply();
                 $this->patchHistory->fixPatch(get_class($schemaPatch));
             } catch (\Exception $e) {
-                throw new Exception($e->getMessage());
+                throw new Exception(
+                    new Phrase(
+                        'Unable to apply patch %1 for module %2. Original exception message: %3',
+                        [
+                            get_class($schemaPatch),
+                            $moduleName,
+                            $e->getMessage()
+                        ]
+                    )
+                );
             } finally {
                 unset($schemaPatch);
             }
@@ -259,7 +270,7 @@ public function revertDataPatches($moduleName = null)
                     $adapter->commit();
                 } catch (\Exception $e) {
                     $adapter->rollBack();
-                    throw new Exception($e->getMessage());
+                    throw new Exception(new Phrase($e->getMessage()));
                 } finally {
                     unset($dataPatch);
                 }
diff --git a/setup/src/Magento/Setup/Model/Patch/PatchApplierFactory.php b/lib/internal/Magento/Framework/Setup/Patch/PatchApplierFactory.php
similarity index 82%
rename from setup/src/Magento/Setup/Model/Patch/PatchApplierFactory.php
rename to lib/internal/Magento/Framework/Setup/Patch/PatchApplierFactory.php
index 69878e214fc..deb7c91c976 100644
--- a/setup/src/Magento/Setup/Model/Patch/PatchApplierFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchApplierFactory.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 use Magento\Framework\ObjectManagerInterface;
 
@@ -34,6 +34,6 @@ public function __construct(ObjectManagerInterface $objectManager)
      */
     public function create($arguments = [])
     {
-        return $this->objectManager->create(\Magento\Setup\Model\Patch\PatchApplier::class, $arguments);
+        return $this->objectManager->create(\Magento\Framework\Setup\Patch\PatchApplier::class, $arguments);
     }
 }
diff --git a/setup/src/Magento/Setup/Model/Patch/PatchFactory.php b/lib/internal/Magento/Framework/Setup/Patch/PatchFactory.php
similarity index 96%
rename from setup/src/Magento/Setup/Model/Patch/PatchFactory.php
rename to lib/internal/Magento/Framework/Setup/Patch/PatchFactory.php
index aec8dfbd52b..e6c4832887e 100644
--- a/setup/src/Magento/Setup/Model/Patch/PatchFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchFactory.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 use Magento\Framework\ObjectManagerInterface;
 
diff --git a/setup/src/Magento/Setup/Model/Patch/PatchHistory.php b/lib/internal/Magento/Framework/Setup/Patch/PatchHistory.php
similarity index 98%
rename from setup/src/Magento/Setup/Model/Patch/PatchHistory.php
rename to lib/internal/Magento/Framework/Setup/Patch/PatchHistory.php
index e05792eff9f..34b7c226185 100644
--- a/setup/src/Magento/Setup/Model/Patch/PatchHistory.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchHistory.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 use Magento\Framework\App\ResourceConnection;
 
diff --git a/setup/src/Magento/Setup/Model/Patch/PatchInterface.php b/lib/internal/Magento/Framework/Setup/Patch/PatchInterface.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Patch/PatchInterface.php
rename to lib/internal/Magento/Framework/Setup/Patch/PatchInterface.php
index ecf1892878d..c69f754d4b9 100644
--- a/setup/src/Magento/Setup/Model/Patch/PatchInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 /**
  * This interface describe script, that is presented by atomic operations for data and schema
diff --git a/setup/src/Magento/Setup/Model/Patch/PatchReader.php b/lib/internal/Magento/Framework/Setup/Patch/PatchReader.php
similarity index 98%
rename from setup/src/Magento/Setup/Model/Patch/PatchReader.php
rename to lib/internal/Magento/Framework/Setup/Patch/PatchReader.php
index 670828c171b..845716abcf4 100644
--- a/setup/src/Magento/Setup/Model/Patch/PatchReader.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchReader.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Config\ReaderInterface;
diff --git a/setup/src/Magento/Setup/Model/Patch/PatchRegistry.php b/lib/internal/Magento/Framework/Setup/Patch/PatchRegistry.php
similarity index 99%
rename from setup/src/Magento/Setup/Model/Patch/PatchRegistry.php
rename to lib/internal/Magento/Framework/Setup/Patch/PatchRegistry.php
index a988b2a6ec6..0d0d9abf292 100644
--- a/setup/src/Magento/Setup/Model/Patch/PatchRegistry.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchRegistry.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 /**
  * Allows to read all patches through the whole system
diff --git a/setup/src/Magento/Setup/Model/Patch/PatchRegistryFactory.php b/lib/internal/Magento/Framework/Setup/Patch/PatchRegistryFactory.php
similarity index 95%
rename from setup/src/Magento/Setup/Model/Patch/PatchRegistryFactory.php
rename to lib/internal/Magento/Framework/Setup/Patch/PatchRegistryFactory.php
index 0f00f4607ac..0d8e2422267 100644
--- a/setup/src/Magento/Setup/Model/Patch/PatchRegistryFactory.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchRegistryFactory.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 use Magento\Framework\ObjectManagerInterface;
 
diff --git a/setup/src/Magento/Setup/Model/Patch/PatchRevertableInterface.php b/lib/internal/Magento/Framework/Setup/Patch/PatchRevertableInterface.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Patch/PatchRevertableInterface.php
rename to lib/internal/Magento/Framework/Setup/Patch/PatchRevertableInterface.php
index be368e889cd..a69e0c61ad2 100644
--- a/setup/src/Magento/Setup/Model/Patch/PatchRevertableInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchRevertableInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 /**
  * Revertable means, that patch can be reverted
diff --git a/setup/src/Magento/Setup/Model/Patch/PatchVersionInterface.php b/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
similarity index 94%
rename from setup/src/Magento/Setup/Model/Patch/PatchVersionInterface.php
rename to lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
index 689bad9cf0d..9fca3ffc364 100644
--- a/setup/src/Magento/Setup/Model/Patch/PatchVersionInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 /**
  * For backward compatibility with versioned style module installation. Deprecated since creation.
diff --git a/setup/src/Magento/Setup/Model/Patch/SchemaPatchInterface.php b/lib/internal/Magento/Framework/Setup/Patch/SchemaPatchInterface.php
similarity index 89%
rename from setup/src/Magento/Setup/Model/Patch/SchemaPatchInterface.php
rename to lib/internal/Magento/Framework/Setup/Patch/SchemaPatchInterface.php
index d8845e06edd..ebc7c6f631c 100644
--- a/setup/src/Magento/Setup/Model/Patch/SchemaPatchInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/SchemaPatchInterface.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model\Patch;
+namespace Magento\Framework\Setup\Patch;
 
 /**
  * This interface describe script, that atomic operations with schema (DDL) in SQL database
diff --git a/lib/internal/Magento/Framework/Setup/SchemaPersistor.php b/lib/internal/Magento/Framework/Setup/SchemaPersistor.php
index 10a1faa2728..f3af56b8ac2 100644
--- a/lib/internal/Magento/Framework/Setup/SchemaPersistor.php
+++ b/lib/internal/Magento/Framework/Setup/SchemaPersistor.php
@@ -45,7 +45,8 @@ private function initEmptyDom()
         return new \SimpleXMLElement(
             '<schema 
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                    xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd"></schema>'
+                    xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+            </schema>'
         );
     }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Config/ConverterTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Config/ConverterTest.php
similarity index 89%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Config/ConverterTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Config/ConverterTest.php
index 37a84440975..2bb4bbcdb8d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Config/ConverterTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Config/ConverterTest.php
@@ -3,15 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Config;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Config;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Config\Converter;
+use Magento\Framework\Setup\Declaration\Schema\Config\Converter;
 
 /**
  * Test for Converter class.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Config.
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Config.
  */
 class ConverterTest extends \PHPUnit\Framework\TestCase
 {
@@ -42,7 +42,7 @@ public function testConvert()
         $dom->loadXML(
             '<?xml version="1.0"?>
             <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+                xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
                 <table name="test_table" resource="default">
                     <column xsi:type="int" name="id" nullable="false" identity="true" comment="Id"/>
                     <column xsi:type="varchar" name="data" length="100" identity="false" comment="Data"/>
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/DefinitionAggregatorTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/DefinitionAggregatorTest.php
similarity index 91%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/DefinitionAggregatorTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/DefinitionAggregatorTest.php
index f939ea93dd1..393b10d3e50 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/DefinitionAggregatorTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/DefinitionAggregatorTest.php
@@ -3,17 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\DbDefinitionProcessorInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbDefinitionProcessorInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 /**
  * Test for Definition Aggregator.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Db
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db
  */
 class DefinitionAggregatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/BlobTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BlobTest.php
similarity index 90%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/BlobTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BlobTest.php
index 0b35af1b99e..9693aceac39 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/BlobTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BlobTest.php
@@ -3,14 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Blob;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Blob;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 class BlobTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/BooleanTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BooleanTest.php
similarity index 88%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/BooleanTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BooleanTest.php
index 0cff91d6469..8e28df4f6d4 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/BooleanTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/BooleanTest.php
@@ -3,14 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Boolean as BooleanColumn;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean as BooleanColumn;
 
 class BooleanTest extends \PHPUnit\Framework\TestCase
 {
@@ -20,7 +20,7 @@ class BooleanTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean
      */
     private $boolean;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/CommentTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/CommentTest.php
similarity index 76%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/CommentTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/CommentTest.php
index 828be4860f9..1c2b3ccd978 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/CommentTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/CommentTest.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
 
 class CommentTest extends \PHPUnit\Framework\TestCase
 {
@@ -17,7 +17,7 @@ class CommentTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Comment
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment
      */
     private $comment;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/DateTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/DateTest.php
similarity index 85%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/DateTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/DateTest.php
index fb0a08a6584..2c13795af2b 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/DateTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/DateTest.php
@@ -3,14 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Date;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Boolean as BooleanColumn;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Date;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean as BooleanColumn;
 
 class DateTest extends \PHPUnit\Framework\TestCase
 {
@@ -20,7 +20,7 @@ class DateTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Date
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Date
      */
     private $date;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/IdentityTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IdentityTest.php
similarity index 75%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/IdentityTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IdentityTest.php
index 78839efeeae..7e872a73ca5 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/IdentityTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IdentityTest.php
@@ -3,15 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Identity;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Identity;
 
 /**
  * Test for Identity DTO class.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns
  */
 class IdentityTest extends \PHPUnit\Framework\TestCase
 {
@@ -21,19 +21,19 @@ class IdentityTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Comment
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment
      */
     private $identity;
 
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Dto\Column|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Setup\Declaration\Schema\Dto\Column|\PHPUnit_Framework_MockObject_MockObject
      */
     private $columnMock;
 
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
-        $this->columnMock = $this->getMockBuilder(\Magento\Setup\Model\Declaration\Schema\Dto\Column::class)
+        $this->columnMock = $this->getMockBuilder(\Magento\Framework\Setup\Declaration\Schema\Dto\Column::class)
             ->disableOriginalConstructor()
             ->setMethods(['isIdentity'])
             ->getMock();
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php
similarity index 88%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php
index a1b9b201fb5..823a587fd48 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php
@@ -3,17 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Identity;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Integer;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Unsigned;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer as IntegerColumnDto;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Identity;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Unsigned;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer as IntegerColumnDto;
 
 class IntegerTest extends \PHPUnit\Framework\TestCase
 {
@@ -23,7 +23,7 @@ class IntegerTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Integer
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer
      */
     private $integer;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/NullableTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/NullableTest.php
similarity index 87%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/NullableTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/NullableTest.php
index ffa66408c94..43dda0271ea 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/NullableTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/NullableTest.php
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Boolean as BooleanColumnDto;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean as BooleanColumnDto;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementInterface;
 
 class NullableTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdateTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdateTest.php
similarity index 82%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdateTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdateTest.php
index 8ae2b114e0f..f92795364b2 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdateTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/OnUpdateTest.php
@@ -3,14 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\OnUpdate;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Boolean;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Boolean as BooleanColumnDto;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\OnUpdate;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean as BooleanColumnDto;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp;
 
 class OnUpdateTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/RealTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/RealTest.php
similarity index 91%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/RealTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/RealTest.php
index 9e33a974d7e..348152cfae4 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/RealTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/RealTest.php
@@ -3,18 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Identity;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Integer;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Real;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Unsigned;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Real as RealColumnDto;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Boolean;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Identity;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Unsigned;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real as RealColumnDto;
 
 class RealTest extends \PHPUnit\Framework\TestCase
 {
@@ -24,7 +24,7 @@ class RealTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Real
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Real
      */
     private $real;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinaryTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinaryTest.php
similarity index 88%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinaryTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinaryTest.php
index 333cff613a4..c266acfd322 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinaryTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/StringBinaryTest.php
@@ -3,19 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\StringBinary as StringBinaryColumn;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\StringBinary;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\StringBinary as StringBinaryColumn;
 
 /**
  * Test for StringBinary class.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns
  */
 class StringBinaryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/TimestampTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/TimestampTest.php
similarity index 90%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/TimestampTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/TimestampTest.php
index 695a48e948f..7d82fb889d3 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/TimestampTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/TimestampTest.php
@@ -3,15 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\OnUpdate;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Boolean as BooleanColumn;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Comment;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Nullable;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\OnUpdate;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Boolean as BooleanColumn;
 
 class TimestampTest extends \PHPUnit\Framework\TestCase
 {
@@ -21,7 +21,7 @@ class TimestampTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Timestamp
      */
     private $timestamp;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php
similarity index 90%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php
index 18d8a56b954..298d055218c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/UnsignedTest.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Columns;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Columns;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Columns\Unsigned;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer as IntegerColumnDto;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Columns\Unsigned;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer as IntegerColumnDto;
 
 class UnsignedTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKeyTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKeyTest.php
similarity index 94%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKeyTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKeyTest.php
index 3f699922967..90bd3271228 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKeyTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/ForeignKeyTest.php
@@ -3,20 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Constraints;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Constraints;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Constraints\ForeignKey;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\ForeignKey;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Test for Foreign Key constraint definition.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Constraints
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Constraints
  */
 class ForeignKeyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/InternalTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/InternalTest.php
similarity index 91%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/InternalTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/InternalTest.php
index f9d1ed10db6..62c76715b51 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/Constraints/InternalTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Constraints/InternalTest.php
@@ -3,19 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Constraints;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Constraints;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal as InternalConstraintDto;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal as InternalConstraintDto;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 /**
  * Test for internal (primary key, unique key) constraint definition.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Constraints
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Constraints
  */
 class InternalTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/IndexTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/IndexTest.php
similarity index 94%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/IndexTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/IndexTest.php
index f5ca4ad86ce..51ee068ef30 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/MySQL/Definition/IndexTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/IndexTest.php
@@ -3,18 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\Definition\Index;
-use Magento\Setup\Model\Declaration\Schema\Dto\Index as IndexDto;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\Definition\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index as IndexDto;
 
 /**
  * Test for index (key) definition.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Db\MySQL\Definition\Constraints
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db\MySQL\Definition\Constraints
  */
 class IndexTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/SchemaBuilderTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php
similarity index 81%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/SchemaBuilderTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php
index 8465812dbaf..593f6d5b433 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/SchemaBuilderTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php
@@ -4,32 +4,32 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaReaderInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementFactory;
-use Magento\Setup\Model\Declaration\Schema\Dto\Index;
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\Sharding;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
 
 /**
  * Test for SchemaBuilder.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Db
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SchemaBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Db\SchemaBuilder
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\SchemaBuilder
      */
     private $model;
 
@@ -66,7 +66,7 @@ protected function setUp()
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $this->objectManagerHelper->getObject(
-            \Magento\Setup\Model\Declaration\Schema\Db\SchemaBuilder::class,
+            \Magento\Framework\Setup\Declaration\Schema\Db\SchemaBuilder::class,
             [
                 'elementFactory' => $this->elementFactoryMock,
                 'dbSchemaReader' => $this->dbSchemaReaderMock,
@@ -173,7 +173,7 @@ private function createTable($name)
      *
      * @param string $name
      * @param Table $table
-     * @return \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer
      */
     private function createIntegerAIColumn($name, Table $table)
     {
@@ -193,7 +193,7 @@ private function createIntegerAIColumn($name, Table $table)
      *
      * @param string $name
      * @param Table $table
-     * @return \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer
      */
     private function createIntegerColumn($name, Table $table)
     {
@@ -246,7 +246,7 @@ private function createIndex($indexName, Table $table, array $columns)
      *
      * @param string $name
      * @param Table $table
-     * @return \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp
      */
     private function createTimestampColumn($name, Table $table)
     {
@@ -266,9 +266,58 @@ private function createTimestampColumn($name, Table $table)
      * @param array $references
      * @param array $constraints
      * @param array $indexes
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testBuild(array $columns, array $references, array $constraints, array $indexes)
+    {
+        $this->prepareSchemaMocks($columns, $references, $constraints, $indexes);
+        $resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var Schema $schema */
+        $schema = $this->objectManagerHelper->getObject(
+            Schema::class,
+            ['resourceConnection' => $resourceConnectionMock]
+        );
+        $this->model->build($schema);
+    }
+
+    /**
+     * WARNING! The expected exception type may differ depending on PHPUnit version.
+     *
+     * @dataProvider dataProvider
+     * @param array $columns
+     * @param array $references
+     * @param array $constraints
+     * @param array $indexes
+     * @expectedException \Exception
+     * @expectedExceptionMessage
+     * User Warning: Column unknown_column does not exist for index/constraint FIRST_INDEX in table second_table
+     */
+    public function testBuildUnknownIndexColumn(array $columns, array $references, array $constraints, array $indexes)
+    {
+        $indexes['second_table']['FIRST_INDEX']['column'][] = 'unknown_column';
+        $this->prepareSchemaMocks($columns, $references, $constraints, $indexes);
+        $resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var Schema $schema */
+        $schema = $this->objectManagerHelper->getObject(
+            Schema::class,
+            ['resourceConnection' => $resourceConnectionMock]
+        );
+        $this->model->build($schema);
+    }
+
+    /**
+     * Prepare mocks for test.
+     *
+     * @param array $columns
+     * @param array $references
+     * @param array $constraints
+     * @param array $indexes
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    private function prepareSchemaMocks(array $columns, array $references, array $constraints, array $indexes)
     {
         $withContext = [['first_table', 'default'], ['second_table', 'default']];
         $this->shardingMock->expects(self::once())
@@ -278,26 +327,26 @@ public function testBuild(array $columns, array $references, array $constraints,
             ->method('readTables')
             ->with('default')
             ->willReturn(['first_table', 'second_table']);
-        $this->dbSchemaReaderMock->expects(self::exactly(2))
+        $this->dbSchemaReaderMock->expects($this->any())
             ->method('getTableOptions')
             ->withConsecutive(...array_values($withContext))
             ->willReturnOnConsecutiveCalls(
                 ['Engine' => 'innodb', 'Comment' => ''],
                 ['Engine' => 'innodb', 'Comment' => 'Not null comment']
             );
-        $this->dbSchemaReaderMock->expects(self::exactly(2))
+        $this->dbSchemaReaderMock->expects($this->any())
             ->method('readColumns')
             ->withConsecutive(...array_values($withContext))
             ->willReturnOnConsecutiveCalls($columns['first_table'], $columns['second_table']);
-        $this->dbSchemaReaderMock->expects(self::exactly(2))
+        $this->dbSchemaReaderMock->expects($this->any())
             ->method('readIndexes')
             ->withConsecutive(...array_values($withContext))
             ->willReturnOnConsecutiveCalls([], $indexes['second_table']);
-        $this->dbSchemaReaderMock->expects(self::exactly(2))
+        $this->dbSchemaReaderMock->expects($this->any())
             ->method('readConstraints')
             ->withConsecutive(...array_values($withContext))
             ->willReturnOnConsecutiveCalls($constraints['first_table'], []);
-        $this->dbSchemaReaderMock->expects(self::exactly(2))
+        $this->dbSchemaReaderMock->expects($this->any())
             ->method('readReferences')
             ->withConsecutive(...array_values($withContext))
             ->willReturnOnConsecutiveCalls($references['first_table'], []);
@@ -322,7 +371,7 @@ public function testBuild(array $columns, array $references, array $constraints,
         );
         $table->addColumns([$firstColumn, $foreignColumn, $timestampColumn]);
         $table->addConstraints([$foreignKey, $primaryKey]);
-        $this->elementFactoryMock->expects(self::exactly(9))
+        $this->elementFactoryMock->expects($this->any())
             ->method('create')
             ->withConsecutive(
                 [
@@ -426,14 +475,5 @@ public function testBuild(array $columns, array $references, array $constraints,
                 $index,
                 $foreignKey
             );
-        $resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        /** @var Schema $schema */
-        $schema = $this->objectManagerHelper->getObject(
-            Schema::class,
-            ['resourceConnection' => $resourceConnectionMock]
-        );
-        $this->model->build($schema);
     }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/StatementAggregatorTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/StatementAggregatorTest.php
similarity index 93%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/StatementAggregatorTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/StatementAggregatorTest.php
index f91c0dd1523..904b1791bc0 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Db/StatementAggregatorTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/StatementAggregatorTest.php
@@ -4,22 +4,22 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Db;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Setup\Model\Declaration\Schema\Db\ReferenceStatement;
-use Magento\Setup\Model\Declaration\Schema\Db\Statement;
-use Magento\Setup\Model\Declaration\Schema\Db\StatementAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Db\ReferenceStatement;
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregator;
 
 /**
  * Test for StatementAggregator.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Db
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Db
  */
 class StatementAggregatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Db\StatementAggregator
+     * @var \Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregator
      */
     private $model;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Declaration/SchemaBuilderTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Declaration/SchemaBuilderTest.php
similarity index 92%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Declaration/SchemaBuilderTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Declaration/SchemaBuilderTest.php
index c7795ce6dda..523784ccb4f 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Declaration/SchemaBuilderTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Declaration/SchemaBuilderTest.php
@@ -4,33 +4,33 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Declaration;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Declaration;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Stdlib\BooleanUtils;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Setup\Model\Declaration\Schema\Declaration\ValidationComposite;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Internal;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementFactory;
-use Magento\Setup\Model\Declaration\Schema\Dto\Index;
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\Sharding;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationComposite;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Internal;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
 
 /**
  * Test for SchemaBuilder.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Declaration
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Declaration
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SchemaBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Declaration\SchemaBuilder
+     * @var \Magento\Framework\Setup\Declaration\Schema\Declaration\SchemaBuilder
      */
     private $model;
 
@@ -84,7 +84,7 @@ protected function setUp()
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $this->objectManagerHelper->getObject(
-            \Magento\Setup\Model\Declaration\Schema\Declaration\SchemaBuilder::class,
+            \Magento\Framework\Setup\Declaration\Schema\Declaration\SchemaBuilder::class,
             [
                 'elementFactory' => $this->elementFactoryMock,
                 'booleanUtils' => new BooleanUtils(),
@@ -201,7 +201,7 @@ private function createTable($name)
      *
      * @param string $name
      * @param Table $table
-     * @return \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer
      */
     private function createIntegerAIColumn($name, Table $table)
     {
@@ -221,7 +221,7 @@ private function createIntegerAIColumn($name, Table $table)
      *
      * @param string $name
      * @param Table $table
-     * @return \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer
      */
     private function createIntegerColumn($name, Table $table)
     {
@@ -274,7 +274,7 @@ private function createIndex($indexName, Table $table, array $columns)
      *
      * @param string $name
      * @param Table $table
-     * @return \Magento\Setup\Model\Declaration\Schema\Dto\Columns\Timestamp
+     * @return \Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Timestamp
      */
     private function createTimestampColumn($name, Table $table)
     {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Diff/DiffManagerTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Diff/DiffManagerTest.php
similarity index 88%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Diff/DiffManagerTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Diff/DiffManagerTest.php
index 4e791f70916..b88ad608c89 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Diff/DiffManagerTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Diff/DiffManagerTest.php
@@ -4,19 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Diff;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Diff;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Setup\Model\Declaration\Schema\Diff\Diff;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
-use Magento\Setup\Model\Declaration\Schema\Dto\Index;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Diff\Diff;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 class DiffManagerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Diff\DiffManager
+     * @var \Magento\Framework\Setup\Declaration\Schema\Diff\DiffManager
      */
     private $model;
 
@@ -26,18 +26,18 @@ class DiffManagerTest extends \PHPUnit\Framework\TestCase
     private $objectManagerHelper;
 
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\Comparator|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Setup\Declaration\Schema\Comparator|\PHPUnit_Framework_MockObject_MockObject
      */
     private $comparatorMock;
 
     protected function setUp()
     {
-        $this->comparatorMock = $this->getMockBuilder(\Magento\Setup\Model\Declaration\Schema\Comparator::class)
+        $this->comparatorMock = $this->getMockBuilder(\Magento\Framework\Setup\Declaration\Schema\Comparator::class)
             ->getMockForAbstractClass();
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $this->objectManagerHelper->getObject(
-            \Magento\Setup\Model\Declaration\Schema\Diff\DiffManager::class,
+            \Magento\Framework\Setup\Declaration\Schema\Diff\DiffManager::class,
             [
                 'comparator' => $this->comparatorMock
             ]
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Dto/Factories/TableTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Dto/Factories/TableTest.php
similarity index 89%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Dto/Factories/TableTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Dto/Factories/TableTest.php
index cda2dafd395..9562d38d74c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Dto/Factories/TableTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Dto/Factories/TableTest.php
@@ -3,14 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Dto\Factories;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Dto\Factories;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 class TableTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Setup\Model\Declaration\Schema\Dto\Factories\Table */
+    /** @var \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table */
     protected $model;
 
     /** @var ObjectManagerHelper */
@@ -33,7 +33,7 @@ protected function setUp()
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $this->objectManagerHelper->getObject(
-            \Magento\Setup\Model\Declaration\Schema\Dto\Factories\Table::class,
+            \Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table::class,
             [
                 'objectManager' => $this->objectManagerMock,
                 'resourceConnection' => $this->resourceConnectionMock
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Operations/AddColumnTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Operations/AddColumnTest.php
similarity index 85%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Operations/AddColumnTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Operations/AddColumnTest.php
index a6c3ebc399f..38e16152c41 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/Operations/AddColumnTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Operations/AddColumnTest.php
@@ -4,28 +4,28 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\Operations;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\Operations;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\DefinitionAggregator;
-use Magento\Setup\Model\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataFrom;
-use Magento\Setup\Model\Declaration\Schema\Db\Statement;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementFactory;
-use Magento\Setup\Model\Declaration\Schema\Dto\Index;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\ElementHistoryFactory;
-use Magento\Setup\Model\Declaration\Schema\Operations\AddColumn;
-use Magento\Setup\Model\Declaration\Schema\Operations\AddComplexElement;
-use Magento\Setup\Model\Declaration\Schema\Operations\DropElement;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DefinitionAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DDL\Triggers\MigrateDataFrom;
+use Magento\Framework\Setup\Declaration\Schema\Db\Statement;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Index;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistoryFactory;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddColumn;
+use Magento\Framework\Setup\Declaration\Schema\Operations\AddComplexElement;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropElement;
 
 /**
  * Test for AddColumn.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\Operations
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema\Operations
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/OperationsExecutorTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/OperationsExecutorTest.php
similarity index 84%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/OperationsExecutorTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/OperationsExecutorTest.php
index 101cc805fbd..50fff290da1 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/OperationsExecutorTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/OperationsExecutorTest.php
@@ -4,34 +4,34 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaWriterInterface;
-use Magento\Setup\Model\Declaration\Schema\Db\StatementAggregator;
-use Magento\Setup\Model\Declaration\Schema\Db\StatementAggregatorFactory;
-use Magento\Setup\Model\Declaration\Schema\Db\StatementFactory;
-use Magento\Setup\Model\Declaration\Schema\Diff\DiffInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Integer;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
-use Magento\Setup\Model\Declaration\Schema\ElementHistory;
-use Magento\Setup\Model\Declaration\Schema\Operations\CreateTable;
-use Magento\Setup\Model\Declaration\Schema\Operations\DropElement;
-use Magento\Setup\Model\Declaration\Schema\Sharding;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregator;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementAggregatorFactory;
+use Magento\Framework\Setup\Declaration\Schema\Db\StatementFactory;
+use Magento\Framework\Setup\Declaration\Schema\Diff\DiffInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Integer;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\ElementHistory;
+use Magento\Framework\Setup\Declaration\Schema\Operations\CreateTable;
+use Magento\Framework\Setup\Declaration\Schema\Operations\DropElement;
+use Magento\Framework\Setup\Declaration\Schema\Sharding;
 
 /**
  * Test for OperationsExecutor.
  *
- * @package Magento\Setup\Test\Unit\Model\Declaration\Schema
+ * @package Magento\Framework\Setup\Test\Unit\Declaration\Schema
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class OperationsExecutorTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Setup\Model\Declaration\Schema\OperationsExecutor
+     * @var \Magento\Framework\Setup\Declaration\Schema\OperationsExecutor
      */
     private $model;
 
@@ -102,7 +102,7 @@ protected function setUp()
             ->getMock();
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $this->objectManagerHelper->getObject(
-            \Magento\Setup\Model\Declaration\Schema\OperationsExecutor::class,
+            \Magento\Framework\Setup\Declaration\Schema\OperationsExecutor::class,
             [
                 'operations' => [
                     'create_table' => $this->createTableOperation,
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ShardingTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ShardingTest.php
similarity index 88%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ShardingTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ShardingTest.php
index 09ea145d458..4a73816ba89 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ShardingTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ShardingTest.php
@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema;
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ShardingTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Setup\Model\Declaration\Schema\Sharding */
+    /** @var \Magento\Framework\Setup\Declaration\Schema\Sharding */
     private $model;
 
     /** @var ObjectManagerHelper */
@@ -28,7 +28,7 @@ protected function setUp()
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $this->objectManagerHelper->getObject(
-            \Magento\Setup\Model\Declaration\Schema\Sharding::class,
+            \Magento\Framework\Setup\Declaration\Schema\Sharding::class,
             [
                 'deploymentConfig' => $this->deploymentConfigMock,
                 'resources' => ['default', 'checkout', 'sales']
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php
similarity index 82%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php
index 77a4d93d7ff..573fc483a19 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/CheckReferenceColumnHasIndexTest.php
@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\ValidationRules;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\ValidationRules;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Real;
-use Magento\Setup\Model\Declaration\Schema\Dto\Constraints\Reference;
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 class CheckReferenceColumnHasIndexTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ValidationRules/RealTypesTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/RealTypesTest.php
similarity index 82%
rename from setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ValidationRules/RealTypesTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/RealTypesTest.php
index 90df6f0d03d..573cacae322 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/ValidationRules/RealTypesTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/RealTypesTest.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\ValidationRules;
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\ValidationRules;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules\RealTypes;
-use Magento\Setup\Model\Declaration\Schema\Dto\Columns\Real;
-use Magento\Setup\Model\Declaration\Schema\Dto\Schema;
-use Magento\Setup\Model\Declaration\Schema\Dto\Table;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\RealTypes;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
 
 class RealTypesTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/ValidationRulesTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/ValidationRulesTest.php
new file mode 100644
index 00000000000..d1ae5e7c912
--- /dev/null
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/ValidationRulesTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\ValidationRules;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Columns\Real;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Constraints\Reference;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Table;
+
+/**
+ * Class ValidationRulesTest
+ * @package Magento\Setup\Test\Unit\Model\Declaration\Schema\ValidationRules
+ */
+class ValidationRulesTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var CheckReferenceColumnHasIndex */
+    private $model;
+
+    /** @var ObjectManagerHelper */
+    private $objectManagerHelper;
+
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            CheckReferenceColumnHasIndex::class,
+            [
+            ]
+        );
+    }
+
+    public function testValidate()
+    {
+        $table = new Table('name', 'name', 'table', 'default', 'innodb');
+        $refTable = new Table(
+            'ref_table',
+            'name',
+            'table',
+            'default',
+            'innodb'
+        );
+
+        $column = new Real('decimal', 'decimal', $table, 10, 5);
+        $refColumn = new Real('ref_decimal', 'decimal', $refTable, 10, 5);
+        $reference = new Reference(
+            'ref',
+            'foreign',
+            $table,
+            $column,
+            $refTable,
+            $refColumn,
+            'CASCADE'
+        );
+
+        $table->addColumns([$column]);
+        $refTable->addColumns([$refColumn]);
+        $table->addConstraints([$reference]);
+        /** @var Schema|\PHPUnit_Framework_MockObject_MockObject $schemaMock */
+        $schemaMock = $this->getMockBuilder(Schema::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaMock->expects(self::once())
+            ->method('getTables')
+            ->willReturn([$table]);
+        self::assertEquals(
+            [
+                [
+                        'column' => 'ref_decimal',
+                        'message' => 'Reference column ref_decimal in reference table ref_table do not have index',
+                ],
+            ],
+            $this->model->validate($schemaMock)
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/ListsTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/ListsTest.php
index 6e7ca3ece43..a25771b4519 100644
--- a/lib/internal/Magento/Framework/Setup/Test/Unit/ListsTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/ListsTest.php
@@ -58,6 +58,9 @@ protected function setUp()
         $this->mockConfig->expects($this->any())
             ->method('getAllowedLocales')
             ->willReturn($this->expectedLocales);
+        $this->mockConfig->expects($this->any())
+            ->method('getAllowedCurrencies')
+            ->willReturn($this->expectedCurrencies);
 
         $this->lists = new Lists($this->mockConfig);
     }
@@ -73,4 +76,13 @@ public function testGetLocaleList()
         $locales = array_intersect($this->expectedLocales, array_keys($this->lists->getLocaleList()));
         $this->assertEquals($this->expectedLocales, $locales);
     }
+
+    /**
+     * Test Lists:getCurrencyList() considering allowed currencies config values.
+     */
+    public function testGetCurrencyList()
+    {
+        $currencies = array_intersect($this->expectedCurrencies, array_keys($this->lists->getCurrencyList()));
+        $this->assertEquals($this->expectedCurrencies, $currencies);
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchApplierTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
similarity index 97%
rename from setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchApplierTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
index e7b59713750..76d40a983de 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchApplierTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Patch;
+namespace Magento\Framework\Setup\Test\Unit\Patch;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
@@ -13,16 +13,16 @@
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Patch\PatchApplier;
-use Magento\Setup\Model\Patch\PatchFactory;
-use Magento\Setup\Model\Patch\PatchHistory;
-use Magento\Setup\Model\Patch\PatchReader;
-use Magento\Setup\Model\Patch\PatchRegistry;
-use Magento\Setup\Model\Patch\PatchRegistryFactory;
+use Magento\Framework\Setup\Patch\PatchApplier;
+use Magento\Framework\Setup\Patch\PatchFactory;
+use Magento\Framework\Setup\Patch\PatchHistory;
+use Magento\Framework\Setup\Patch\PatchReader;
+use Magento\Framework\Setup\Patch\PatchRegistry;
+use Magento\Framework\Setup\Patch\PatchRegistryFactory;
 
 /**
  * Class PatchApplierTest
- * @package Magento\Setup\Test\Unit\Model\Patch
+ * @package Magento\Framework\Setup\Test\Unit\Patch
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PatchApplierTest extends \PHPUnit\Framework\TestCase
@@ -259,7 +259,7 @@ public function applyDataPatchDataInstalledModuleProvider()
      * @param $dataPatches
      * @param $moduleVersionInDb
      *
-     * @expectedException \Magento\Setup\Exception
+     * @expectedException \Magento\Framework\Setup\Exception
      * @expectedExceptionMessage Patch Apply Error
      *
      * @dataProvider applyDataPatchDataInstalledModuleProvider()
@@ -308,7 +308,7 @@ public function testApplyDataPatchRollback($moduleName, $dataPatches, $moduleVer
     }
 
     /**
-     * @expectedException \Magento\Setup\Exception
+     * @expectedException \Magento\Framework\Setup\Exception
      * @expectedExceptionMessageRegExp "Patch [a-zA-Z0-9\_]+ should implement DataPatchInterface"
      */
     public function testNonDataPatchApply()
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchFactoryTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchFactoryTest.php
similarity index 83%
rename from setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchFactoryTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchFactoryTest.php
index 2b6b26d3071..b9f45d09a3b 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchFactoryTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchFactoryTest.php
@@ -4,19 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Patch;
+namespace Magento\Framework\Setup\Test\Unit\Patch;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Patch\PatchFactory;
-use Magento\Setup\Model\Patch\PatchHistory;
-use Magento\Setup\Model\Patch\PatchInterface;
+use Magento\Framework\Setup\Patch\PatchFactory;
+use Magento\Framework\Setup\Patch\PatchHistory;
+use Magento\Framework\Setup\Patch\PatchInterface;
 
 /**
  * Class PatchFactoryTest
- * @package Magento\Setup\Test\Unit\Model\Patch
+ * @package Magento\Framework\Setup\Test\Unit\Patch
  */
 class PatchFactoryTest extends \PHPUnit\Framework\TestCase
 {
@@ -44,7 +44,7 @@ protected function setUp()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage stdClass should implement Magento\Setup\Model\Patch\PatchInterface interface
+     * @expectedExceptionMessage stdClass should implement Magento\Framework\Setup\Patch\PatchInterface interface
      */
     public function testCreateNonPatchInterface()
     {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchHistoryTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchHistoryTest.php
similarity index 94%
rename from setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchHistoryTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchHistoryTest.php
index 09189096817..5d9631fe27f 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchHistoryTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchHistoryTest.php
@@ -4,17 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Patch;
+namespace Magento\Framework\Setup\Test\Unit\Patch;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Patch\PatchHistory;
-use Magento\Setup\Model\Patch\PatchInterface;
+use Magento\Framework\Setup\Patch\PatchHistory;
+use Magento\Framework\Setup\Patch\PatchInterface;
 
 /**
  * Class PatchHistoryTest
- * @package Magento\Setup\Test\Unit\Model\Patch
+ * @package Magento\Framework\Setup\Test\Unit\Patch
  */
 class PatchHistoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchRegirtryTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchRegirtryTest.php
similarity index 91%
rename from setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchRegirtryTest.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchRegirtryTest.php
index 7957f9a1922..25c4c4730e7 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Patch/PatchRegirtryTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchRegirtryTest.php
@@ -4,16 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Test\Unit\Model\Patch;
+namespace Magento\Framework\Setup\Test\Unit\Patch;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Setup\Model\Patch\PatchFactory;
-use Magento\Setup\Model\Patch\PatchHistory;
-use Magento\Setup\Model\Patch\PatchRegistry;
+use Magento\Framework\Setup\Patch\PatchFactory;
+use Magento\Framework\Setup\Patch\PatchHistory;
+use Magento\Framework\Setup\Patch\PatchRegistry;
 
 /**
  * Class PatchRegirtryTest
- * @package Magento\Setup\Test\Unit\Model\Patch
+ * @package Magento\Framework\Setup\Test\Unit\Patch
  */
 class PatchRegirtryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/_files/data_patch_classes.php b/lib/internal/Magento/Framework/Setup/Test/Unit/_files/data_patch_classes.php
similarity index 80%
rename from setup/src/Magento/Setup/Test/Unit/Model/_files/data_patch_classes.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/_files/data_patch_classes.php
index e334400ce92..b259f55b944 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/_files/data_patch_classes.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/_files/data_patch_classes.php
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile - as of namespace absence
 
-class OtherDataPatch implements \Magento\Setup\Model\Patch\DataPatchInterface
+class OtherDataPatch implements \Magento\Framework\Setup\Patch\DataPatchInterface
 {
     /**
      * {@inheritdoc}
@@ -33,8 +33,8 @@ public function apply()
 }
 
 class SomeDataPatch implements
-    \Magento\Setup\Model\Patch\DataPatchInterface,
-    \Magento\Setup\Model\Patch\PatchVersionInterface
+    \Magento\Framework\Setup\Patch\DataPatchInterface,
+    \Magento\Framework\Setup\Patch\PatchVersionInterface
 {
     /**
      * {@inheritdoc}
@@ -72,8 +72,8 @@ public static function getVersion()
 }
 
 class NonTransactionableDataPatch implements
-    \Magento\Setup\Model\Patch\DataPatchInterface,
-    \Magento\Setup\Model\Patch\NonTransactionableInterface
+    \Magento\Framework\Setup\Patch\DataPatchInterface,
+    \Magento\Framework\Setup\Patch\NonTransactionableInterface
 {
 
     /**
@@ -101,8 +101,8 @@ public function apply()
 }
 
 class RevertableDataPatch implements
-    \Magento\Setup\Model\Patch\DataPatchInterface,
-    \Magento\Setup\Model\Patch\PatchRevertableInterface
+    \Magento\Framework\Setup\Patch\DataPatchInterface,
+    \Magento\Framework\Setup\Patch\PatchRevertableInterface
 {
     /**
      * {@inheritdoc}
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/_files/schema_patch_classes.php b/lib/internal/Magento/Framework/Setup/Test/Unit/_files/schema_patch_classes.php
similarity index 82%
rename from setup/src/Magento/Setup/Test/Unit/Model/_files/schema_patch_classes.php
rename to lib/internal/Magento/Framework/Setup/Test/Unit/_files/schema_patch_classes.php
index 9245380dbfd..0f44d7a1334 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/_files/schema_patch_classes.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/_files/schema_patch_classes.php
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile - as of namespace absence
 
-class OtherSchemaPatch implements \Magento\Setup\Model\Patch\SchemaPatchInterface
+class OtherSchemaPatch implements \Magento\Framework\Setup\Patch\SchemaPatchInterface
 {
     /**
      * {@inheritdoc}
@@ -33,8 +33,8 @@ public function apply()
 }
 
 class SomeSchemaPatch implements
-    \Magento\Setup\Model\Patch\SchemaPatchInterface,
-    \Magento\Setup\Model\Patch\PatchVersionInterface
+    \Magento\Framework\Setup\Patch\SchemaPatchInterface,
+    \Magento\Framework\Setup\Patch\PatchVersionInterface
 {
     /**
      * {@inheritdoc}
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link.php b/lib/internal/Magento/Framework/View/Element/Html/Link.php
index 71b73918120..6c5761f8cea 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link.php
@@ -11,6 +11,8 @@
  * @method string getLabel()
  * @method string getPath()
  * @method string getTitle()
+ *
+ * @api
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
index 86866f0b001..e136e8c0f73 100644
--- a/lib/web/mage/adminhtml/form.js
+++ b/lib/web/mage/adminhtml/form.js
@@ -386,7 +386,7 @@ define([
          * @param {Object} config
          */
         initialize: function (elementsMap, config) {
-            var idTo, idFrom;
+            var idTo, idFrom, values, fromId, radioFrom;
 
             if (config) {
                 this._config = config;
@@ -400,10 +400,21 @@ define([
                             'change',
                             this.trackChange.bindAsEventListener(this, idTo, elementsMap[idTo])
                         );
-                        this.trackChange(null, idTo, elementsMap[idTo]);
                     } else {
-                        this.trackChange(null, idTo, elementsMap[idTo]);
+                        // Check if radio button
+                        values = elementsMap[idTo][idFrom].values;
+                        fromId = $(idFrom + values[0]);
+                        radioFrom = fromId ? $$('[name="' + fromId.name + '"]') : false;
+
+                        if (radioFrom) {
+                            radioFrom.invoke(
+                                'on',
+                                'change',
+                                this.trackChange.bindAsEventListener(this, idTo, elementsMap[idTo])
+                            );
+                        }
                     }
+                    this.trackChange(null, idTo, elementsMap[idTo]);
                 }
             }
         },
@@ -428,7 +439,7 @@ define([
             // define whether the target should show up
             var shouldShowUp = true,
                 idFrom, from, values, isInArray, isNegative, headElement, isInheritCheckboxChecked, target, inputs,
-                isAnInputOrSelect, currentConfig,rowElement;
+                isAnInputOrSelect, currentConfig, rowElement, fromId, radioFrom;
 
             for (idFrom in valuesFrom) { //eslint-disable-line guard-for-in
                 from = $(idFrom);
@@ -441,6 +452,20 @@ define([
                     if (!from || isInArray && isNegative || !isInArray && !isNegative) {
                         shouldShowUp = false;
                     }
+                // Check if radio button
+                } else {
+                    values = valuesFrom[idFrom].values;
+                    fromId = $(idFrom + values[0]);
+
+                    if (fromId) {
+                        radioFrom = $$('[name="' + fromId.name + '"]:checked');
+                        isInArray = radioFrom.length > 0 && values.indexOf(radioFrom[0].value) !== -1;
+                        isNegative = valuesFrom[idFrom].negative;
+
+                        if (!radioFrom || isInArray && isNegative || !isInArray && !isNegative) {
+                            shouldShowUp = false;
+                        }
+                    }
                 }
             }
 
diff --git a/lib/web/mage/menu.js b/lib/web/mage/menu.js
index 834981402f6..86d98181724 100644
--- a/lib/web/mage/menu.js
+++ b/lib/web/mage/menu.js
@@ -629,6 +629,9 @@ define([
                     return;
                 }
 
+                // remove the active state class from the siblings
+                this.active.siblings().children('.ui-state-active').removeClass('ui-state-active');
+
                 this._open(newItem.parent());
 
                 // Delay so Firefox will not hide activedescendant change in expanding submenu from AT
diff --git a/setup/config/di.config.php b/setup/config/di.config.php
index 77a1ea7cdbf..97d5b46c8f9 100644
--- a/setup/config/di.config.php
+++ b/setup/config/di.config.php
@@ -56,7 +56,7 @@
                 \Magento\Framework\Component\ComponentRegistrarInterface::class =>
                     \Magento\Framework\Component\ComponentRegistrar::class,
             ],
-            \Magento\Setup\Model\Declaration\Schema\SchemaConfig::class => [
+            \Magento\Framework\Setup\Declaration\Schema\SchemaConfig::class => [
                 'parameters' => [
                     'connectionScopes' => [
                         'default',
diff --git a/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php b/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
index 4217c9ea5c6..6a4231259a1 100644
--- a/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
@@ -127,7 +127,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $logger = $this->consoleLoggerFactory->getLogger($output, $verbose);
         if (!$refreshOnly) {
-            $logger->alert(PHP_EOL . "Deploy using {$options[Options::STRATEGY]} strategy");
+            $logger->notice(PHP_EOL . "Deploy using {$options[Options::STRATEGY]} strategy");
         }
 
         $this->mockCache();
@@ -140,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $deployService->deploy($options);
 
         if (!$refreshOnly) {
-            $logger->alert(PHP_EOL . "Execution time: " . (microtime(true) - $time));
+            $logger->notice(PHP_EOL . "Execution time: " . (microtime(true) - $time));
         }
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
diff --git a/setup/src/Magento/Setup/Console/Command/InstallCommand.php b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
index 889557a380e..65eb047a5c7 100644
--- a/setup/src/Magento/Setup/Console/Command/InstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
@@ -6,14 +6,16 @@
 namespace Magento\Setup\Console\Command;
 
 use Magento\Deploy\Console\Command\App\ConfigImportCommand;
-use Symfony\Component\Console\Input\ArrayInput;
-use Magento\Setup\Model\Declaration\Schema\Request;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
+use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
+use Magento\Framework\Setup\Declaration\Schema\Request;
+use Magento\Setup\Model\ConfigModel;
 use Magento\Setup\Model\InstallerFactory;
 use Magento\Framework\Setup\ConsoleLogger;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Magento\Setup\Model\ConfigModel;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Helper\QuestionHelper;
@@ -46,6 +48,7 @@ class InstallCommand extends AbstractSetupCommand
     const INPUT_KEY_ENABLE_MODULES = 'enable_modules';
 
     /**
+     * List of comma-separated module names. That must be avoided during installation.
      * List of comma-separated module names. That must be avoided during installation.
      * Avaiable magic param all.
      */
@@ -186,17 +189,24 @@ protected function configure()
                 'Interactive Magento instalation'
             ),
             new InputOption(
-                self::INPUT_KEY_SAFE_INSTALLER_MODE,
+                OperationsExecutor::KEY_SAFE_MODE,
                 null,
-                InputOption::VALUE_NONE,
+                InputOption::VALUE_OPTIONAL,
                 'Safe installation of Magento with dumps on destructive operations, like column removal'
             ),
             new InputOption(
-                self::INPUT_KEY_DATA_RESTORE,
+                OperationsExecutor::KEY_DATA_RESTORE,
                 null,
-                InputOption::VALUE_NONE,
+                InputOption::VALUE_OPTIONAL,
                 'Restore removed data from dumps'
             ),
+            new InputOption(
+                DryRunLogger::INPUT_KEY_DRY_RUN_MODE,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Magento Installation will be run in dry-run mode',
+                false
+            ),
         ]);
         $this->setName('setup:install')
             ->setDescription('Installs the Magento application')
diff --git a/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php
index 74ec0dd41e8..c7fe8b5653b 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleUninstallCommand.php
@@ -18,7 +18,7 @@
 use Magento\Setup\Model\ModuleRegistryUninstaller;
 use Magento\Setup\Model\ModuleUninstaller;
 use Magento\Setup\Model\ObjectManagerProvider;
-use Magento\Setup\Model\Patch\PatchApplier;
+use Magento\Framework\Setup\Patch\PatchApplier;
 use Magento\Setup\Model\UninstallCollector;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index 07592f24205..bd7be01a0b2 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -10,6 +10,8 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Setup\ConsoleLogger;
+use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
+use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
 use Magento\Setup\Model\InstallerFactory;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
@@ -83,17 +85,24 @@ protected function configure()
                 false
             ),
             new InputOption(
-                InstallCommand::INPUT_KEY_SAFE_INSTALLER_MODE,
+                OperationsExecutor::KEY_SAFE_MODE,
                 null,
-                InputOption::VALUE_NONE,
+                InputOption::VALUE_OPTIONAL,
                 'Safe installation of Magento with dumps on destructive operations, like column removal'
             ),
             new InputOption(
-                InstallCommand::INPUT_KEY_DATA_RESTORE,
+                OperationsExecutor::KEY_DATA_RESTORE,
                 null,
-                InputOption::VALUE_NONE,
+                InputOption::VALUE_OPTIONAL,
                 'Restore removed data from dumps'
             ),
+            new InputOption(
+                DryRunLogger::INPUT_KEY_DRY_RUN_MODE,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Magento Installation will be run in dry-run mode',
+                false
+            ),
         ];
         $this->setName('setup:upgrade')
             ->setDescription('Upgrades the Magento application, DB data, and schema')
@@ -112,7 +121,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $installer = $this->installerFactory->create(new ConsoleLogger($output));
             $installer->updateModulesSequence($keepGenerated);
             $installer->installSchema($request);
-            $installer->installDataFixtures();
+            $installer->installDataFixtures($request);
 
             if ($this->deploymentConfig->isAvailable()) {
                 $importConfigCommand = $this->getApplication()->find(ConfigImportCommand::COMMAND_NAME);
diff --git a/setup/src/Magento/Setup/Model/ConfigGenerator.php b/setup/src/Magento/Setup/Model/ConfigGenerator.php
index 00ed16db74d..7e5b0c162a3 100644
--- a/setup/src/Magento/Setup/Model/ConfigGenerator.php
+++ b/setup/src/Magento/Setup/Model/ConfigGenerator.php
@@ -6,13 +6,14 @@
 
 namespace Magento\Setup\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\Data\ConfigDataFactory;
 use Magento\Framework\Config\File\ConfigFilePool;
-use Magento\Framework\Math\Random;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\App\State;
-use Magento\Framework\App\ObjectManagerFactory;
+use Magento\Framework\Math\Random;
 
 /**
  * Creates deployment config data based on user input array
@@ -26,39 +27,58 @@ class ConfigGenerator
      * @var array
      */
     private static $paramMap = [
-        ConfigOptionsListConstants::INPUT_KEY_DB_HOST => ConfigOptionsListConstants::KEY_HOST,
-        ConfigOptionsListConstants::INPUT_KEY_DB_NAME => ConfigOptionsListConstants::KEY_NAME,
-        ConfigOptionsListConstants::INPUT_KEY_DB_USER => ConfigOptionsListConstants::KEY_USER,
-        ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => ConfigOptionsListConstants::KEY_PASSWORD,
-        ConfigOptionsListConstants::INPUT_KEY_DB_PREFIX => ConfigOptionsListConstants::KEY_PREFIX,
-        ConfigOptionsListConstants::INPUT_KEY_DB_MODEL => ConfigOptionsListConstants::KEY_MODEL,
-        ConfigOptionsListConstants::INPUT_KEY_DB_ENGINE => ConfigOptionsListConstants::KEY_ENGINE,
+        ConfigOptionsListConstants::INPUT_KEY_DB_HOST            => ConfigOptionsListConstants::KEY_HOST,
+        ConfigOptionsListConstants::INPUT_KEY_DB_NAME            => ConfigOptionsListConstants::KEY_NAME,
+        ConfigOptionsListConstants::INPUT_KEY_DB_USER            => ConfigOptionsListConstants::KEY_USER,
+        ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD        => ConfigOptionsListConstants::KEY_PASSWORD,
+        ConfigOptionsListConstants::INPUT_KEY_DB_PREFIX          => ConfigOptionsListConstants::KEY_PREFIX,
+        ConfigOptionsListConstants::INPUT_KEY_DB_MODEL           => ConfigOptionsListConstants::KEY_MODEL,
+        ConfigOptionsListConstants::INPUT_KEY_DB_ENGINE          => ConfigOptionsListConstants::KEY_ENGINE,
         ConfigOptionsListConstants::INPUT_KEY_DB_INIT_STATEMENTS => ConfigOptionsListConstants::KEY_INIT_STATEMENTS,
-        ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => ConfigOptionsListConstants::KEY_ENCRYPTION_KEY,
-        ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE => ConfigOptionsListConstants::KEY_SAVE,
-        ConfigOptionsListConstants::INPUT_KEY_RESOURCE => ConfigOptionsListConstants::KEY_RESOURCE,
+        ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY     => ConfigOptionsListConstants::KEY_ENCRYPTION_KEY,
+        ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE       => ConfigOptionsListConstants::KEY_SAVE,
+        ConfigOptionsListConstants::INPUT_KEY_RESOURCE           => ConfigOptionsListConstants::KEY_RESOURCE,
     ];
 
+    /**
+     * @var DeploymentConfig
+     */
+    protected $deploymentConfig;
+
     /**
      * @var Random
+     * @deprecated 100.2.0
      */
     protected $random;
 
     /**
-     * @var DeploymentConfig
+     * @var ConfigDataFactory
      */
-    protected $deploymentConfig;
+    private $configDataFactory;
+
+    /**
+     * @var CryptKeyGeneratorInterface
+     */
+    private $cryptKeyGenerator;
 
     /**
      * Constructor
      *
-     * @param Random $random
+     * @param Random $random Deprecated since 100.2.0
      * @param DeploymentConfig $deploymentConfig
+     * @param ConfigDataFactory|null $configDataFactory
+     * @param CryptKeyGeneratorInterface|null $cryptKeyGenerator
      */
-    public function __construct(Random $random, DeploymentConfig $deploymentConfig)
-    {
+    public function __construct(
+        Random $random,
+        DeploymentConfig $deploymentConfig,
+        ConfigDataFactory $configDataFactory = null,
+        CryptKeyGeneratorInterface $cryptKeyGenerator = null
+    ) {
         $this->random = $random;
         $this->deploymentConfig = $deploymentConfig;
+        $this->configDataFactory = $configDataFactory ?? ObjectManager::getInstance()->get(ConfigDataFactory::class);
+        $this->cryptKeyGenerator = $cryptKeyGenerator ?? ObjectManager::getInstance()->get(CryptKeyGenerator::class);
     }
 
     /**
@@ -70,23 +90,17 @@ public function createCryptConfig(array $data)
     {
         $currentKey = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY);
 
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
-        if (isset($data[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY])) {
-            if ($currentKey !== null) {
-                $key = $currentKey . "\n" . $data[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY];
-            } else {
-                $key = $data[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY];
-            }
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
 
-            $configData->set(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY, $key);
-        } else {
-            if ($currentKey === null) {
-                $configData->set(
-                    ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY,
-                    md5($this->random->getRandomString(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE))
-                );
-            }
-        }
+        // Use given key if set, else use current
+        $key = $data[ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY] ?? $currentKey;
+
+        // If there is no key given or currently set, generate a new one
+        $key = $key ?? $this->cryptKeyGenerator->generate();
+
+        // Chaining of ".. ?? .." is not used to keep it simpler to understand
+
+        $configData->set(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY, $key);
 
         return $configData;
     }
@@ -99,7 +113,7 @@ public function createCryptConfig(array $data)
      */
     public function createSessionConfig(array $data)
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
 
         if (isset($data[ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE])) {
             $configData->set(
@@ -132,7 +146,7 @@ public function createDefinitionsConfig(array $data)
      */
     public function createDbConfig(array $data)
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
 
         $optional = [
             ConfigOptionsListConstants::INPUT_KEY_DB_HOST,
@@ -151,25 +165,18 @@ public function createDbConfig(array $data)
             );
         }
 
+        $dbConnectionPrefix = ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT . '/';
+
         foreach ($optional as $key) {
             if (isset($data[$key])) {
-                $configData->set(
-                    ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT . '/' . self::$paramMap[$key],
-                    $data[$key]
-                );
+                $configData->set($dbConnectionPrefix . self::$paramMap[$key], $data[$key]);
             }
         }
 
-        $currentStatus = $this->deploymentConfig->get(
-            ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT . '/' . ConfigOptionsListConstants::KEY_ACTIVE
-        );
+        $currentStatus = $this->deploymentConfig->get($dbConnectionPrefix . ConfigOptionsListConstants::KEY_ACTIVE);
 
         if ($currentStatus === null) {
-            $configData->set(
-                ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT
-                . '/' . ConfigOptionsListConstants::KEY_ACTIVE,
-                '1'
-            );
+            $configData->set($dbConnectionPrefix . ConfigOptionsListConstants::KEY_ACTIVE, '1');
         }
 
         return $configData;
@@ -182,7 +189,7 @@ public function createDbConfig(array $data)
      */
     public function createResourceConfig()
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
 
         if ($this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_RESOURCE_DEFAULT_SETUP) === null) {
             $configData->set(ConfigOptionsListConstants::CONFIG_PATH_RESOURCE_DEFAULT_SETUP, 'default');
@@ -198,10 +205,12 @@ public function createResourceConfig()
      */
     public function createXFrameConfig()
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
+
         if ($this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT) === null) {
             $configData->set(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT, 'SAMEORIGIN');
         }
+
         return $configData;
     }
 
@@ -212,10 +221,12 @@ public function createXFrameConfig()
      */
     public function createModeConfig()
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
+
         if ($this->deploymentConfig->get(State::PARAM_MODE) === null) {
             $configData->set(State::PARAM_MODE, State::MODE_DEFAULT);
         }
+
         return $configData;
     }
 
@@ -227,21 +238,29 @@ public function createModeConfig()
      */
     public function createCacheHostsConfig(array $data)
     {
-        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
+
         if (isset($data[ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS])) {
-            $hostData = explode(',', $data[ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS]);
-            $hosts = [];
-            foreach ($hostData as $data) {
-                $dataArray = explode(':', trim($data));
-                $host = [];
-                $host['host'] = $dataArray[0];
-                if (isset($dataArray[1])) {
-                    $host['port'] = $dataArray[1];
-                }
-                $hosts[] = $host;
-            }
+            $hosts = explode(',', $data[ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS]);
+
+            $hosts = array_map(
+                function ($hostData) {
+                    $hostDataParts = explode(':', trim($hostData));
+
+                    $tmp = ['host' => $hostDataParts[0]];
+
+                    if (isset($hostDataParts[1])) {
+                        $tmp['port'] = $hostDataParts[1];
+                    }
+
+                    return $tmp;
+                },
+                $hosts
+            );
+
             $configData->set(ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS, $hosts);
         }
+
         $configData->setOverrideWhenSave(true);
         return $configData;
     }
diff --git a/setup/src/Magento/Setup/Model/CryptKeyGenerator.php b/setup/src/Magento/Setup/Model/CryptKeyGenerator.php
new file mode 100644
index 00000000000..ec9d3f02812
--- /dev/null
+++ b/setup/src/Magento/Setup/Model/CryptKeyGenerator.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Model;
+
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Math\Random;
+
+/**
+ * Generates a crypt.
+ */
+class CryptKeyGenerator implements CryptKeyGeneratorInterface
+{
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * CryptKeyGenerator constructor.
+     *
+     * @param Random $random
+     */
+    public function __construct(Random $random)
+    {
+        $this->random = $random;
+    }
+
+    /**
+     * Generates & returns a string to be used as crypt key.
+     * The key length is not a parameter, but an implementation detail.
+     *
+     * @return string
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function generate()
+    {
+        return md5($this->getRandomString());
+    }
+
+    /**
+     * Returns a random string.
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getRandomString()
+    {
+        return $this->random->getRandomString(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE);
+    }
+}
diff --git a/setup/src/Magento/Setup/Model/CryptKeyGeneratorInterface.php b/setup/src/Magento/Setup/Model/CryptKeyGeneratorInterface.php
new file mode 100644
index 00000000000..f96f9b37ac9
--- /dev/null
+++ b/setup/src/Magento/Setup/Model/CryptKeyGeneratorInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Model;
+
+/**
+ * Interface for crypt key generators.
+ */
+interface CryptKeyGeneratorInterface
+{
+    /**
+     * Generates & returns a string to be used as crypt key.
+     *
+     * The key length is not a parameter, but an implementation detail.
+     *
+     * @return string
+     */
+    public function generate();
+}
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php b/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php
deleted file mode 100644
index 015a2188b58..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/Db/MySQL/DDL/Triggers/MigrateDataFromAnotherTable.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Setup\Model\Declaration\Schema\Db\MySQL\DDL\Triggers;
-
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\DB\SelectFactory;
-use Magento\Setup\Model\Declaration\Schema\Db\DDLTriggerInterface;
-use Magento\Setup\Model\Declaration\Schema\Dto\Column;
-use Magento\Setup\Model\Declaration\Schema\Dto\ElementInterface;
-
-/**
- * Used to migrate data from one column to another in scope of one table.
- * Can add statement in case when data can`t be migrate easily.
- */
-class MigrateDataFromAnotherTable implements DDLTriggerInterface
-{
-    /**
-     * Pattern with which we can match whether we can apply and use this trigger or not.
-     */
-    const MATCH_PATTERN = '/migrateDataFromAnotherTable\(([^\)]+)\,([^\)]+)\)/';
-
-    /**
-     * @var ResourceConnection
-     */
-    private $resourceConnection;
-
-    /**
-     * @var SelectFactory
-     */
-    private $selectFactory;
-
-    /**
-     * Constructor.
-     *
-     * @param ResourceConnection $resourceConnection
-     * @param SelectFactory $selectFactory
-     */
-    public function __construct(
-        ResourceConnection $resourceConnection,
-        SelectFactory $selectFactory
-    ) {
-        $this->resourceConnection = $resourceConnection;
-        $this->selectFactory = $selectFactory;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function isApplicable($statement)
-    {
-        return preg_match(self::MATCH_PATTERN, $statement);
-    }
-
-    /**
-     * @param Column $column
-     * @inheritdoc
-     */
-    public function getCallback(ElementInterface $column)
-    {
-        preg_match(self::MATCH_PATTERN, $column->getOnCreate(), $matches);
-        return function () use ($column, $matches) {
-            $tableName = $column->getTable()->getName();
-            $tableMigrateFrom = $matches[1];
-            $columnMigrateFrom = $matches[2];
-            $adapter = $this->resourceConnection->getConnection(
-                $column->getTable()->getResource()
-            );
-            $select = $this->selectFactory->create($adapter);
-            $select->from(
-                $this->resourceConnection->getTableName($tableMigrateFrom),
-                [$column->getName() => $columnMigrateFrom]
-            );
-            //Update only if table exists
-            if ($adapter->isTableExists($tableMigrateFrom)) {
-                $adapter->query(
-                    $adapter->insertFromSelect(
-                        $select,
-                        $this->resourceConnection->getTableName($tableName)
-                    )
-                );
-            }
-        };
-    }
-}
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/schema.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/schema.xsd
deleted file mode 100644
index 6b147e53ea4..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/schema.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
-* Copyright © Magento, Inc. All rights reserved.
-* See COPYING.txt for license details.
-*/
--->
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <!--Types-->
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/name.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/real/decimal.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/real/float.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/real/double.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/integers/integer.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/integers/biginteger.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/integers/smallinteger.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/integers/tinyinteger.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/texts/text.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/texts/longtext.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/texts/mediumtext.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/texts/varchar.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/binaries/blob.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/binaries/mediumblob.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/binaries/longblob.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/binaries/varbinary.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/datetime/timestamp.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/datetime/datetime.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/datetime/date.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/boolean.xsd" />
-    <!--Constraints-->
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/constraints/foreign.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/constraints/unique.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/constraints/primary.xsd" />
-    <!--Indexes-->
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/index.xsd" />
-
-    <xs:element name="schema">
-        <xs:complexType>
-            <xs:sequence minOccurs="0" maxOccurs="unbounded">
-                <xs:element name="table" type="table"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:complexType name="table">
-        <xs:annotation>
-            <xs:documentation>
-                Table definition. Here we can found column, constraints and indexes
-            </xs:documentation>
-        </xs:annotation>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element name="column" />
-            <xs:element name="constraint" />
-            <xs:element name="index" type="index" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string" />
-        <xs:attribute name="resource" type="resourceType" />
-        <xs:attribute name="engine" type="engineType" />
-        <xs:attribute name="comment" type="xs:string" />
-    </xs:complexType>
-
-    <xs:simpleType name="resourceType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="default" />
-            <xs:enumeration value="quote" />
-            <xs:enumeration value="sales" />
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="engineType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="innodb" />
-            <xs:enumeration value="memory" />
-        </xs:restriction>
-    </xs:simpleType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/blob.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/blob.xsd
deleted file mode 100644
index ecb08869ed3..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/blob.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="blob">
-        <xs:annotation>
-            <xs:documentation>
-                Can be used as binary source
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/longblob.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/longblob.xsd
deleted file mode 100644
index e23677467db..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/longblob.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="longblob">
-        <xs:annotation>
-            <xs:documentation>
-                Can be used as binary source. Different types can be used depends on data size
-                you want to persist
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/mediumblob.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/mediumblob.xsd
deleted file mode 100644
index 2a693a7c0b1..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/mediumblob.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="mediumblob">
-        <xs:annotation>
-            <xs:documentation>
-                Can be used as binary source
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/varbinary.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/varbinary.xsd
deleted file mode 100644
index f366cc45a89..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/binaries/varbinary.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="varbinary">
-        <xs:annotation>
-            <xs:documentation>
-                Can be used as binary source
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="length">
-            <xs:simpleType>
-                <xs:restriction base="xs:integer">
-                    <xs:maxInclusive value="255"/>
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute name="default" type="xs:string" />
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/boolean.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/boolean.xsd
deleted file mode 100644
index 795ca8095aa..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/boolean.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd" />
-
-    <xs:complexType name="boolean">
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="default" type="xs:boolean" />
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/date.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/date.xsd
deleted file mode 100644
index 616111bea62..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/date.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd" />
-
-    <xs:complexType name="date">
-        <xs:annotation>
-            <xs:documentation>
-                This format is used to save date (year, month, day).
-                Probably your SQL engine will save date in this format: 'YYYY-MM-DD'
-                Dates in invalid format will be converted to '0000-00-00' string
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attribute name="nullable" type="xs:boolean" />
-        <xs:attributeGroup ref="baseColumn" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/datetime.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/datetime.xsd
deleted file mode 100644
index 6974ce4ded7..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/datetime.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/datetime/default.xsd"/>
-
-    <xs:complexType name="datetime">
-        <xs:annotation>
-            <xs:documentation>
-                This format is used to save date (year, month, day).
-                Probably your SQL engine will save date in this format: 'YYYY-MM-DD HH:MM::SS'
-                Date time in invalid format will be converted to '0000-00-00 00:00:00' string
-                Supported range is '1000-01-01 00:00:00' to '9999-12-31 23:59:59'
-                DateTime format save date and time in your local time zone
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attributeGroup ref="default" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/timestamp.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/timestamp.xsd
deleted file mode 100644
index b2e8f77a1b9..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/datetime/timestamp.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd" />
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/datetime/default.xsd"/>
-
-    <xs:complexType name="timestamp">
-        <xs:annotation>
-            <xs:documentation>
-                This format is used to save date (year, month, day).
-                Probably your SQL engine will save date in this format: 'YYYY-MM-DD HH:MM::SS'
-                Date time in invalid format will be converted to '0000-00-00 00:00:00' string
-                MySQL timestamp is similar to UNIX timestamp. You can pass you local time there and it will
-                be converted to UTC timezone. Then when you will try to pull your time back it will be converted
-                to your local time again.
-                Unix range: 1970-01-01 00:00:01' UTC to '2038-01-09 03:14:07'
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attributeGroup ref="default" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/integer.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/integer.xsd
deleted file mode 100644
index 3ca4992ca5e..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/integers/integer.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="int">
-        <xs:annotation>
-            <xs:documentation>
-                Serves needs in integer digits. Default padding is 11.
-                Size is 4 bytes.
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="default" type="xs:integer" />
-        <xs:attribute name="padding">
-            <xs:annotation>
-                <xs:documentation>
-                    We can use padding only from 2, because padding 1 used for boolean type.
-                    And we need to distinguish boolean and integer
-                </xs:documentation>
-            </xs:annotation>
-            <xs:simpleType>
-                <xs:restriction base="xs:integer">
-                    <xs:maxInclusive value="255" />
-                    <xs:minInclusive value="2" />
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute name="unsigned" type="xs:boolean" />
-        <xs:attribute name="identity" type="xs:boolean" />
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/real/decimal.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/real/decimal.xsd
deleted file mode 100644
index 3a5f58792c9..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/real/decimal.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="decimal">
-        <xs:annotation>
-            <xs:documentation>
-                A fixed point decimal fraction equal to SQL DECIMAL(PRECISION,SCALE) type, where
-                 - SCALE is a size of number in fractional part,
-                 - PRECISION is a whole size of decimal fraction.
-                Please use this type for business oriented math like price or qty storages.
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="default" type="xs:decimal" />
-        <!--Note that scale must not be more than precision-->
-        <xs:attribute name="precision">
-            <xs:simpleType>
-                <xs:restriction base="xs:integer">
-                    <xs:minInclusive value="0" />
-                    <xs:maxInclusive value="65" />
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute name="unsigned" type="xs:boolean" />
-        <xs:attribute name="scale">
-            <xs:simpleType>
-                <xs:restriction base="xs:integer">
-                    <xs:minInclusive value="0" />
-                    <xs:maxInclusive value="30" />
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/real/float.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/real/float.xsd
deleted file mode 100644
index 601c29a0e32..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/real/float.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="float">
-        <xs:annotation>
-            <xs:documentation>
-                A floating point binary value with single precision. Has rounding issues.
-                Float is good for scientific calculations.
-                For business oriented math like price or qty storages please use decimal type.
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="default" type="xs:float" />
-        <!--Note that scale must not be more than precision-->
-        <xs:attribute name="precision">
-            <xs:simpleType>
-                <xs:restriction base="xs:integer">
-                    <xs:minInclusive value="0" />
-                    <xs:maxInclusive value="255" />
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute name="scale">
-            <xs:simpleType>
-                <xs:restriction base="xs:integer">
-                    <xs:minInclusive value="0" />
-                    <xs:maxInclusive value="253" />
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute name="nullable" type="xs:boolean" />
-        <xs:attribute name="unsigned" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/longtext.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/longtext.xsd
deleted file mode 100644
index 31980b8b0ea..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/longtext.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="longtext">
-        <xs:annotation>
-            <xs:documentation>
-                Here plain text can be persisted. Length of this field is more than more than 16777216
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/mediumtext.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/mediumtext.xsd
deleted file mode 100644
index aeab7b633ee..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/mediumtext.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="mediumtext">
-        <xs:annotation>
-            <xs:documentation>
-                Here plain text can be persisted. Length of this field is more than 65536 characters
-                and less than 16777216
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/text.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/text.xsd
deleted file mode 100644
index 9e2aa1c536e..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/text.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="text">
-        <xs:annotation>
-            <xs:documentation>
-                Here plain text can be persisted. Length of this field is more than 255 characters
-                and less than 65536
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/varchar.xsd b/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/varchar.xsd
deleted file mode 100644
index 6ac1c7bfacd..00000000000
--- a/setup/src/Magento/Setup/Model/Declaration/Schema/etc/types/texts/varchar.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/types/column.xsd"/>
-
-    <xs:complexType name="varchar">
-        <xs:annotation>
-            <xs:documentation>
-                Varchar is the small text field. It do not have max length. But we suppose, that this field can be used for
-                string columns that are in role of some key, like customer email or product sku. We add limitation for 1024 characters
-                on this type. This limitation is justified by SQL engine limitations, like {max sort size} or {max index size}.
-                For example, in MySQL, default max sort size (max_sort_length) is 1024 symbols.
-            </xs:documentation>
-        </xs:annotation>
-
-        <xs:attributeGroup ref="baseColumn" />
-        <xs:attribute name="length">
-            <xs:simpleType>
-                <xs:restriction base="xs:integer">
-                    <xs:maxInclusive value="1024"/>
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute name="default" type="xs:string" />
-        <xs:attribute name="nullable" type="xs:boolean" />
-    </xs:complexType>
-</xs:schema>
diff --git a/setup/src/Magento/Setup/Model/DeclarationInstaller.php b/setup/src/Magento/Setup/Model/DeclarationInstaller.php
index 884ae4fdf6d..52c360251c2 100644
--- a/setup/src/Magento/Setup/Model/DeclarationInstaller.php
+++ b/setup/src/Magento/Setup/Model/DeclarationInstaller.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Setup\Model;
 
-use Magento\Setup\Model\Declaration\Schema\Diff\SchemaDiff;
-use Magento\Setup\Model\Declaration\Schema\OperationsExecutor;
-use Magento\Setup\Model\Declaration\Schema\RequestFactory;
-use Magento\Setup\Model\Declaration\Schema\SchemaConfigInterface;
+use Magento\Framework\Setup\Declaration\Schema\Diff\SchemaDiff;
+use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
+use Magento\Framework\Setup\Declaration\Schema\RequestFactory;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface;
 
 /**
  * Declaration Installer is facade for installation and upgrade db in declaration mode.
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index 0fcb15e149b..a7dc4dd1e60 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -11,7 +11,6 @@
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\MaintenanceMode;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\State\CleanupFiles;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Config\ConfigOptionsListConstants;
@@ -23,6 +22,7 @@
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Module\ModuleList\Loader as ModuleLoader;
 use Magento\Framework\Module\ModuleListInterface;
+use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\FilePermissions;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\InstallSchemaInterface;
@@ -36,12 +36,8 @@
 use Magento\Setup\Console\Command\InstallCommand;
 use Magento\Setup\Controller\ResponseTypeInterface;
 use Magento\Setup\Model\ConfigModel as SetupConfigModel;
-use Magento\Setup\Model\Patch\PatchApplier;
-use Magento\Setup\Model\Patch\PatchApplierFactory;
-use Magento\Setup\Model\Patch\PatchHistory;
-use Magento\Setup\Model\Patch\PatchReader;
-use Magento\Setup\Model\Patch\PatchRegistry;
-use Magento\Setup\Model\Patch\PatchRegistryFactory;
+use Magento\Framework\Setup\Patch\PatchApplier;
+use Magento\Framework\Setup\Patch\PatchApplierFactory;
 use Magento\Setup\Module\ConnectionFactory;
 use Magento\Setup\Module\DataSetupFactory;
 use Magento\Setup\Module\SetupFactory;
@@ -296,8 +292,7 @@ public function __construct(
         DataSetupFactory $dataSetupFactory,
         \Magento\Framework\Setup\SampleData\State $sampleDataState,
         ComponentRegistrar $componentRegistrar,
-        PhpReadinessCheck $phpReadinessCheck,
-        DeclarationInstaller $declarationInstaller = null
+        PhpReadinessCheck $phpReadinessCheck
     ) {
         $this->filePermissions = $filePermissions;
         $this->deploymentConfigWriter = $deploymentConfigWriter;
@@ -321,9 +316,6 @@ public function __construct(
         $this->sampleDataState = $sampleDataState;
         $this->componentRegistrar = $componentRegistrar;
         $this->phpReadinessCheck = $phpReadinessCheck;
-        $this->declarationInstaller = $declarationInstaller ?: $this->objectManagerProvider->get()->get(
-            DeclarationInstaller::class
-        );
         $this->schemaPersistor = $this->objectManagerProvider->get()->get(SchemaPersistor::class);
     }
 
@@ -346,7 +338,7 @@ public function install($request)
         $script[] = ['Installing database schema:', 'installSchema', [$request]];
         $script[] = ['Installing user configuration...', 'installUserConfig', [$request]];
         $script[] = ['Enabling caches:', 'enableCaches', []];
-        $script[] = ['Installing data...', 'installDataFixtures', []];
+        $script[] = ['Installing data...', 'installDataFixtures', [$request]];
         if (!empty($request[InstallCommand::INPUT_KEY_SALES_ORDER_INCREMENT_PREFIX])) {
             $script[] = [
                 'Creating sales order increment prefix...',
@@ -355,7 +347,10 @@ public function install($request)
             ];
         }
         $script[] = ['Installing admin user...', 'installAdminUser', [$request]];
-        $script[] = ['Caches clearing:', 'cleanCaches', []];
+
+        if (!$this->isDryRun($request)) {
+            $script[] = ['Caches clearing:', 'cleanCaches', [$request]];
+        }
         $script[] = ['Disabling Maintenance Mode:', 'setMaintenanceMode', [0]];
         $script[] = ['Post installation file permissions check...', 'checkApplicationFilePermissions', []];
         $script[] = ['Write installation date...', 'writeInstallationDate', []];
@@ -385,6 +380,21 @@ public function install($request)
         }
     }
 
+    /**
+     * Get declaration installer. For upgrade process it must be created after deployment config update.
+     *
+     * @return DeclarationInstaller
+     */
+    private function getDeclarationInstaller()
+    {
+        if (!$this->declarationInstaller) {
+            $this->declarationInstaller = $this->objectManagerProvider->get()->get(
+                DeclarationInstaller::class
+            );
+        }
+        return $this->declarationInstaller;
+    }
+
     /**
      * Writes installation date to the configuration
      *
@@ -794,7 +804,7 @@ private function setupFlagTable(
      */
     public function declarativeInstallSchema(array $request)
     {
-        $this->declarationInstaller->installSchema($request);
+        $this->getDeclarationInstaller()->installSchema($request);
     }
 
     /**
@@ -812,7 +822,7 @@ public function installSchema(array $request)
         $this->setupCoreTables($setup);
         $this->log->log('Schema creation/updates:');
         $this->declarativeInstallSchema($request);
-        $this->handleDBSchemaData($setup, 'schema');
+        $this->handleDBSchemaData($setup, 'schema', $request);
         /** @var Mysql $adapter */
         $adapter = $setup->getConnection();
         $schemaListener = $adapter->getSchemaListener();
@@ -838,16 +848,17 @@ private function convertationOfOldScriptsIsAllowed(array $request)
     /**
      * Installs data fixtures
      *
+     * @param array $request
      * @return void
      */
-    public function installDataFixtures()
+    public function installDataFixtures(array $request = [])
     {
         $this->assertDbConfigExists();
         $this->assertDbAccessible();
         $setup = $this->dataSetupFactory->create();
         $this->checkFilePermissionsForDbUpgrade();
         $this->log->log('Data install/update:');
-        $this->handleDBSchemaData($setup, 'data');
+        $this->handleDBSchemaData($setup, 'data', $request);
     }
 
     /**
@@ -883,13 +894,14 @@ private function throwExceptionForNotWritablePaths(array $paths)
      *
      * @param SchemaSetupInterface | ModuleDataSetupInterface $setup
      * @param string $type
+     * @param array $request
      * @return void
      * @throws \Magento\Setup\Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    private function handleDBSchemaData($setup, $type)
+    private function handleDBSchemaData($setup, $type, array $request)
     {
         if (!(($type === 'schema') || ($type === 'data'))) {
             throw  new \Magento\Setup\Exception("Unsupported operation type $type is requested");
@@ -920,8 +932,11 @@ private function handleDBSchemaData($setup, $type)
         }
 
         foreach ($moduleNames as $moduleName) {
-            $installer = false;
-            $upgrader = false;
+            if ($this->isDryRun($request)) {
+                $this->log->log("Module '{$moduleName}':");
+                $this->logProgress();
+                continue;
+            }
             $schemaListener->setModuleName($moduleName);
             $this->log->log("Module '{$moduleName}':");
             $configVer = $this->moduleList->getOne($moduleName)['setup_version'];
@@ -954,7 +969,7 @@ private function handleDBSchemaData($setup, $type)
                 }
             }
 
-            if ($installer || $upgrader) {
+            if ($configVer) {
                 if ($type === 'schema') {
                     $resource->setDbVersion($moduleName, $configVer);
                 } elseif ($type === 'data') {
@@ -982,6 +997,11 @@ private function handleDBSchemaData($setup, $type)
             $handlerType = 'data-recurring';
         }
         foreach ($moduleNames as $moduleName) {
+            if ($this->isDryRun($request)) {
+                $this->log->log("Module '{$moduleName}':");
+                $this->logProgress();
+                continue;
+            }
             $this->log->log("Module '{$moduleName}':");
             $modulePostUpdater = $this->getSchemaDataHandler($moduleName, $handlerType);
             if ($modulePostUpdater) {
@@ -1006,6 +1026,18 @@ private function assertDbConfigExists()
         }
     }
 
+    /**
+     * Check whether Magento setup is run in dry-run mode
+     *
+     * @param array $request
+     * @return bool
+     */
+    private function isDryRun(array $request)
+    {
+        return isset($request[DryRunLogger::INPUT_KEY_DRY_RUN_MODE]) &&
+            $request[DryRunLogger::INPUT_KEY_DRY_RUN_MODE];
+    }
+
     /**
      * Installs user configuration
      *
@@ -1014,6 +1046,9 @@ private function assertDbConfigExists()
      */
     public function installUserConfig($data)
     {
+        if ($this->isDryRun($data)) {
+            return;
+        }
         $userConfig = new StoreConfigurationDataMapper();
         /** @var \Magento\Framework\App\State $appState */
         $appState = $this->objectManagerProvider->get()->get(\Magento\Framework\App\State::class);
@@ -1103,6 +1138,10 @@ private function installOrderIncrementPrefix($orderIncrementPrefix)
      */
     public function installAdminUser($data)
     {
+        if ($this->isDryRun($data)) {
+            return;
+        }
+
         $adminUserModuleIsInstalled = (bool)$this->deploymentConfig->get('modules/Magento_User');
         //Admin user data is not system data, so we need to install it only if schema for admin user was installed
         if ($adminUserModuleIsInstalled) {
diff --git a/setup/src/Magento/Setup/Model/ModuleUninstaller.php b/setup/src/Magento/Setup/Model/ModuleUninstaller.php
index 270cebf7b57..55b866640b7 100644
--- a/setup/src/Magento/Setup/Model/ModuleUninstaller.php
+++ b/setup/src/Magento/Setup/Model/ModuleUninstaller.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Setup\Model;
 
-use Magento\Setup\Model\Patch\PatchApplier;
+use Magento\Framework\Setup\Patch\PatchApplier;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
index 6a798f32265..37388f563e7 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php
@@ -30,13 +30,21 @@ public function __construct(\Magento\Setup\Module\Di\Compiler\Log\Log $log)
      */
     public function collectEntities(array $files)
     {
+        $virtualTypes = [];
         $output = [];
+        $factoriesOutput = [];
         foreach ($files as $file) {
             $dom = new \DOMDocument();
             $dom->load($file);
             $xpath = new \DOMXPath($dom);
             $xpath->registerNamespace("php", "http://php.net/xpath");
             $xpath->registerPhpFunctions('preg_match');
+            $virtualTypeQuery = "//virtualType/@name";
+
+            foreach ($xpath->query($virtualTypeQuery) as $virtualNode) {
+                $virtualTypes[] = $virtualNode->nodeValue;
+            }
+
             $regex = '/^(.*)\\\(.*)Proxy$/';
             $query = "/config/preference[ php:functionString('preg_match', '{$regex}', @type) > 0]/@type | " .
                 "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
@@ -46,9 +54,33 @@ public function collectEntities(array $files)
             foreach ($xpath->query($query) as $node) {
                 $output[] = $node->nodeValue;
             }
+
+            $factoriesOutput = array_merge($factoriesOutput, $this->scanFactories($xpath));
         }
+
         $output = array_unique($output);
-        return $this->_filterEntities($output);
+        $factoriesOutput = array_unique($factoriesOutput);
+        $factoriesOutput = array_diff($factoriesOutput, $virtualTypes);
+        return array_merge($this->_filterEntities($output), $factoriesOutput);
+    }
+
+    /**
+     * Scan factories from all di.xml and retrieve non virtual one
+     *
+     * @param \DOMXPath $domXpath
+     * @return array
+     */
+    private function scanFactories(\DOMXPath $domXpath)
+    {
+        $output = [];
+        $regex = '/^(.*)Factory$/';
+        $query = "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
+            "//item[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0]";
+        foreach ($domXpath->query($query) as $node) {
+            $output[] = $node->nodeValue;
+        }
+
+        return $output;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
index 772098627fa..a5dc0d24feb 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
@@ -102,7 +102,7 @@ public function testExecute($input)
 
         $this->consoleLoggerFactory->expects($this->once())
             ->method('getLogger')->willReturn($this->logger);
-        $this->logger->expects($this->exactly(2))->method('alert');
+        $this->logger->expects($this->exactly(2))->method('notice');
 
         $this->objectManager->expects($this->once())->method('create')->willReturn($this->deployService);
         $this->deployService->expects($this->once())->method('deploy');
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php
index d779867e2ca..c00d66eaed1 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php
@@ -8,7 +8,7 @@
 use Magento\Framework\App\Console\MaintenanceModeEnabler;
 use Magento\Setup\Console\Command\ModuleUninstallCommand;
 use Magento\Setup\Model\ModuleUninstaller;
-use Magento\Setup\Model\Patch\PatchApplier;
+use Magento\Framework\Setup\Patch\PatchApplier;
 use Symfony\Component\Console\Tester\CommandTester;
 
 /**
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
index 0abeb7b3289..6f32a686826 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php
@@ -114,7 +114,8 @@ public function executeDataProvider()
                     'convert_old_scripts' => false,
                     'magento-init-params' => '',
                     'safe-mode' => false,
-                    'data-restore' => false
+                    'data-restore' => false,
+                    'dry-run' => false,
                 ]
             ],
             [
@@ -130,7 +131,8 @@ public function executeDataProvider()
                     'convert_old_scripts' => false,
                     'magento-init-params' => '',
                     'safe-mode' => false,
-                    'data-restore' => false
+                    'data-restore' => false,
+                    'dry-run' => false,
                 ]
             ],
             [
@@ -142,7 +144,8 @@ public function executeDataProvider()
                     'convert_old_scripts' => false,
                     'magento-init-params' => '',
                     'safe-mode' => false,
-                    'data-restore' => false
+                    'data-restore' => false,
+                    'dry-run' => false,
                 ]
             ],
             [
@@ -154,7 +157,8 @@ public function executeDataProvider()
                     'convert_old_scripts' => false,
                     'magento-init-params' => '',
                     'safe-mode' => false,
-                    'data-restore' => false
+                    'data-restore' => false,
+                    'dry-run' => false,
                 ]
             ],
         ];
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php
index d5bce391f4c..be68be8bd8c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php
@@ -5,27 +5,57 @@
  */
 namespace Magento\Setup\Test\Unit\Model;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\App\State;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\Data\ConfigDataFactory;
+use Magento\Setup\Model\ConfigGenerator;
 
 class ConfigGeneratorTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var  \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject
+     */
     private $deploymentConfigMock;
 
-    /** @var  \Magento\Setup\Model\ConfigGenerator | \PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var ConfigGenerator | \PHPUnit_Framework_MockObject_MockObject
+     */
     private $model;
 
+    /**
+     * @var ConfigData|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configDataMock;
+
     public function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->configDataMock = $this->getMockBuilder(ConfigData::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['set'])
+            ->getMock();
+
+        $configDataFactoryMock = $this->getMockBuilder(ConfigDataFactory::class)
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
+
+        $configDataFactoryMock->method('create')
+            ->willReturn($this->configDataMock);
+
         $this->model = $objectManager->getObject(
-            \Magento\Setup\Model\ConfigGenerator::class,
-            ['deploymentConfig' => $this->deploymentConfigMock]
+            ConfigGenerator::class,
+            [
+                'deploymentConfig'  => $this->deploymentConfigMock,
+                'configDataFactory' => $configDataFactoryMock,
+            ]
         );
     }
 
@@ -35,8 +65,13 @@ public function testCreateXFrameConfig()
             ->method('get')
             ->with(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT)
             ->willReturn(null);
-        $configData = $this->model->createXFrameConfig();
-        $this->assertSame('SAMEORIGIN', $configData->getData()[ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT]);
+
+        $this->configDataMock
+            ->expects($this->once())
+            ->method('set')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_X_FRAME_OPT, 'SAMEORIGIN');
+
+        $this->model->createXFrameConfig();
     }
 
     public function testCreateCacheHostsConfig()
@@ -55,8 +90,13 @@ public function testCreateCacheHostsConfig()
                 'port' => '90',
             ],
         ];
-        $configData = $this->model->createCacheHostsConfig($data);
-        $this->assertEquals($expectedData, $configData->getData()[ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS]);
+
+        $this->configDataMock
+            ->expects($this->once())
+            ->method('set')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS, $expectedData);
+
+        $this->model->createCacheHostsConfig($data);
     }
 
     public function testCreateModeConfig()
@@ -65,8 +105,13 @@ public function testCreateModeConfig()
             ->method('get')
             ->with(State::PARAM_MODE)
             ->willReturn(null);
-        $configData = $this->model->createModeConfig();
-        $this->assertSame(State::MODE_DEFAULT, $configData->getData()[State::PARAM_MODE]);
+
+        $this->configDataMock
+            ->expects($this->once())
+            ->method('set')
+            ->with(State::PARAM_MODE, State::MODE_DEFAULT);
+
+        $this->model->createModeConfig();
     }
 
     public function testCreateModeConfigIfAlreadySet()
@@ -78,4 +123,22 @@ public function testCreateModeConfigIfAlreadySet()
         $configData = $this->model->createModeConfig();
         $this->assertSame([], $configData->getData());
     }
+
+    public function testCreateCryptKeyConfig()
+    {
+        $key = 'my-new-key';
+        $data = [ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => $key];
+
+        $this->deploymentConfigMock
+            ->method('get')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY)
+            ->willReturn(null);
+
+        $this->configDataMock
+            ->expects($this->once())
+            ->method('set')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY, $key);
+
+        $this->model->createCryptConfig($data);
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/CryptKeyGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/CryptKeyGeneratorTest.php
new file mode 100644
index 00000000000..d7a4d477de7
--- /dev/null
+++ b/setup/src/Magento/Setup/Test/Unit/Model/CryptKeyGeneratorTest.php
@@ -0,0 +1,59 @@
+<?php
+/***
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Test\Unit\Model;
+
+use Magento\Framework\Math\Random;
+use Magento\Setup\Model\CryptKeyGenerator;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Testcase for CryptKeyGenerator
+ */
+class CryptKeyGeneratorTest extends TestCase
+{
+    /**
+     * @var Random|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $randomMock;
+
+    /**
+     * @var CryptKeyGenerator
+     */
+    private $cryptKeyGenerator;
+
+    public function setUp()
+    {
+        $this->randomMock = $this->getMockBuilder(Random::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->cryptKeyGenerator = new CryptKeyGenerator($this->randomMock);
+    }
+
+    public function testStringForHashingIsReadFromRandom()
+    {
+        $this->randomMock
+            ->expects($this->once())
+            ->method('getRandomString')
+            ->willReturn('');
+        
+        $this->cryptKeyGenerator->generate();
+    }
+
+    public function testReturnsMd5OfRandomString()
+    {
+        $expected = 'fdb7594e77f1ad5fbb8e6c917b6012ce'; // == 'magento2'
+
+        $this->randomMock
+            ->method('getRandomString')
+            ->willReturn('magento2');
+
+        $actual = $this->cryptKeyGenerator->generate();
+
+        $this->assertEquals($expected, $actual);
+    }
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php
index 0f9eb7d136a..0ef30b9ab4d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Setup\LoggerInterface;
 use Magento\Framework\Setup\SchemaPersistor;
 use Magento\Setup\Model\DeclarationInstaller;
-use \Magento\Setup\Model\InstallerFactory;
+use Magento\Setup\Model\InstallerFactory;
 use Magento\Setup\Module\ResourceFactory;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
index e2cf02b6232..413094a1e01 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
@@ -10,13 +10,13 @@
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\Setup\SchemaListener;
 use Magento\Setup\Model\DeclarationInstaller;
-use \Magento\Setup\Model\Installer;
+use Magento\Setup\Model\Installer;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\DriverPool;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\App\State\CleanupFiles;
-use Magento\Setup\Model\Patch\PatchApplier;
-use Magento\Setup\Model\Patch\PatchApplierFactory;
+use Magento\Framework\Setup\Patch\PatchApplier;
+use Magento\Framework\Setup\Patch\PatchApplierFactory;
 use Magento\Setup\Validator\DbValidator;
 
 /**
@@ -141,7 +141,7 @@ class InstallerTest extends \PHPUnit\Framework\TestCase
     private $phpReadinessCheck;
 
     /**
-     * @var \Magento\Setup\Model\DeclarationInstaller|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Setup\DeclarationInstaller|\PHPUnit_Framework_MockObject_MockObject
      */
     private $declarationInstallerMock;
 
@@ -345,7 +345,8 @@ public function testInstall()
             ->method('get')
             ->will($this->returnValueMap([
                 [\Magento\Framework\App\State::class, $appState],
-                [\Magento\Framework\App\Cache\Manager::class, $cacheManager]
+                [\Magento\Framework\App\Cache\Manager::class, $cacheManager],
+                [\Magento\Setup\Model\DeclarationInstaller::class, $this->declarationInstallerMock]
             ]));
         $this->adminFactory->expects($this->once())->method('create')->willReturn(
             $this->createMock(\Magento\Setup\Model\AdminAccount::class)
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php
index bed65553b94..73202fdd2b9 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Setup\Test\Unit\Model;
 
 use Magento\Setup\Model\ModuleUninstaller;
-use Magento\Setup\Model\Patch\PatchApplier;
+use Magento\Framework\Setup\Patch\PatchApplier;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php
index 69f320bccd5..65fe4a5f477 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php
@@ -5,11 +5,18 @@
  */
 namespace Magento\Setup\Test\Unit\Module;
 
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\Data\ConfigDataFactory;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Math\Random;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Setup\Model\ConfigGenerator;
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Setup\Model\CryptKeyGenerator;
+use PHPUnit\Framework\TestCase;
 
-class ConfigGeneratorTest extends \PHPUnit\Framework\TestCase
+class ConfigGeneratorTest extends TestCase
 {
     /**
      * @var ConfigGenerator
@@ -18,11 +25,31 @@ class ConfigGeneratorTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $random = $this->createMock(\Magento\Framework\Math\Random::class);
-        $random->expects($this->any())->method('getRandomString')->willReturn('key');
-        $deployConfig= $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
+        /** @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject $deployConfig */
+        $deployConfig = $this->createMock(DeploymentConfig::class);
         $deployConfig->expects($this->any())->method('isAvailable')->willReturn(false);
-        $this->configGeneratorObject = new ConfigGenerator($random, $deployConfig);
+
+        /** @var Random|\PHPUnit_Framework_MockObject_MockObject $randomMock */
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->expects($this->any())->method('getRandomString')->willReturn('key');
+
+        $cryptKeyGenerator = new CryptKeyGenerator($randomMock);
+
+        $objectManagerMock = $this->getMockBuilder(\Magento\Framework\App\ObjectManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManagerMock->method('create')->willReturn(new ConfigData('app_env'));
+
+        $configDataFactoryMock = (new ObjectManager($this))
+            ->getObject(ConfigDataFactory::class, ['objectManager' => $objectManagerMock]);
+
+        $this->configGeneratorObject = new ConfigGenerator(
+            $randomMock,
+            $deployConfig,
+            $configDataFactoryMock,
+            $cryptKeyGenerator
+        );
     }
 
     public function testCreateCryptConfigWithInput()